Changeset 149 for cafu/trunk/SConscript

Timestamp:

09/03/10 00:25:58 (21 months ago)

Author:

Carsten

Message:

Revision of Console code:

• New "composite console" is the new default console, making it easy to add logging into a file and the graphical console during init, and making it unnecessary to reset the console pointer in DLLs that have been initialized before the graphical console.
• Replaced several old/obsolete printf-statements (in the renderer DLLs) with their proper Console->Print() counterparts.
• Put the Lua bindings to the global Console into separate files. This way the DLLs can include Console.hpp without being forced to link the Lua libraries in.

Files:

• cafu/trunk/SConscript (modified) (4 diffs)

cafu/trunk/SConscript

@@ -9 +9 @@
 env.Program('CaBSP/CaBSP',   # I had preferred writing 'CaBSP' instead of 'CaBSP/CaBSP' here, but then under Linux we would get both a directory *and* an executeable with name 'CaBSP' in the build directory, which is not allowed/possible.
     Split("CaBSP/CaBSP.cpp CaBSP/BspTreeBuilder/BspTreeBuilder.cpp") + CommonWorldObject,
-    LIBS=Split("SceneGraph MatSys cfsLib ClipSys cfs_png cfs_jpeg bulletcollision lua minizip lightwave z"))
+    LIBS=Split("SceneGraph MatSys ClipSys cfsLib cfs_png cfs_jpeg bulletcollision lua minizip lightwave z"))
 
 env.Program('CaPVS/CaPVS',
     Split("CaPVS/CaPVS.cpp CaPVS/CaPVSWorld.cpp") + CommonWorldObject,
-    LIBS=Split("SceneGraph MatSys cfsLib ClipSys cfs_png cfs_jpeg bulletcollision lua minizip lightwave z"))
+    LIBS=Split("SceneGraph MatSys ClipSys cfsLib cfs_png cfs_jpeg bulletcollision lua minizip lightwave z"))
 
 env.Program('CaLight/CaLight',
     Split("CaLight/CaLight.cpp CaLight/CaLightWorld.cpp") + CommonWorldObject,
-    LIBS=Split("SceneGraph MatSys cfsLib ClipSys cfs_png cfs_jpeg bulletcollision lua minizip lightwave z"))
+    LIBS=Split("SceneGraph MatSys ClipSys cfsLib cfs_png cfs_jpeg bulletcollision lua minizip lightwave z"))
 
 env.Program('CaSHL/CaSHL',
     Split("CaSHL/CaSHL.cpp CaSHL/CaSHLWorld.cpp") + CommonWorldObject,
-    LIBS=Split("SceneGraph MatSys cfsLib ClipSys cfs_png cfs_jpeg bulletcollision lua minizip lightwave z"))
+    LIBS=Split("SceneGraph MatSys ClipSys cfsLib cfs_png cfs_jpeg bulletcollision lua minizip lightwave z"))
 
 
@@ -31 +31 @@
     envTools.Append(LIBPATH=['ExtLibs/DirectX7/lib'])
     # glu32 is only needed for the TerrainViewerOld...
-    envTools.Append(LIBS=Split("SceneGraph MatSys cfsLib ClipSys cfs_png cfs_jpeg bulletcollision lua minizip lightwave z")
+    envTools.Append(LIBS=Split("SceneGraph MatSys ClipSys cfsLib cfs_png cfs_jpeg bulletcollision lua minizip lightwave z")
                        + Split("gdi32 glu32 opengl32 user32") + ['cfsOpenGL', 'dinput', 'dxguid'])
 elif sys.platform=="linux2":
@@ -37 +37 @@
     # GLU is needed for the TerrainViewerOld *and* for e.g. gluBuild2DMipmaps() in the renderers...
     envTools.Append(CPPPATH=['/usr/include/freetype2'])         # As of 2009-09-10, this line is to become unnecessary in the future, see /usr/include/ftbuild.h for details.
-    envTools.Append(LIBS=Split("SceneGraph MatSys cfsOpenGL cfsLib ClipSys cfs_png cfs_jpeg bulletcollision lua minizip lightwave z")
+    envTools.Append(LIBS=Split("SceneGraph MatSys cfsOpenGL ClipSys cfsLib cfs_png cfs_jpeg bulletcollision lua minizip lightwave z")
                        + Split("GL GLU"))
 
@@ -147 +147 @@
 envCaWE = wxEnv.Clone()
 envCaWE.Append(CPPPATH=['ExtLibs/lua/src', 'ExtLibs/noise/src'])
-envCaWE.Append(LIBS=Split("SceneGraph MatSys cfsLib ClipSys cfs_png cfs_jpeg bulletcollision noise lua minizip lightwave z"))
+envCaWE.Append(LIBS=Split("SceneGraph MatSys ClipSys cfsLib cfs_png cfs_jpeg bulletcollision noise lua minizip lightwave z"))
 
 if sys.platform=="win32":