[Csp-commits] svn:csp r2229 - trunk/csp

[<sv...@ww...>]

Author: nsmoooose
Date: 2008-04-14 05:02:15 -0700 (Mon, 14 Apr 2008)
New Revision: 2229

Modified:
   trunk/csp/SConstruct
Log:
It is now possible to build using debug or release in windows without manual edit of SConstruct.
Simply type the following when you need to build using debug on windows.
  scons all debug=1

Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=2229

Modified: trunk/csp/SConstruct
===================================================================
--- trunk/csp/SConstruct	2008-03-26 06:06:52 UTC (rev 2228)
+++ trunk/csp/SConstruct	2008-04-14 12:02:15 UTC (rev 2229)
@@ -111,6 +111,7 @@
 
 	  scons config           check for necessary headers and libraries
 	  scons all              build everything
+	  scons all debug=1      build everything in debug mode (windows)
 	  scons cspsim           build the main flight simulator client
 	  scons indexserver      build the master server needed for multiplayer
 	  scons dox              generate doxygen documentation
@@ -129,12 +130,23 @@
 		env.Replace(SWIGINCLUDES=self.INCLUDE)
 
 	def customize_win(self, env):
-		env.Replace(CXXFLAGS=Split('/GR /MD /O2 /EHsc /W3 /nologo'))
-		env.AppendUnique(CPPDEFINES=Split('WIN32 __WIN32__ _USRDLL _DLL NDEBUG _CRT_SECURE_NO_DEPRECATE'))
-		env.AppendUnique(LINKFLAGS=Split('/INCREMENTAL:NO /RELEASE /nologo'))
-		env.AppendUnique(SHLINKFLAGS=Split('/INCREMENTAL:NO /RELEASE /nologo'))
-		env.AppendUnique(LIBPATH=[build.GetPythonLibrary()])
-		env.CopyEnvironment(Split('PATH INCLUDE LIB'))
+		debug = ARGUMENTS.get('debug', 0)
+		if int(debug) == 0:
+			print('Building release configuration')
+			env.Replace(CXXFLAGS=Split('/GR /MD /O2 /EHsc /W3 /nologo'))
+			env.AppendUnique(CPPDEFINES=Split('WIN32 __WIN32__ _USRDLL _DLL NDEBUG _CRT_SECURE_NO_DEPRECATE'))
+			env.AppendUnique(LINKFLAGS=Split('/INCREMENTAL:NO /RELEASE /nologo'))
+			env.AppendUnique(SHLINKFLAGS=Split('/INCREMENTAL:NO /RELEASE /nologo'))
+			env.AppendUnique(LIBPATH=[build.GetPythonLibrary()])
+			env.CopyEnvironment(Split('PATH INCLUDE LIB'))
+		else:
+			print('Building debug configuration')
+			env.Replace(CXXFLAGS=Split('/GR /MD /Zi /EHsc /W3 /nologo'))
+			env.AppendUnique(CPPDEFINES=Split('WIN32 __WIN32__ _USRDLL _DLL NDEBUG _CRT_SECURE_NO_DEPRECATE'))
+			env.AppendUnique(LINKFLAGS=Split('/INCREMENTAL:NO /DEBUG /nologo'))
+			env.AppendUnique(SHLINKFLAGS=Split('/INCREMENTAL:NO /DEBUG /nologo'))
+			env.AppendUnique(LIBPATH=[build.GetPythonLibrary()])
+			env.CopyEnvironment(Split('PATH INCLUDE LIB'))
 
 	def customize_linux(self, env):
 		gcc = build.GetGCCVersion()