@@ -14,11 +14,11 @@ file(GLOB_RECURSE SRC_FILES
1414file (GLOB EXT_FILES
1515 ${CMAKE_SOURCE_DIR} /ext /*.h
1616 ${CMAKE_SOURCE_DIR} /ext /*.cpp
17- ${CMAKE_SOURCE_DIR} /ext /gl3w/GL/*.c
18- ${CMAKE_SOURCE_DIR} /ext /cmft/*.cpp
19- ${CMAKE_SOURCE_DIR} /ext /cmft/common/*.cpp
20- ${CMAKE_SOURCE_DIR} /ext /enkiTS-C-11/src/*.cpp
21- ${CMAKE_SOURCE_DIR} /ext /NativeFileDialog/src/nfd_common.c
17+ ${CMAKE_SOURCE_DIR} /ext /gl3w/GL/*.c
18+ ${CMAKE_SOURCE_DIR} /ext /cmft/*.cpp
19+ ${CMAKE_SOURCE_DIR} /ext /cmft/common/*.cpp
20+ ${CMAKE_SOURCE_DIR} /ext /enkiTS-C-11/src/*.cpp
21+ ${CMAKE_SOURCE_DIR} /ext /NativeFileDialog/src/nfd_common.c
2222)
2323
2424if (WIN32 )
@@ -68,15 +68,15 @@ find_package(OpenGL)
6868
6969set (USE_MSVC_RUNTIME_LIBRARY_DLL true )
7070IF (NOT USE_MSVC_RUNTIME_LIBRARY_DLL)
71- #We statically link to reduce dependancies
72- FOREACH (flag_var CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE CMAKE_CXX_FLAGS_MINSIZEREL CMAKE_CXX_FLAGS_RELWITHDEBINFO CMAKE_CXX_FLAGS_RETAIL)
73- IF (${flag_var} MATCHES "/MD" )
74- STRING (REGEX REPLACE "/MD" "/MT" ${flag_var} "${${flag_var} }" )
75- ENDIF (${flag_var} MATCHES "/MD" )
76- IF (${flag_var} MATCHES "/MDd" )
77- STRING (REGEX REPLACE "/MDd" "/MTd" ${flag_var} "${${flag_var} }" )
78- ENDIF (${flag_var} MATCHES "/MDd" )
79- ENDFOREACH (flag_var)
71+ #We statically link to reduce dependancies
72+ FOREACH (flag_var CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE CMAKE_CXX_FLAGS_MINSIZEREL CMAKE_CXX_FLAGS_RELWITHDEBINFO CMAKE_CXX_FLAGS_RETAIL)
73+ IF (${flag_var} MATCHES "/MD" )
74+ STRING (REGEX REPLACE "/MD" "/MT" ${flag_var} "${${flag_var} }" )
75+ ENDIF (${flag_var} MATCHES "/MD" )
76+ IF (${flag_var} MATCHES "/MDd" )
77+ STRING (REGEX REPLACE "/MDd" "/MTd" ${flag_var} "${${flag_var} }" )
78+ ENDIF (${flag_var} MATCHES "/MDd" )
79+ ENDFOREACH (flag_var)
8080ENDIF (NOT USE_MSVC_RUNTIME_LIBRARY_DLL)
8181
8282set (SDL2_LIBS "SDL2" "SDL2main" )
@@ -148,8 +148,8 @@ set_target_properties("Imogen" PROPERTIES VS_DEBUGGER_WORKING_DIRECTORY "${CMAKE
148148#--------------------------------------------------------------------
149149if (ENABLE_HIDECONSOLE_BUILD)
150150if (MSVC )
151- set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /SUBSYSTEM:WINDOWS /ENTRY:mainCRTStartup" )
152- set (CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS} /SUBSYSTEM:WINDOWS /ENTRY:mainCRTStartup" )
151+ set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /SUBSYSTEM:WINDOWS /ENTRY:mainCRTStartup" )
152+ set (CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS} /SUBSYSTEM:WINDOWS /ENTRY:mainCRTStartup" )
153153endif ()
154154endif ()
155155
0 commit comments