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

Merge pull request #6001 from spycrab/cmake_wx 

CMake: Move DISABLE_WX to ENABLE_WX
This commit is contained in:
Pierre Bourdon 2017-09-03 01:37:04 +02:00 committed by GitHub
parent 3ae82ea669 fc4de1b872
commit 3f33b95375
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CMakeLists.txt
View File

@ -14,7 +14,7 @@ option(USE_EGL "Enables EGL OpenGL Interface" OFF)
option(TRY_X11 "Enables X11 Support" ON)
option(USE_SHARED_ENET "Use shared libenet if found rather than Dolphin's soon-to-compatibly-diverge version" OFF)
option(USE_UPNP "Enables UPnP port mapping support" ON)
option(DISABLE_WX "Disable wxWidgets (use Qt or CLI interface)" OFF)
option(ENABLE_WX "Enable wxWidgets (Default)" ON)
option(ENABLE_QT2 "Enable Qt2 (use the other experimental Qt interface)" OFF)
option(ENABLE_LTO "Enables Link Time Optimization" OFF)
option(ENABLE_GENERIC "Enables generic build that should run on any little-endian host" OFF)
@ -387,7 +387,7 @@ if(ANDROID)
set(USE_X11 0)
set(USE_UPNP 0)
set(USE_EGL 1)
set(DISABLE_WX 1)
set(ENABLE_WX 0)
set(ENABLE_QT2 0)
# We are cross compiling, search only the toolchain for libraries and includes
@ -411,7 +411,7 @@ if(ENABLE_HEADLESS)
set(USE_EGL 1)
endif()
set(USE_X11 0)
set(DISABLE_WX 1)
set(ENABLE_WX 0)
set(ENABLE_QT2 0)
add_definitions(-DUSE_HEADLESS)
endif()
@ -730,7 +730,7 @@ if(NOT ANDROID)
endif()
endif()
if(NOT DISABLE_WX)
if(ENABLE_WX)
find_package(wxWidgets 3.1.0 COMPONENTS core aui adv)
if(_ARCH_32)