build fix

nesbox · Jun 1, 2024 · 1483632 · 1483632
1 parent 3e37e88
commit 1483632
Showing 1 changed file with 5 additions and 15 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -43,12 +43,10 @@ endif()
 if (BUILD_NO_OPTIMIZATION)
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -O0")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -O0")
-else()
-    if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
-        set(LINKER_FLAGS_MINSIZEREL "-Wl,-dead_strip")
-        set(CMAKE_EXE_LINKER_FLAGS_MINSIZEREL "${CMAKE_EXE_LINKER_FLAGS_MINSIZEREL} ${LINKER_FLAGS_MINSIZEREL}")
-        set(CMAKE_SHARED_LINKER_FLAGS_MINSIZEREL "${CMAKE_SHARED_LINKER_FLAGS_MINSIZEREL} ${LINKER_FLAGS_MINSIZEREL}")
-    endif()
+elseif(NOT EMSCRIPTEN AND CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+    set(LINKER_FLAGS_MINSIZEREL "-Wl,-dead_strip")
+    set(CMAKE_EXE_LINKER_FLAGS_MINSIZEREL "${CMAKE_EXE_LINKER_FLAGS_MINSIZEREL} ${LINKER_FLAGS_MINSIZEREL}")
+    set(CMAKE_SHARED_LINKER_FLAGS_MINSIZEREL "${CMAKE_SHARED_LINKER_FLAGS_MINSIZEREL} ${LINKER_FLAGS_MINSIZEREL}")
 endif()
 
 if (BUILD_ASAN_DEBUG)
@@ -100,17 +98,9 @@ if(MSVC)
         set( CMAKE_LIBRARY_OUTPUT_DIRECTORY_${OUTPUTCONFIG} ${CMAKE_BINARY_DIR}/lib )
         set( CMAKE_RUNTIME_OUTPUT_DIRECTORY_${OUTPUTCONFIG} ${CMAKE_BINARY_DIR}/bin )
 
-        # use static runtime
-        # !TODO: use set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>") from cmake 3.15 instead
-        if(CMAKE_C_FLAGS_${OUTPUTCONFIG} MATCHES "/MD")
-            string(REGEX REPLACE "/MD" "/MT" CMAKE_C_FLAGS_${OUTPUTCONFIG} "${CMAKE_C_FLAGS_${OUTPUTCONFIG}}")
-        endif()
-
-        if(CMAKE_CXX_FLAGS_${OUTPUTCONFIG} MATCHES "/MD")
-            string(REGEX REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_${OUTPUTCONFIG} "${CMAKE_CXX_FLAGS_${OUTPUTCONFIG}}")
-        endif()
     endforeach()
 
+    set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
 else()
 
     set(CMAKE_C_STANDARD 11)