Changeset 420 for cafu/trunk

Timestamp:

11/12/11 13:01:50 (6 months ago)

Author:

Carsten

Message:

Windows builds:
Under Windows (too), all our code now uses the DLL-specific version of the run-time library,
see  http://msdn.microsoft.com/en-us/library/2kzt1wy3.aspx for details.

The change was done to finally get rid of the "DLL Boundary" as summarized at  http://msdn.microsoft.com/en-us/library/ms235460.aspx

For Subversion users, updating an existing working-copy to or beyond this revision requires running these commands

rd /s ExtLibs\wxWidgets\build\msw\vc10_mswu
rd /s ExtLibs\wxWidgets\build\msw\vc10_mswud
rd /s ExtLibs\wxWidgets\lib\vc10_lib

before scons is run next.

As a consequence of this change, deploying binary releases becomes slightly more complicated than before,
because we also have to ship the proper run-time libraries together with our applications.
See  http://msdn.microsoft.com/en-us/library/dd293574.aspx for details.

Location:

cafu/trunk

Files:

• SConscript (modified) (1 diff)
• SConstruct (modified) (4 diffs)

cafu/trunk/SConscript

@@ -170 +170 @@
             {"vc8": "vs2005", "vc9": "vs2008", "vc10": "vs2010"}[compiler] + "/" +
             ("x64" if envCaWE["TARGET_ARCH"] in ["x86_64", "amd64", "emt64"] else "x86")])
-        envCaWE.Append(LIBS=["fbxsdk-2012.1-mtd" if buildMode=="dbg" else "fbxsdk-2012.1-mt", "wininet"])
+        envCaWE.Append(LIBS=["fbxsdk-2012.1-mdd" if buildMode=="dbg" else "fbxsdk-2012.1-md", "wininet"])
 
 elif sys.platform=="linux2":

cafu/trunk/SConstruct

@@ -66 +66 @@
         # Environment for debug builds:
         envDebug=envCommon.Clone();
-        envDebug.Append(CCFLAGS=Split("/MTd /Od /Z7 /RTC1"));
+        envDebug.Append(CCFLAGS=Split("/MDd /Od /Z7 /RTC1"));
         envDebug.Append(LINKFLAGS=["/debug"]);
 
         # Environment for release builds:
         envRelease=envCommon.Clone();
-        envRelease.Append(CCFLAGS=Split("/MT /O2 /Ob2"));
+        envRelease.Append(CCFLAGS=Split("/MD /O2 /Ob2"));
 
         # Environment for profile builds:
         envProfile=envCommon.Clone();
-        envProfile.Append(CCFLAGS=Split("/MT /O2 /Ob2 /Z7"));
+        envProfile.Append(CCFLAGS=Split("/MD /O2 /Ob2 /Z7"));
         envProfile.Append(LINKFLAGS=["/fixed:no", "/debug"]);
 
@@ -106 +106 @@
         # Environment for debug builds:
         envDebug=envCommon.Clone();
-        envDebug.Append(CCFLAGS=Split("/MTd /Od /Z7 /RTC1"));
+        envDebug.Append(CCFLAGS=Split("/MDd /Od /Z7 /RTC1"));
         envDebug.Append(LINKFLAGS=["/debug"]);
 
         # Environment for release builds:
         envRelease=envCommon.Clone();
-        envRelease.Append(CCFLAGS=Split("/MT /O2 /Ob2"));
+        envRelease.Append(CCFLAGS=Split("/MD /O2 /Ob2"));
 
         # Environment for profile builds:
         envProfile=envCommon.Clone();
-        envProfile.Append(CCFLAGS=Split("/MT /O2 /Ob2 /Z7"));
+        envProfile.Append(CCFLAGS=Split("/MD /O2 /Ob2 /Z7"));
         envProfile.Append(LINKFLAGS=["/fixed:no", "/debug"]);
 
@@ -140 +140 @@
         # Environment for debug builds:
         envDebug=envCommon.Clone();
-        envDebug.Append(CCFLAGS=Split("/MTd /Od /Z7 /RTC1"));
+        envDebug.Append(CCFLAGS=Split("/MDd /Od /Z7 /RTC1"));
         envDebug.Append(LINKFLAGS=["/debug"]);
 
         # Environment for release builds:
         envRelease=envCommon.Clone();
-        envRelease.Append(CCFLAGS=Split("/MT /O2 /Ob2"));
+        envRelease.Append(CCFLAGS=Split("/MD /O2 /Ob2"));
 
         # Environment for profile builds:
         envProfile=envCommon.Clone();
-        envProfile.Append(CCFLAGS=Split("/MT /O2 /Ob2 /Z7"));
+        envProfile.Append(CCFLAGS=Split("/MD /O2 /Ob2 /Z7"));
         envProfile.Append(LINKFLAGS=["/fixed:no", "/debug"]);
 
@@ -279 +279 @@
         else:                                                          target_cpu=""
 
-        result=envDebug.  Execute("nmake /nologo /f makefile.vc BUILD=debug   SHARED=0 RUNTIME_LIBS=static COMPILER_PREFIX="+compiler+target_cpu, chdir="ExtLibs/wxWidgets/build/msw");
+        result=envDebug.  Execute("nmake /nologo /f makefile.vc BUILD=debug   SHARED=0 COMPILER_PREFIX="+compiler+target_cpu, chdir="ExtLibs/wxWidgets/build/msw");
         if (result!=0): envDebug.  Exit(result);
-        result=envRelease.Execute("nmake /nologo /f makefile.vc BUILD=release SHARED=0 RUNTIME_LIBS=static COMPILER_PREFIX="+compiler+target_cpu, chdir="ExtLibs/wxWidgets/build/msw");
+        result=envRelease.Execute("nmake /nologo /f makefile.vc BUILD=release SHARED=0 COMPILER_PREFIX="+compiler+target_cpu, chdir="ExtLibs/wxWidgets/build/msw");
         if (result!=0): envRelease.Exit(result);
         print "";   # Print just another empty line for better visual separation.