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

Make FindwxWidgets find the correct version/toolkit via wx-config. 

WX_vs_SDL() is still needed.
This commit is contained in:
Miguel A. Colón Vélez 2015-01-09 07:10:11 -05:00
parent cc9b6fa5a4
commit 3b83d6d302
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
cmake/SearchForStuff.cmake
View File

@ -23,6 +23,18 @@ else()
set(wxWidgets_CONFIG_OPTIONS --unicode=yes)
endif()
if(WX28_API)
list(APPEND wxWidgets_CONFIG_OPTIONS --version=2.8)
else()
list(APPEND wxWidgets_CONFIG_OPTIONS --version=3.0)
endif()
if(GTK3_API)
list(APPEND wxWidgets_CONFIG_OPTIONS --toolkit=gtk3)
else()
list(APPEND wxWidgets_CONFIG_OPTIONS --toolkit=gtk2)
endif()
# wx2.8 => /usr/bin/wx-config-2.8, /usr/bin/wxrc-2.8
# lib32-wx2.8 => /usr/bin/wx-config32-2.8, /usr/bin/wxrc32-2.8
# wx3.0 => /usr/bin/wx-config-3.0, /usr/bin/wxrc-3.0
@ -157,5 +169,3 @@ include_directories(${CMAKE_SOURCE_DIR}/common/include
#----------------------------------------
include(ApiValidation)
WX_vs_SDL()
WX_vs_GTK3()
WX_version()