ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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.
This commit is contained in:
Gregory Hainaut 2015-10-21 22:33:15 +02:00
parent b6d9ea86ee
commit ffdc914c71
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
build.sh
View File

@ -34,7 +34,7 @@ for ARG in "$@"; do
--release ) flags+=(-DCMAKE_BUILD_TYPE=Release) ;; --release ) flags+=(-DCMAKE_BUILD_TYPE=Release) ;;
--glsl ) flags+=(-DGLSL_API=TRUE) ;; --glsl ) flags+=(-DGLSL_API=TRUE) ;;
--egl ) flags+=(-DEGL_API=TRUE) ;; --egl ) flags+=(-DEGL_API=TRUE) ;;
--sdl2 ) flags+=(-DSDL2_API=TRUE) ;; --sdl12 ) flags+=(-DSDL2_API=FALSE) ;;
--extra ) flags+=(-DEXTRA_PLUGINS=TRUE) ;; --extra ) flags+=(-DEXTRA_PLUGINS=TRUE) ;;
--asan ) flags+=(-DUSE_ASAN=TRUE) ;; --asan ) flags+=(-DUSE_ASAN=TRUE) ;;
--wx28 ) flags+=(-DWX28_API=TRUE) ;; --wx28 ) flags+=(-DWX28_API=TRUE) ;;
@ -57,12 +57,14 @@ for ARG in "$@"; do
echo "--no-simd : Only allow sse2" echo "--no-simd : Only allow sse2"
echo echo
echo "** Developer option **" echo "** Developer option **"
echo "--wx28 : Force wxWidget 2.8"
echo "--glsl : Replace CG backend of ZZogl by GLSL" echo "--glsl : Replace CG backend of ZZogl by GLSL"
echo "--egl : Replace GLX by EGL (ZZogl/GSdx plugins)" 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 "--cross-multilib: Build a 32bit PCSX2 on a 64bit machine using multilib."
echo 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 "** Expert Developer option **"
echo "--gtk3 : replace GTK2 by GTK3" echo "--gtk3 : replace GTK2 by GTK3"
echo "--no-cross-multilib: Build a native PCSX2" echo "--no-cross-multilib: Build a native PCSX2"

2
cmake/BuildParameters.cmake
View File

@ -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(DISABLE_PCSX2_WRAPPER "Disable including the PCSX2-linux.sh file")
option(XDG_STD "Use XDG standard path instead of the standard PCSX2 path") option(XDG_STD "Use XDG standard path instead of the standard PCSX2 path")
option(EXTRA_PLUGINS "Build various 'extra' plugins") 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(WX28_API "Force wxWidget 2.8 lib (deprecated)")
option(GTK3_API "Use GTK3 api (experimental/wxWidget must be built with GTK3 support)") option(GTK3_API "Use GTK3 api (experimental/wxWidget must be built with GTK3 support)")

2
debian-packager/control
View File

@ -14,7 +14,7 @@ Build-Depends: cmake (>= 2.8.5),
libpng12-dev, libpng12-dev,
libpng++-dev, libpng++-dev,
libpulse-dev, libpulse-dev,
libsdl1.2-dev, libsdl2-dev,
libsoundtouch-dev, libsoundtouch-dev,
libwxbase3.0-dev, libwxbase3.0-dev,
libwxgtk3.0-dev, libwxgtk3.0-dev,