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

CMake: Remove SDL1.2 option 

Not sure if it worked before but it definitely doesn't work now
This commit is contained in:
TellowKrinkle 2021-11-30 23:55:52 -06:00 committed by tellowkrinkle
parent d97e867c07
commit cf176f1b99
4 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.sh
View File

@ -193,7 +193,6 @@ for ARG in "$@"; do
--rel|--release ) flags="$flags -DCMAKE_BUILD_TYPE=Release" ; build="$root/build_rel";; --rel|--release ) flags="$flags -DCMAKE_BUILD_TYPE=Release" ; build="$root/build_rel";;
--prof ) flags="$flags -DCMAKE_BUILD_TYPE=RelWithDebInfo"; build="$root/build_prof";; --prof ) flags="$flags -DCMAKE_BUILD_TYPE=RelWithDebInfo"; build="$root/build_prof";;
--strip ) flags="$flags -DCMAKE_BUILD_STRIP=TRUE" ;; --strip ) flags="$flags -DCMAKE_BUILD_STRIP=TRUE" ;;
--sdl12 ) flags="$flags -DSDL2_API=FALSE" ;;
--use-system-yaml ) flags="$flags -DUSE_SYSTEM_YAML=TRUE" ;; --use-system-yaml ) flags="$flags -DUSE_SYSTEM_YAML=TRUE" ;;
--asan ) flags="$flags -DUSE_ASAN=TRUE" ;; --asan ) flags="$flags -DUSE_ASAN=TRUE" ;;
--gtk2 ) flags="$flags -DGTK2_API=TRUE" ;; --gtk2 ) flags="$flags -DGTK2_API=TRUE" ;;
@ -226,7 +225,6 @@ for ARG in "$@"; do
echo "--no-cross-multilib: Build a native version of PCSX2 (default)" echo "--no-cross-multilib: Build a native version of PCSX2 (default)"
echo echo
echo "** Distribution Compatibilities **" echo "** Distribution Compatibilities **"
echo "--sdl12 : Build with SDL1.2 (requires if wx is linked against SDL1.2)"
echo "--no-portaudio : Skip portaudio for SPU2." echo "--no-portaudio : Skip portaudio for SPU2."
echo "--use-system-yaml : Use system rapidyaml library" echo "--use-system-yaml : Use system rapidyaml library"
echo echo

1
cmake/BuildParameters.cmake
View File

@ -47,7 +47,6 @@ option(DISABLE_PCSX2_WRAPPER "Disable including the PCSX2-linux.sh file")
option(DISABLE_SETCAP "Do not set files capabilities") option(DISABLE_SETCAP "Do not set files capabilities")
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(CUBEB_API "Build Cubeb support on SPU2" ON) option(CUBEB_API "Build Cubeb support on SPU2" ON)
option(SDL2_API "Use SDL2 on PAD Linux (wxWidget mustn't be built with SDL1.2 support" ON)
option(GTK2_API "Use GTK2 api (legacy)") option(GTK2_API "Use GTK2 api (legacy)")
if(UNIX AND NOT APPLE) if(UNIX AND NOT APPLE)

7
cmake/SearchForStuff.cmake
View File

@ -146,14 +146,7 @@ else()
check_lib(SOUNDTOUCH SoundTouch SoundTouch.h PATH_SUFFIXES soundtouch) check_lib(SOUNDTOUCH SoundTouch SoundTouch.h PATH_SUFFIXES soundtouch)
check_lib(SAMPLERATE samplerate samplerate.h) check_lib(SAMPLERATE samplerate samplerate.h)
if(SDL2_API)
check_lib(SDL2 SDL2 SDL.h PATH_SUFFIXES SDL2) check_lib(SDL2 SDL2 SDL.h PATH_SUFFIXES SDL2)
alias_library(SDL::SDL PkgConfig::SDL2)
else()
# Tell cmake that we use SDL as a library and not as an application
set(SDL_BUILDING_LIBRARY TRUE)
find_package(SDL REQUIRED)
endif()
if(UNIX AND NOT APPLE) if(UNIX AND NOT APPLE)
find_package(X11 REQUIRED) find_package(X11 REQUIRED)

4
pcsx2/CMakeLists.txt
View File

@ -60,9 +60,9 @@ if(XDG_STD)
target_compile_definitions(PCSX2_FLAGS INTERFACE XDG_STD) target_compile_definitions(PCSX2_FLAGS INTERFACE XDG_STD)
endif() endif()
if(TARGET SDL::SDL) if(TARGET PkgConfig::SDL2)
target_compile_definitions(PCSX2_FLAGS INTERFACE SDL_BUILD) target_compile_definitions(PCSX2_FLAGS INTERFACE SDL_BUILD)
target_link_libraries(PCSX2_FLAGS INTERFACE SDL::SDL) target_link_libraries(PCSX2_FLAGS INTERFACE PkgConfig::SDL2)
endif() endif()
if(WIN32) if(WIN32)