[Csp-commits] svn:csp r1810 - trunk/CSP/csp

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

Author: mkrose
Date: 2005-12-31 08:39:16 -0800 (Sat, 31 Dec 2005)
New Revision: 1810

Modified:
   trunk/CSP/csp/SConstruct
Log:
Add a flag to prevent shared libraries from linking against
LIBCMT under windows, which eliminates some warnings.

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

Modified: trunk/CSP/csp/SConstruct
===================================================================
--- trunk/CSP/csp/SConstruct	2005-12-30 03:27:24 UTC (rev 1809)
+++ trunk/CSP/csp/SConstruct	2005-12-31 16:39:16 UTC (rev 1810)
@@ -82,6 +82,15 @@
 	])
 
 build.ExternalLibrary(
+	name = 'sound',
+	config = [
+		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.ExternalLibrary(
 	name = 'gnucc2',
 	config = [
 		build.PkgConfig(package='libccgnu2', version='1.3.19', label='commoncpp'),
@@ -101,6 +110,8 @@
 		build.PkgConfig(package='openscenegraph', version='0.9.8'),
 		build.PkgConfig(package='openthreads', version='0.9.8'),
 		build.PkgConfig(package='producer', version='0.9.8'),
+		build.PkgConfig(package='osgal', version='0.3'),
+		build.DevpackConfig(dlls='osgal', headers=[('osgAL', 'SoundNode')]),
 		build.DevpackConfig(dlls=['osg', 'osgDB', 'osgFX', 'osgGA', 'osgParticle', 'osgProducer', 'osgText', 'osgUtil', 'OpenThreadsWin32'], headers=[('osg', 'Depth'), ('osgText', 'Font')]),
 	])
 
@@ -143,7 +154,7 @@
 		env['CXXFLAGS'] = Split('/GR /MT /O2 /EHsc /nologo')
 		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.AppendUnique(SHLINKFLAGS=Split('/INCREMENTAL:NO /NODEFAULTLIB:LIBCMT /RELEASE /nologo'))
 		env.CopyEnvironment(Split('PATH INCLUDE LIB')) # FIXME
 
 	def customize_linux(self, env):