From ffdc914c71ca867e823bb2a8e9135eabbd06519b Mon Sep 17 00:00:00 2001 From: Gregory Hainaut Date: Wed, 21 Oct 2015 22:33:15 +0200 Subject: [PATCH] linux: SDL2 For older distribution you can still use SDL1.2 ./build.sh ... --sdl12 ... or cmake ... -DSDL2_API=FALSE ... Note: there is a hard dependency between WxWidget and SDL. If Wx is linked against SDL1.2, you must use SDL1.2. Crashes are expected otherwise. --- build.sh | 8 +++++--- cmake/BuildParameters.cmake | 2 +- debian-packager/control | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/build.sh b/build.sh index 10345d8840..97a16d125a 100755 --- a/build.sh +++ b/build.sh @@ -34,7 +34,7 @@ for ARG in "$@"; do --release ) flags+=(-DCMAKE_BUILD_TYPE=Release) ;; --glsl ) flags+=(-DGLSL_API=TRUE) ;; --egl ) flags+=(-DEGL_API=TRUE) ;; - --sdl2 ) flags+=(-DSDL2_API=TRUE) ;; + --sdl12 ) flags+=(-DSDL2_API=FALSE) ;; --extra ) flags+=(-DEXTRA_PLUGINS=TRUE) ;; --asan ) flags+=(-DUSE_ASAN=TRUE) ;; --wx28 ) flags+=(-DWX28_API=TRUE) ;; @@ -57,12 +57,14 @@ for ARG in "$@"; do echo "--no-simd : Only allow sse2" echo echo "** Developer option **" - echo "--wx28 : Force wxWidget 2.8" echo "--glsl : Replace CG backend of ZZogl by GLSL" echo "--egl : Replace GLX by EGL (ZZogl/GSdx plugins)" - echo "--sdl2 : Build with SDL2 (crashes if wx is linked to SDL1.2)" echo "--cross-multilib: Build a 32bit PCSX2 on a 64bit machine using multilib." echo + echo "** Distribution Compatibilities **" + echo "--sdl12 : Build with SDL1.2 (requires if wx is linked against SDL1.2)" + echo "--wx28 : Force wxWidget 2.8" + echo echo "** Expert Developer option **" echo "--gtk3 : replace GTK2 by GTK3" echo "--no-cross-multilib: Build a native PCSX2" diff --git a/cmake/BuildParameters.cmake b/cmake/BuildParameters.cmake index 2b99e8758c..66e1f91371 100644 --- a/cmake/BuildParameters.cmake +++ b/cmake/BuildParameters.cmake @@ -44,7 +44,7 @@ option(DISABLE_CHEATS_ZIP "Disable including the cheats_ws.zip file") option(DISABLE_PCSX2_WRAPPER "Disable including the PCSX2-linux.sh file") option(XDG_STD "Use XDG standard path instead of the standard PCSX2 path") option(EXTRA_PLUGINS "Build various 'extra' plugins") -option(SDL2_API "Use SDL2 on spu2x and onepad (experimental/wxWidget mustn't be built with SDL1.2 support") +option(SDL2_API "Use SDL2 on spu2x and onepad (wxWidget mustn't be built with SDL1.2 support" ON) option(WX28_API "Force wxWidget 2.8 lib (deprecated)") option(GTK3_API "Use GTK3 api (experimental/wxWidget must be built with GTK3 support)") diff --git a/debian-packager/control b/debian-packager/control index 081cf69701..a38c91313e 100644 --- a/debian-packager/control +++ b/debian-packager/control @@ -14,7 +14,7 @@ Build-Depends: cmake (>= 2.8.5), libpng12-dev, libpng++-dev, libpulse-dev, - libsdl1.2-dev, + libsdl2-dev, libsoundtouch-dev, libwxbase3.0-dev, libwxgtk3.0-dev,