Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

CMake: Move DISABLE_WX to ENABLE_WX #6001

Merged
merged 1 commit into from
Sep 2, 2017
Merged

CMake: Move DISABLE_WX to ENABLE_WX #6001

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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
Expand All @@ -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()
Expand Down Expand Up @@ -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)
Expand Down