Moved NoGUI out of DolphinWx.

This commit is contained in:
Vlad Firoiu 2016-05-05 19:55:29 -04:00
parent 6a89cf0201
commit bc9db6de56
4 changed files with 28 additions and 10 deletions

View File

@ -3,6 +3,7 @@ add_subdirectory(Common)
add_subdirectory(Core)
add_subdirectory(DiscIO)
add_subdirectory(DolphinWX)
add_subdirectory(DolphinNoGUI)
add_subdirectory(InputCommon)
add_subdirectory(UICommon)
add_subdirectory(VideoCommon)

View File

@ -0,0 +1,27 @@
if(NOT(USE_X11 OR ENABLE_HEADLESS))
return()
endif()
if(APPLE)
set(DOLPHIN_EXE_BASE Dolphin)
else()
set(DOLPHIN_EXE_BASE dolphin-emu)
endif()
set(DOLPHIN_NOGUI_EXE ${DOLPHIN_EXE_BASE}-nogui)
set(NOGUI_SRCS MainNoGUI.cpp)
add_executable(dolphin-nogui ${NOGUI_SRCS})
set_target_properties(dolphin-nogui PROPERTIES OUTPUT_NAME ${DOLPHIN_NOGUI_EXE})
target_link_libraries(dolphin-nogui PRIVATE
core
uicommon
cpp-optparse
${LIBS}
)
set(CPACK_PACKAGE_EXECUTABLES ${CPACK_PACKAGE_EXECUTABLES} dolphin-nogui)
install(TARGETS dolphin-nogui RUNTIME DESTINATION ${bindir})

View File

@ -79,8 +79,6 @@ set(GUI_SRCS
WxUtils.cpp
)
set(NOGUI_SRCS MainNoGUI.cpp)
set(WXLIBS ${wxWidgets_LIBRARIES})
if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
@ -195,11 +193,3 @@ if(wxWidgets_FOUND)
set(CPACK_PACKAGE_EXECUTABLES ${CPACK_PACKAGE_EXECUTABLES} ${DOLPHIN_EXE})
endif()
if(USE_X11 OR ENABLE_HEADLESS)
set(DOLPHIN_NOGUI_EXE ${DOLPHIN_EXE_BASE}-nogui)
add_executable(${DOLPHIN_NOGUI_EXE} ${SRCS} ${NOGUI_SRCS})
target_link_libraries(${DOLPHIN_NOGUI_EXE} ${LIBS})
set(CPACK_PACKAGE_EXECUTABLES ${CPACK_PACKAGE_EXECUTABLES} ${DOLPHIN_NOGUI_EXE})
install(TARGETS ${DOLPHIN_NOGUI_EXE} RUNTIME DESTINATION ${bindir})
endif()