Changeset 114 for cafu/branches/cafu_to_wx/Libs/SConscript

Timestamp:

08/12/10 16:39:08 (22 months ago)

Author:

Carsten

Message:

Liberated a lot of code from knowing the obsolete OpenGLWindowT class (and thus its related SingleOpenGLWindow global pointer)
and the also obsolete, related DirectX code.

Files:

• cafu/branches/cafu_to_wx/Libs/SConscript (modified) (2 diffs)

cafu/branches/cafu_to_wx/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")