Changeset 136 for cafu/trunk/Libs/SConscript

Timestamp:

08/27/10 11:30:01 (21 months ago)

Author:

Carsten

Message:

Reintegrated branches/cafu_to_wx back into trunk!

Files:

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

cafu/trunk/Libs/SConscript

@@ -25 +25 @@
 
 
-if sys.platform=="win32":
-    Win32Objects=env.Object("DirectX/DirectInput.cpp", CPPPATH=env['CPPPATH']+["#/ExtLibs/DirectX7/include"])
-else:
-    Win32Objects=[]
-
 env.StaticLibrary(
     target="cfsCoreLib",
@@ -36 +31 @@
                     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""") +
-           env.Object("OpenGL/OpenGLWindow.cpp", CPPPATH=env['CPPPATH']+["#/ExtLibs/DirectX7/include"]) +
-           Win32Objects,
+                    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"])
+
+
+
+# This library is obsolete, and only used for our legacy programs in CaTools.
+if sys.platform=="win32":
+    env.StaticLibrary(target="cfsOpenGL",
+        source=["OpenGL/OpenGLWindow.cpp", "DirectX/DirectInput.cpp"],
+        CPPPATH=env['CPPPATH']+["#/ExtLibs/DirectX7/include"])
+else:
+    env.StaticLibrary(target="cfsOpenGL", source="OpenGL/OpenGLWindow.cpp")
 
 
@@ -59 +62 @@
 env.StaticLibrary(
     target="MatSys",
-    source=Split("""MaterialSystem/Expression.cpp MaterialSystem/MapComposition.cpp MaterialSystem/Material.cpp MaterialSystem/MaterialManager.cpp
+    source=Split("""MaterialSystem/Expression.cpp MaterialSystem/MapComposition.cpp MaterialSystem/Material.cpp
                     MaterialSystem/MaterialManagerImpl.cpp MaterialSystem/Renderer.cpp MaterialSystem/TextureMap.cpp"""))
 
@@ -66 +69 @@
 env.StaticLibrary(
     target="SoundSys",
-    source=Split("""SoundSystem/SoundShaderManager.cpp SoundSystem/SoundShaderManagerImpl.cpp SoundSystem/SoundShader.cpp"""))
+    source=Split("""SoundSystem/SoundShaderManagerImpl.cpp SoundSystem/SoundShader.cpp"""))