Skip to content

Commit

Permalink
Merge pull request #6819 from spycrab/delete_wx
Browse files Browse the repository at this point in the history
Remove DolphinWX
  • Loading branch information
spycrab committed Jun 29, 2018
2 parents 2272900 + 44b22c9 commit e22c533
Show file tree
Hide file tree
Showing 2,116 changed files with 3 additions and 758,198 deletions.
29 changes: 1 addition & 28 deletions CMakeLists.txt
Expand Up @@ -21,7 +21,6 @@ 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(ENABLE_QT2 "Enable Qt (Default)" ON)
option(ENABLE_WX "Enable wxWidgets (Legacy)" ON)
option(ENABLE_LTO "Enables Link Time Optimization" OFF)
option(ENABLE_GENERIC "Enables generic build that should run on any little-endian host" OFF)
option(ENABLE_HEADLESS "Enables running Dolphin as a headless variant" OFF)
Expand Down Expand Up @@ -365,7 +364,6 @@ if(ANDROID)
set(USE_X11 0)
set(USE_UPNP 0)
set(USE_EGL 1)
set(ENABLE_WX 0)
set(ENABLE_QT2 0)
set(USE_DISCORD_PRESENCE 0)

Expand All @@ -388,7 +386,6 @@ if(ENABLE_HEADLESS)
set(USE_EGL 1)
endif()
set(USE_X11 0)
set(ENABLE_WX 0)
set(ENABLE_QT2 0)
set(USE_DISCORD_PRESENCE 0)
add_definitions(-DUSE_HEADLESS)
Expand Down Expand Up @@ -695,35 +692,11 @@ if(NOT ANDROID)
endif()
endif()

if(ENABLE_WX)
find_package(wxWidgets 3.1.0 COMPONENTS core aui adv)

if(_ARCH_32)
add_definitions(-DwxSIZE_T_IS_UINT)
endif()

if(wxWidgets_FOUND)
message(STATUS "wxWidgets found")
if(NOT TARGET wxWidgets::wxWidgets)
add_library(wxWidgets::wxWidgets INTERFACE IMPORTED)
set_target_properties(wxWidgets::wxWidgets PROPERTIES
INTERFACE_LINK_LIBRARIES "${wxWidgets_LIBRARIES}"
INTERFACE_INCLUDE_DIRECTORIES "${wxWidgets_INCLUDE_DIRS}"
INTERFACE_COMPILE_DEFINITIONS "${wxWidgets_DEFINITIONS}"
INTERFACE_COMPILE_OPTIONS "${wxWidgets_CXX_FLAGS}"
)
endif()
else()
message(STATUS "Using static wxWidgets from Externals")
add_subdirectory(Externals/wxWidgets3)
set(wxWidgets_FOUND TRUE)
endif()
endif()

if(USE_DISCORD_PRESENCE)
message(STATUS "Using static DiscordRPC from Externals")
add_subdirectory(Externals/discord-rpc)
endif()
endif()

find_package(Libsystemd)
if(SYSTEMD_FOUND)
Expand Down

0 comments on commit e22c533

Please sign in to comment.