Changeset 148 for cafu/trunk/Libs/SConscript

Timestamp:

09/02/10 22:24:03 (21 months ago)

Author:

Carsten

Message:

Simplified build system by subsuming the cfsCoreLib into cfsLib.
The reasons for keeping the two libraries separately seem no longer to be pertinent (cfsCoreLib was introduced in an attempt to fix linker issues under Linux long ago).

Files:

• cafu/trunk/Libs/SConscript (modified) (3 diffs)

cafu/trunk/Libs/SConscript

@@ -6 +6 @@
 env.StaticLibrary(
     target="cfsLib",
-    source=Split("""ConsoleCommands/ConVar.cpp ConsoleCommands/ConFunc.cpp
-                    ConsoleCommands/ConsoleInterpreter_LuaBinding.cpp
+    source=Split("""Bitmap/Bitmap.cpp Bitmap/jdatasrc.cpp
+                    ConsoleCommands/ConVar.cpp ConsoleCommands/ConFunc.cpp
+                    ConsoleCommands/ConsoleInterpreterImpl.cpp ConsoleCommands/ConsoleInterpreter_LuaBinding.cpp
                     ConsoleCommands/Console.cpp ConsoleCommands/ConsoleStdout.cpp ConsoleCommands/ConsoleStringBuffer.cpp ConsoleCommands/ConsoleWarningsOnly.cpp ConsoleCommands/ConsoleFile.cpp
                     Fonts/Font.cpp Fonts/FontTT.cpp
+                    FileSys/FileManImpl.cpp FileSys/FileSys_LocalPath.cpp FileSys/FileSys_ZipArchive_GV.cpp FileSys/File_local.cpp FileSys/File_memory.cpp FileSys/Password.cpp
+                    GuiSys/ConsoleByWindow.cpp GuiSys/Coroutines.cpp GuiSys/InitWindowTypes.cpp GuiSys/GuiImpl.cpp GuiSys/GuiManImpl.cpp
+                    GuiSys/Window.cpp GuiSys/WindowCreateParams.cpp GuiSys/WindowChoice.cpp GuiSys/WindowEdit.cpp GuiSys/WindowListBox.cpp GuiSys/WindowModel.cpp GuiSys/WindowPtr.cpp GuiSys/EditorData.cpp
                     MapFile.cpp
                     Math3D/Angles.cpp Math3D/BezierPatch.cpp Math3D/BoundingBox.cpp Math3D/Brush.cpp Math3D/Matrix.cpp Math3D/Matrix3x3.cpp Math3D/Misc.cpp Math3D/Plane3.cpp Math3D/Pluecker.cpp Math3D/Polygon.cpp Math3D/Rotation.cpp
@@ -18 +22 @@
                     Util/Util.cpp
                     Win32/Win32PrintHelp.cpp
-                    DebugLog.cpp TypeSys.cpp""") +
-           env.Object(["Bitmap/Bitmap.cpp", "Bitmap/jdatasrc.cpp"], CPPPATH=env['CPPPATH']+["#/ExtLibs/jpeg", "#/ExtLibs/libpng", "#/ExtLibs/zlib"]),
-    CPPPATH=env['CPPPATH']+["#/ExtLibs/lua/src", "#/ExtLibs/lwo",
-                            "#/ExtLibs/Collada-DOM-2.1/dom/include", "#/ExtLibs/Collada-DOM-2.1/dom/include/1.4"])
-
-
-
-env.StaticLibrary(
-    target="cfsCoreLib",
-    source=Split("""ClipSys/CollisionModel_static.cpp ClipSys/CollisionModel_static_BulletAdapter.cpp ClipSys/CollisionModelMan_impl.cpp
-                    ConsoleCommands/ConsoleInterpreterImpl.cpp
-                    GuiSys/ConsoleByWindow.cpp GuiSys/Coroutines.cpp GuiSys/InitWindowTypes.cpp GuiSys/GuiImpl.cpp GuiSys/GuiManImpl.cpp
-                    GuiSys/Window.cpp GuiSys/WindowCreateParams.cpp GuiSys/WindowChoice.cpp GuiSys/WindowEdit.cpp GuiSys/WindowListBox.cpp GuiSys/WindowModel.cpp GuiSys/WindowPtr.cpp GuiSys/EditorData.cpp
-                    FileSys/FileManImpl.cpp FileSys/FileSys_LocalPath.cpp FileSys/FileSys_ZipArchive_GV.cpp FileSys/File_local.cpp FileSys/File_memory.cpp FileSys/Password.cpp"""),
-    CPPPATH=env['CPPPATH']+["#/ExtLibs/bullet/src",    # For the BulletAdapterT classes.
-                            "#/ExtLibs/lua/src", "#/ExtLibs/zlib"])
+                    DebugLog.cpp TypeSys.cpp"""),
+    CPPPATH=env['CPPPATH'] + ["#/ExtLibs/lua/src", "#/ExtLibs/lwo"] + ["#/ExtLibs/jpeg", "#/ExtLibs/libpng", "#/ExtLibs/zlib"])
 
 
@@ -56 +46 @@
 env.StaticLibrary(
     target="ClipSys",
-    source=Split("""ClipSys/ClipModel.cpp ClipSys/ClipWorld.cpp ClipSys/TraceSolid.cpp"""))
+    source=Split("""ClipSys/CollisionModel_static.cpp ClipSys/CollisionModel_static_BulletAdapter.cpp ClipSys/CollisionModelMan_impl.cpp
+                    ClipSys/ClipModel.cpp ClipSys/ClipWorld.cpp ClipSys/TraceSolid.cpp"""),
+    CPPPATH=env['CPPPATH']+["#/ExtLibs/bullet/src"])