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

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

Author: mkrose
Date: 2006-04-08 14:02:55 -0700 (Sat, 08 Apr 2006)
New Revision: 1879

Modified:
   trunk/csp/SConstruct
Log:
Change configuration scripts to used libjpeg from the devpack
under windows.  Add configuration checks for libogg and
libvorbisfile.  Set the python libpath under windows.

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

Modified: trunk/csp/SConstruct
===================================================================
--- trunk/csp/SConstruct	2006-04-08 20:58:06 UTC (rev 1878)
+++ trunk/csp/SConstruct	2006-04-08 21:02:55 UTC (rev 1879)
@@ -63,7 +63,7 @@
 build.ExternalLibrary(
 	name = 'jpeg',
 	config = [
-		build.WindowsLibConfig('libjpeg'),
+		build.DevpackConfig(libs='libjpeg'),
 		build.WindowsLibConfig('user32'),
 	])
 
@@ -88,7 +88,8 @@
 		build.PkgConfig(package='openalpp', version='0.2'),
 		build.PkgConfig(package='vorbis', version='1.1.0'),
 		build.DevpackConfig(dlls='openalpp', headers=[('openalpp', 'sounddata.h')]),
-		build.DevpackConfig(dlls='vorbis', headers=[('vorbis', 'vorbisfile.h')]),
+		build.DevpackConfig(dlls=['libvorbis', 'libvorbisfile'], headers=[('vorbis', 'vorbisfile.h')]),
+		build.DevpackConfig(dlls='libogg', headers=[('ogg', 'ogg.h')]),
 	])
 
 build.ExternalLibrary(
@@ -156,6 +157,9 @@
 		env.AppendUnique(CPPDEFINES=Split('WIN32 __WIN32__ _USRDLL _DLL NDEBUG'))
 		env.AppendUnique(LINKFLAGS=Split('/INCREMENTAL:NO /RELEASE /nologo'))
 		env.AppendUnique(SHLINKFLAGS=Split('/INCREMENTAL:NO /NODEFAULTLIB:LIBCMT /RELEASE /nologo'))
+		# FIXME why is LIBPATH being overwritten?  quick hack for now is to add the path to linkflags.
+		env.AppendUnique(LIBPATH=[build.PYTHON_LIBRARY])
+		env.AppendUnique(LINKFLAGS=['/LIBPATH:%s' % build.PYTHON_LIBRARY])
 		env.CopyEnvironment(Split('PATH INCLUDE LIB')) # FIXME
 
 	def customize_linux(self, env):