Server mode not link sdl2 (#221 )

fix merge error (#220 )
2022-02-24 14:49:47 +08:00 · 2022-02-08 11:00:37 +08:00
2 changed files with 5 additions and 6 deletions
@@ -177,8 +177,11 @@ list(APPEND CC_EXTERNAL_LIBS
    png
    websockets
    webp
-    sdl2
    curl
    ${optional_libs_name}
    ${glslang_libs_name}
 )
+
+if(NOT USE_SERVER_MODE)
+  list(APPEND CC_EXTERNAL_LIBS sdl2)
+endif()
@@ -7,11 +7,7 @@ set(BOOST_LIB_NAMES

 foreach(lib ${BOOST_LIB_NAMES})
    add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/${lib} boost/${lib})
+    target_compile_definitions(boost_${lib} PUBLIC BOOST_UUID_FORCE_AUTO_LINK)
    set_target_properties(boost_${lib} PROPERTIES FOLDER Utils)
    list(APPEND CC_EXTERNAL_LIBS boost_${lib})
-foreach(lib ${BOOST_LIBS})
-    set_target_properties(${lib} PROPERTIES FOLDER Utils)
-    target_compile_definitions(${lib} PUBLIC
-        BOOST_UUID_FORCE_AUTO_LINK
-    )
 endforeach()
Author	SHA1	Message	Date
yangchaoandGitHub	f28eba4d2f	Server mode not link sdl2 (#221 )	2022-02-24 14:49:47 +08:00
Yun Hsiao WuandGitHub	5088645437	fix merge error (#220 )	2022-02-08 11:00:37 +08:00