piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-31 10:09:36 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3737 from EmptyChaos/update-wx

Browse Source 
Externals: Update wxWidgets to 3.1.0
This commit is contained in:
Mat M
2016-07-15 09:48:14 -04:00
committed by GitHub
parent 7ca32f4b97 822326eea9
commit fac7d09091
1748 changed files with 58822 additions and 84433 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@ -846,7 +846,7 @@ if(NOT DISABLE_WX)
ERROR_QUIET
)
message("Found wxWidgets version ${wxWidgets_VERSION}")
set(wxMIN_VERSION "3.0.1")
set(wxMIN_VERSION "3.1.0")
if(${wxWidgets_VERSION} VERSION_LESS ${wxMIN_VERSION})
message("At least ${wxMIN_VERSION} is required; ignoring found version")
unset(wxWidgets_FOUND)
@ -887,12 +887,13 @@ if(NOT DISABLE_WX)
# not when building wx itself (see wxw3 CMakeLists.txt for that)
if(APPLE)
add_definitions(-D__WXOSX_COCOA__)
elseif(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
elseif(${CMAKE_SYSTEM_NAME} MATCHES "Linux|FreeBSD")
add_definitions(-D__WXGTK__)
# Check for required libs
check_lib(GTHREAD2 gthread-2.0 gthread-2.0 glib/gthread.h REQUIRED)
check_lib(PANGOCAIRO pangocairo pangocairo pango/pangocairo.h REQUIRED)
find_package(Backtrace REQUIRED)
elseif(WIN32)
add_definitions(-D__WXMSW__)
else()