X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=CMakeLists.txt;h=1ec1f627ec1cdfd416ae01d6cc62086adea442f5;hb=1456635c558aa95c898d01f5c7ad50a773f6ff58;hp=0e1c46fe263443f75ef6bca30925a105b7da90cb;hpb=ede9a03d070243c514450ceff3cfb2a59242f854;p=flightgear.git diff --git a/CMakeLists.txt b/CMakeLists.txt index 0e1c46fe2..1ec1f627e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -194,6 +194,9 @@ if(WIN32) # endforeach(warning) set(MSVC_FLAGS "-DNOMINMAX -D_USE_MATH_DEFINES -D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS -D__CRT_NONSTDC_NO_WARNINGS") + if (${MSVC_VERSION} EQUAL 1600) + set( MSVC_LD_FLAGS "/FORCE:MULTIPLE" ) + endif (${MSVC_VERSION} EQUAL 1600) endif(MSVC) set(NOMINMAX 1) @@ -202,6 +205,7 @@ endif(WIN32) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${WARNING_FLAGS} ${MSVC_FLAGS} -D_REENTRANT") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${WARNING_FLAGS} ${MSVC_FLAGS} -D_REENTRANT") +set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${MSVC_LD_FLAGS}") include_directories(${OPENSCENEGRAPH_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS}