[Csp-commits] svn:csp r2186 - branches/osg_2_0/csp

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

Author: nsmoooose
Date: 2007-10-07 10:46:29 -0700 (Sun, 07 Oct 2007)
New Revision: 2186

Modified:
   branches/osg_2_0/csp/SConstruct
Log:
Fixed some building issues when using a newer devpack from windows.

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

Modified: branches/osg_2_0/csp/SConstruct
===================================================================
--- branches/osg_2_0/csp/SConstruct	2007-09-30 09:34:44 UTC (rev 2185)
+++ branches/osg_2_0/csp/SConstruct	2007-10-07 17:46:29 UTC (rev 2186)
@@ -61,9 +61,9 @@
 	config = [
 #		build.PkgConfig(package='openalpp', version='0.2'),
 		build.PkgConfig(package='vorbisfile', version='1.1.0'),
-#		build.DevpackConfig(dlls='openalpp', headers=[('openalpp', 'sounddata.h')]),
-		build.DevpackConfig(dlls=['libvorbis', 'libvorbisfile'], headers=[('vorbis', 'vorbisfile.h')]),
-		build.DevpackConfig(dlls='libogg', headers=[('ogg', 'ogg.h')]),
+		build.DevpackConfig(dlls='oalpp', headers=[('openalpp', 'sounddata')]),
+		build.DevpackConfig(dlls=['vorbis', 'vorbisfile'], headers=[('vorbis', 'vorbisfile.h')]),
+		build.DevpackConfig(dlls='ogg', headers=[('ogg', 'ogg.h')]),
 	])
 
 build.ExternalLibrary(
@@ -85,10 +85,9 @@
 	config = [
 		build.PkgConfig(package='openscenegraph', version='2.0.0'),
 		build.PkgConfig(package='openthreads', version='1.9'),
-#		build.PkgConfig(package='producer', version='0.9.9'),
 		build.PkgConfig(package='osgal', version='0.6.1'),
 		build.DevpackConfig(dlls='osgal', headers=[('osgAL', 'SoundNode')]),
-		build.DevpackConfig(dlls=['osg', 'osgDB', 'osgFX', 'osgGA', 'osgParticle', 'osgViewer', 'osgText', 'osgUtil', 'OpenThreadsWin32'], headers=[('osg', 'Depth'), ('osgText', 'Font')]),
+		build.DevpackConfig(dlls=['osg', 'osgDB', 'osgFX', 'osgGA', 'osgParticle', 'osgViewer', 'osgText', 'osgUtil', 'OpenThreads'], headers=[('osg', 'Depth'), ('osgText', 'Font')]),
 	])
 
 build.ExternalLibrary(