commit
ae0f9c200d
|
@ -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)
|
||||
|
|
|
@ -0,0 +1,19 @@
|
|||
if(NOT(USE_X11 OR ENABLE_HEADLESS))
|
||||
return()
|
||||
endif()
|
||||
|
||||
set(NOGUI_SRCS MainNoGUI.cpp)
|
||||
|
||||
add_executable(dolphin-nogui ${NOGUI_SRCS})
|
||||
set_target_properties(dolphin-nogui PROPERTIES OUTPUT_NAME dolphin-emu-nogui)
|
||||
|
||||
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})
|
||||
|
|
@ -168,7 +168,7 @@ void Host_YieldToUI()
|
|||
|
||||
#if HAVE_X11
|
||||
#include <X11/keysym.h>
|
||||
#include "DolphinWX/X11Utils.h"
|
||||
#include "UICommon/X11Utils.h"
|
||||
|
||||
class PlatformX11 : public Platform
|
||||
{
|
|
@ -79,13 +79,6 @@ set(GUI_SRCS
|
|||
WxUtils.cpp
|
||||
)
|
||||
|
||||
set(NOGUI_SRCS MainNoGUI.cpp)
|
||||
|
||||
if(USE_X11)
|
||||
set(GUI_SRCS ${GUI_SRCS} X11Utils.cpp)
|
||||
set(NOGUI_SRCS ${NOGUI_SRCS} X11Utils.cpp)
|
||||
endif()
|
||||
|
||||
set(WXLIBS ${wxWidgets_LIBRARIES})
|
||||
|
||||
if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
|
||||
|
@ -200,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()
|
||||
|
|
|
@ -30,7 +30,7 @@
|
|||
#include "DolphinWX/WxUtils.h"
|
||||
|
||||
#if defined(HAVE_XRANDR) && HAVE_XRANDR
|
||||
#include "DolphinWX/X11Utils.h"
|
||||
#include "UICommon/X11Utils.h"
|
||||
#endif
|
||||
|
||||
static const std::array<std::string, 29> language_ids{{
|
||||
|
|
|
@ -41,7 +41,7 @@
|
|||
#include "InputCommon/GCAdapter.h"
|
||||
|
||||
#if defined(HAVE_XRANDR) && HAVE_XRANDR
|
||||
#include "DolphinWX/X11Utils.h"
|
||||
#include "UICommon/X11Utils.h"
|
||||
#endif
|
||||
|
||||
ControllerConfigDiag::ControllerConfigDiag(wxWindow* const parent)
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
#include "InputCommon/GCPadStatus.h"
|
||||
|
||||
#if defined(HAVE_X11) && HAVE_X11
|
||||
#include "DolphinWX/X11Utils.h"
|
||||
#include "UICommon/X11Utils.h"
|
||||
#endif
|
||||
|
||||
// Class declarations
|
||||
|
|
|
@ -5,6 +5,10 @@ set(SRCS
|
|||
USBUtils.cpp
|
||||
)
|
||||
|
||||
if(USE_X11)
|
||||
set(SRCS ${SRCS} X11Utils.cpp)
|
||||
endif()
|
||||
|
||||
set(LIBS common cpp-optparse)
|
||||
if(LIBUSB_FOUND)
|
||||
set(LIBS ${LIBS} ${LIBUSB_LIBRARIES})
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
// Licensed under GPLv2+
|
||||
// Refer to the license.txt file included.
|
||||
|
||||
#include "DolphinWX/X11Utils.h"
|
||||
#include "UICommon/X11Utils.h"
|
||||
|
||||
#include <algorithm>
|
||||
#include <cstdio>
|
Loading…
Reference in New Issue