diff options
| author | Sky <git@bunnies.cc> | 2013-10-18 18:10:41 +0100 |
|---|---|---|
| committer | Sky <git@bunnies.cc> | 2013-10-18 18:10:41 +0100 |
| commit | b2574542b1d456a46baa8e6c0d351157b9cb18b3 (patch) | |
| tree | e004e0894ae40b9a63160ea237b4ef4ec9aceda3 /CMakeLists.txt | |
| parent | 709252fe9ecec3cc388966d695844f2593029c4f (diff) | |
| parent | dcf58cdf12ae9370ba1bf9d6bb789649db82e520 (diff) | |
| download | PrismLauncher-b2574542b1d456a46baa8e6c0d351157b9cb18b3.tar.gz PrismLauncher-b2574542b1d456a46baa8e6c0d351157b9cb18b3.tar.bz2 PrismLauncher-b2574542b1d456a46baa8e6c0d351157b9cb18b3.zip | |
Merge branch 'develop' of github.com:MultiMC/MultiMC5 into develop
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 64823772..b7dd6ea3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -350,6 +350,15 @@ IF(WIN32) SET(MULTIMC_RCS multimc.rc) ENDIF() +####### X11 Stuff ####### +IF(UNIX AND NOT APPLE) + SET(MultiMC_QT_ADDITIONAL_MODULES ${MultiMC_QT_ADDITIONAL_MODULES} X11Extras) + SET(MultiMC_LINK_ADDITIONAL_LIBS ${MultiMC_LINK_ADDITIONAL_LIBS} xcb) + LIST(APPEND MULTIMC_SOURCES gui/platform_x11.cpp) +ELSE() + LIST(APPEND MULTIMC_SOURCES gui/platform_other.cpp) +ENDIF() + ################################ COMPILE ################################ @@ -380,7 +389,7 @@ ADD_EXECUTABLE(MultiMC MACOSX_BUNDLE WIN32 # Link TARGET_LINK_LIBRARIES(MultiMC xz-embedded unpack200 quazip libUtil libSettings libGroupView ${MultiMC_LINK_ADDITIONAL_LIBS}) -QT5_USE_MODULES(MultiMC Core Widgets Network Xml) +QT5_USE_MODULES(MultiMC Core Widgets Network Xml ${MultiMC_QT_ADDITIONAL_MODULES}) ADD_DEPENDENCIES(MultiMC MultiMCLauncher) option(BUILD_KEYRING_TEST "Build the simple keyring test binary" OFF) |