Merge branch 'wotz-this-do' into 'master'

Don't force linker to work with doubly-defined symbols See merge request OpenMW/openmw!602
4 years ago · 603af3d62c
parent 561628087c c97980a0f6
commit 603af3d62c
1 changed files with 0 additions and 2 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -440,8 +440,6 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL GNU OR CMAKE_CXX_COMPILER_ID STREQUAL Clang)
    if (CMAKE_CXX_COMPILER_ID STREQUAL GNU AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 5.0 OR CMAKE_CXX_COMPILER_VERSION VERSION_EQUAL 5.0)
        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wsuggest-override")
    endif()
-elseif (MSVC)
-    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /FORCE:MULTIPLE")
 endif (CMAKE_CXX_COMPILER_ID STREQUAL GNU OR CMAKE_CXX_COMPILER_ID STREQUAL Clang)

 # Extern