[Bf-blender-cvs] [1283c66] master: Revert part of 4adffde02c98f3bb058ffba5ea010a6b1045a7b1 to get Windows (MSVC2013) compiling again

Joshua Leung noreply at git.blender.org
Wed May 18 13:43:56 CEST 2016


Commit: 1283c66146732bdb04591f2d84518a6609376360
Author: Joshua Leung
Date:   Wed May 18 23:40:32 2016 +1200
Branches: master
https://developer.blender.org/rB1283c66146732bdb04591f2d84518a6609376360

Revert part of 4adffde02c98f3bb058ffba5ea010a6b1045a7b1 to get Windows (MSVC2013) compiling again

===================================================================

M	CMakeLists.txt

===================================================================

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 44a9b68..6527cf1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1328,15 +1328,8 @@ elseif(WIN32)
 		set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /MT")
 		set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} /MT")
 
-		set(PLATFORM_LINKFLAGS
-			"/SUBSYSTEM:CONSOLE "
-			"/STACK:2097152 "
-			"/INCREMENTAL:NO "
-			"/NODEFAULTLIB:msvcrt.lib "
-			"/NODEFAULTLIB:msvcmrt.lib "
-			"/NODEFAULTLIB:msvcurt.lib "
-			"/NODEFAULTLIB:msvcrtd.lib "
-		)
+		set(PLATFORM_LINKFLAGS "/SUBSYSTEM:CONSOLE /STACK:2097152 /INCREMENTAL:NO ")
+		set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} /NODEFAULTLIB:msvcrt.lib /NODEFAULTLIB:msvcmrt.lib /NODEFAULTLIB:msvcurt.lib /NODEFAULTLIB:msvcrtd.lib ")
 
 		# Ignore meaningless for us linker warnings.
 		set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} /ignore:4049 /ignore:4217 /ignore:4221")




More information about the Bf-blender-cvs mailing list