Merge ~tellowkrinkle/pcsx2-github-mirror:master into ~helkaluin/pcsx2-github-mirror:master
Proposed by
Tellow Krinkle
| Status: | Needs review |
|---|---|
| Proposed branch: | ~tellowkrinkle/pcsx2-github-mirror:master |
| Merge into: | ~helkaluin/pcsx2-github-mirror:master |
| Diff against target: |
254 lines (+179/-9) 7 files modified
3rdparty/sdl2/CMakeLists.txt (+53/-0) debian/control (+1/-9) debian/patches/add-3rdparty-sdl2.diff (+32/-0) debian/patches/adjust-required-versions.diff (+31/-0) debian/patches/series (+4/-0) debian/patches/use-system-libraries.diff (+22/-0) debian/patches/warn-unofficial-build.diff (+36/-0) |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Jonathan Yip | Pending | ||
|
Review via email:
|
|||
Description of the change
Restores support for static linking SDL
(Change the `nest sdl lp:~pcsx2-team/pcsx2-github-mirror/+git/sdl 3rdparty/sdl2/SDL ac13ca9` to `nest sdl lp:~pcsx2-team/pcsx2-github-mirror/+git/sdl 3rdparty/sdl2/SDL release-2.28.2`, and you can now remove the libzip one, it's now in-tree)
To post a comment you must log in.
There was an error fetching revisions from git servers. Please try again in a few minutes. If the problem persists, contact Launchpad support.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
