From 975ce7f352f0a4480372b1a69bff22f888f8445e Mon Sep 17 00:00:00 2001 From: Taylor Richards Date: Sun, 23 Oct 2016 21:24:06 -0400 Subject: [PATCH] don't build standalone gui for FS1 demo --- CMakeLists.txt | 47 +++++++++++++++++++++++++---------------------- 1 file changed, 25 insertions(+), 22 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index bc795b3..4831e34 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -188,33 +188,36 @@ endif() # standalone server GUI # -if(FS1) - set(STANDALONE_BINARY fsstandalone) -else() - set(STANDALONE_BINARY fs2standalone) -endif() +# Not for FS1 Demo +if(NOT FS1 OR NOT DEMO) + if(FS1) + set(STANDALONE_BINARY fsstandalone) + else() + set(STANDALONE_BINARY fs2standalone) + endif() -add_executable(${STANDALONE_BINARY} - WIN32 - ${standalone_SOURCE} - ${standalone_HEADERS} -) + add_executable(${STANDALONE_BINARY} + WIN32 + ${standalone_SOURCE} + ${standalone_HEADERS} + ) -CreateSourceGroups(${standalone_SOURCE}) + CreateSourceGroups(${standalone_SOURCE}) -target_link_libraries( - ${STANDALONE_BINARY} - ${SDL2_LIBRARY} - ${wxWidgets_LIBRARIES} - ${LIBWEBSOCKETS_LIBRARIES} - ${PLATFORM_LIBRARIES} -) + target_link_libraries( + ${STANDALONE_BINARY} + ${SDL2_LIBRARY} + ${wxWidgets_LIBRARIES} + ${LIBWEBSOCKETS_LIBRARIES} + ${PLATFORM_LIBRARIES} + ) -set_target_properties(${STANDALONE_BINARY} PROPERTIES PROJECT_LABEL "Standalone") + set_target_properties(${STANDALONE_BINARY} PROPERTIES PROJECT_LABEL "Standalone") -# wxWidgets appears to need c++11 for one or more headers -if(NOT WIN32) - set_target_properties(${STANDALONE_BINARY} PROPERTIES COMPILE_FLAGS -std=c++11) + # wxWidgets appears to need c++11 for one or more headers + if(NOT WIN32) + set_target_properties(${STANDALONE_BINARY} PROPERTIES COMPILE_FLAGS -std=c++11) + endif() endif() # -- 2.39.2