Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove the forcing of "/MT" #2117

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Remove the forcing of "/MT" #2117

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c34067e
Add CINDER_MSVC_MT
Jul 18, 2019
be28c59
remove the forcing of MT
fei4xu Jul 19, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 0 additions & 11 deletions proj/cmake/modules/cinderMakeApp.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,17 +110,6 @@ function( ci_make_app )
endif()
elseif( CINDER_MSW )
if( MSVC )
# Override the default /MD with /MT
foreach(
flag_var
CMAKE_C_FLAGS CMAKE_C_FLAGS_DEBUG CMAKE_C_FLAGS_RELEASE CMAKE_C_FLAGS_MINSIZEREL CMAKE_C_FLAGS_RELWITHDEBINFO
CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE CMAKE_CXX_FLAGS_MINSIZEREL CMAKE_CXX_FLAGS_RELWITHDEBINFO
)
if( ${flag_var} MATCHES "/MD" )
string( REGEX REPLACE "/MD" "/MT" ${flag_var} "${${flag_var}}" )
set( "${flag_var}" "${${flag_var}}" PARENT_SCOPE )
endif()
endforeach()
# Force synchronous PDB writes
add_compile_options( /FS )
# Force multiprocess compilation
Expand Down
10 changes: 0 additions & 10 deletions proj/cmake/platform_msw.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,16 +108,6 @@ list( APPEND CINDER_INCLUDE_SYSTEM_PRIVATE
list( APPEND CINDER_DEFINES "_LIB;UNICODE;_UNICODE;NOMINMAX;_WIN32_WINNT=0x0601;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS" )

if( MSVC )
# Override the default /MD with /MT
foreach(
flag_var
CMAKE_C_FLAGS CMAKE_C_FLAGS_DEBUG CMAKE_C_FLAGS_RELEASE CMAKE_C_FLAGS_MINSIZEREL CMAKE_C_FLAGS_RELWITHDEBINFO
CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE CMAKE_CXX_FLAGS_MINSIZEREL CMAKE_CXX_FLAGS_RELWITHDEBINFO
)
if( ${flag_var} MATCHES "/MD" )
string( REGEX REPLACE "/MD" "/MT" ${flag_var} "${${flag_var}}" )
endif()
endforeach()
# Force synchronous PDB writes
add_compile_options( /FS )
# Force multiprocess compilation
Expand Down