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

linux: drop wx2.8 support. Only 3.0 is supported 

Close #1152
This commit is contained in:
Gregory Hainaut 2016-01-30 12:48:35 +01:00
parent 91e46a94f5
commit 3329bc1748
3 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.sh
View File

@ -62,7 +62,6 @@ for ARG in "$@"; do
--sdl12 ) flags+=(-DSDL2_API=FALSE) ;; --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) ;;
--gtk3 ) flags+=(-DGTK3_API=TRUE) ;; --gtk3 ) flags+=(-DGTK3_API=TRUE) ;;
--no-simd ) flags+=(-DDISABLE_ADVANCE_SIMD=TRUE) ;; --no-simd ) flags+=(-DDISABLE_ADVANCE_SIMD=TRUE) ;;
--cross-multilib ) flags+=(-DCMAKE_TOOLCHAIN_FILE=$toolfile); useCross=1; ;; --cross-multilib ) flags+=(-DCMAKE_TOOLCHAIN_FILE=$toolfile); useCross=1; ;;
@ -88,7 +87,6 @@ for ARG in "$@"; do
echo echo
echo "** Distribution Compatibilities **" echo "** Distribution Compatibilities **"
echo "--sdl12 : Build with SDL1.2 (requires if wx is linked against SDL1.2)" echo "--sdl12 : Build with SDL1.2 (requires if wx is linked against SDL1.2)"
echo "--wx28 : Force wxWidget 2.8"
echo echo
echo "** Expert Developer option **" echo "** Expert Developer option **"
echo "--gtk3 : replace GTK2 by GTK3" echo "--gtk3 : replace GTK2 by GTK3"

1
cmake/BuildParameters.cmake
View File

@ -45,7 +45,6 @@ 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 (wxWidget mustn't be built with SDL1.2 support" ON) 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)") option(GTK3_API "Use GTK3 api (experimental/wxWidget must be built with GTK3 support)")
if(PACKAGE_MODE) if(PACKAGE_MODE)

14
cmake/SearchForStuff.cmake
View File

@ -25,11 +25,7 @@ else()
set(wxWidgets_CONFIG_OPTIONS --unicode=yes) set(wxWidgets_CONFIG_OPTIONS --unicode=yes)
endif() endif()
if(WX28_API) list(APPEND wxWidgets_CONFIG_OPTIONS --version=3.0)
list(APPEND wxWidgets_CONFIG_OPTIONS --version=2.8)
else()
list(APPEND wxWidgets_CONFIG_OPTIONS --version=3.0)
endif()
if(GTK3_API AND NOT APPLE) if(GTK3_API AND NOT APPLE)
list(APPEND wxWidgets_CONFIG_OPTIONS --toolkit=gtk3) list(APPEND wxWidgets_CONFIG_OPTIONS --toolkit=gtk3)
@ -45,16 +41,12 @@ endif()
# FindwxWidgets only searches for wx-config. # FindwxWidgets only searches for wx-config.
if(CMAKE_CROSSCOMPILING) if(CMAKE_CROSSCOMPILING)
# May need to fix the filenames for lib32-wx3.0. # May need to fix the filenames for lib32-wx3.0.
if(NOT WX28_API AND ${PCSX2_TARGET_ARCHITECTURES} MATCHES "i386" AND EXISTS "/usr/bin/wx-config32-3.0") if(${PCSX2_TARGET_ARCHITECTURES} MATCHES "i386" AND EXISTS "/usr/bin/wx-config32-3.0")
set(wxWidgets_CONFIG_EXECUTABLE "/usr/bin/wx-config32-3.0") set(wxWidgets_CONFIG_EXECUTABLE "/usr/bin/wx-config32-3.0")
elseif(WX28_API AND ${PCSX2_TARGET_ARCHITECTURES} MATCHES "i386" AND EXISTS "/usr/bin/wx-config32-2.8")
set(wxWidgets_CONFIG_EXECUTABLE "/usr/bin/wx-config32-2.8")
endif() endif()
else() else()
if(NOT WX28_API AND EXISTS "/usr/bin/wx-config-3.0") if(EXISTS "/usr/bin/wx-config-3.0")
set(wxWidgets_CONFIG_EXECUTABLE "/usr/bin/wx-config-3.0") set(wxWidgets_CONFIG_EXECUTABLE "/usr/bin/wx-config-3.0")
elseif(WX28_API AND EXISTS "/usr/bin/wx-config-2.8")
set(wxWidgets_CONFIG_EXECUTABLE "/usr/bin/wx-config-2.8")
endif() endif()
endif() endif()