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

Use Externals/wxWidgets3 instead of Externals/wxWidgets under OS X. 

The "3" variant has some extra stuff merged that helps under OS X.
This split should not last longer than until the wxWidgets 3.0 release.
This commit is contained in:
Maarten ter Huurne 2011-12-04 03:59:42 +01:00
parent ffb06c23ac
commit 7f578ce1ae
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
CMakeLists.txt
View File

@ -433,8 +433,15 @@ if(NOT DISABLE_WX)
message(FATAL_ERROR "wxWidgets not found. It is required to build the GUI")
endif()
message("Shared wxWidgets not found, falling back to the static library")
include_directories(Externals/wxWidgets/include)
add_subdirectory(Externals/wxWidgets)
if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
add_definitions(-D__WXOSX_COCOA__)
include_directories(Externals/wxWidgets3)
include_directories(Externals/wxWidgets3/include)
add_subdirectory(Externals/wxWidgets3)
else()
include_directories(Externals/wxWidgets/include)
add_subdirectory(Externals/wxWidgets)
endif()
endif(wxWidgets_FOUND)
add_definitions(-DHAVE_WX=1)
endif(NOT DISABLE_WX)