[Csp-commits] svn:csp r1786 - in trunk/CSP/csp: . modules/chunklod

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

Author: mkrose
Date: 2005-12-20 20:46:37 -0800 (Tue, 20 Dec 2005)
New Revision: 1786

Modified:
   trunk/CSP/csp/SConstruct
   trunk/CSP/csp/modules/chunklod/SConscript
Log:
Fix build scripts for chunklod, adding libjpeg dependency for windows.

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

Modified: trunk/CSP/csp/SConstruct
===================================================================
--- trunk/CSP/csp/SConstruct	2005-12-19 06:55:36 UTC (rev 1785)
+++ trunk/CSP/csp/SConstruct	2005-12-21 04:46:37 UTC (rev 1786)
@@ -61,6 +61,12 @@
 
 
 build.ExternalLibrary(
+	name = 'jpeg',
+	config = [
+		build.WindowsLibConfig('libjpeg'),
+	])
+
+build.ExternalLibrary(
 	name = 'opengl',
 	config = [
 		build.WindowsLibConfig('glu32'),
@@ -135,7 +141,7 @@
 class PlatformSettings:
 	def customize_win(self, env):
 		env['CXXFLAGS'] = Split('/GR /MT /O2 /EHsc /nologo')
-		env.AppendUnique(CPPDEFINES=Split('WIN32 _USRDLL _DLL NDEBUG'))
+		env.AppendUnique(CPPDEFINES=Split('WIN32 __WIN32__ _USRDLL _DLL NDEBUG'))
 		env.AppendUnique(LINKFLAGS=Split('/INCREMENTAL:NO /RELEASE /nologo'))
 		env.AppendUnique(SHLINKFLAGS=Split('/INCREMENTAL:NO /RELEASE /nologo'))
 		env.CopyEnvironment(Split('PATH INCLUDE LIB')) # FIXME

Modified: trunk/CSP/csp/modules/chunklod/SConscript
===================================================================
--- trunk/CSP/csp/modules/chunklod/SConscript	2005-12-19 06:55:36 UTC (rev 1785)
+++ trunk/CSP/csp/modules/chunklod/SConscript	2005-12-21 04:46:37 UTC (rev 1786)
@@ -19,6 +19,7 @@
 Import('env build')
 
 env = env.Copy()
+env.AppendUnique(CPPDEFINES=Split('OSGCHUNKLOD_LIBRARY'))
 
 # cspchunklod generates lots of warnings; feel free to clean it up and then remove this line
 env.RemoveFlags(CXXFLAGS=Split('-pedantic -W /W3'))
@@ -33,7 +34,7 @@
 		'TextureQuadTree.cpp',
 		'Version.cpp',
 	],
-	deps = ['cspsim'],
+	deps = ['cspsim', 'jpeg'],
 	alias = 'all')