Changeset 151

Timestamp:

09/06/10 14:51:15 (17 months ago)

Author:

Carsten

Message:

Linux/GCC: Various compile and link fixes.

Location:

cafu/trunk

Files:

• Ca3DE/AppCafu.cpp (modified) (2 diffs)
• Libs/ConsoleCommands/Console.cpp (modified) (1 diff)
• SConscript (modified) (5 diffs)
• SConstruct (modified) (2 diffs)

cafu/trunk/Ca3DE/AppCafu.cpp

@@ -29 +29 @@
 #include "ConsoleCommands/ConsoleComposite.hpp"
 #include "ConsoleCommands/ConsoleFile.hpp"
+#include "ConsoleCommands/ConsoleStdout.hpp"
 #include "ConsoleCommands/ConsoleStringBuffer.hpp"
 #include "ConsoleCommands/ConVar.hpp"
@@ -172 +173 @@
 {
     s_CompositeConsole.Attach(m_ConBuffer);
+
+    #ifdef __WXGTK__
+    {
+        static cf::ConsoleStdoutT s_ConStdout;
+        s_CompositeConsole.Attach(&s_ConStdout);
+    }
+    #endif
 
     // All global convars and confuncs have registered themselves in linked lists.

cafu/trunk/Libs/ConsoleCommands/Console.cpp

@@ -23 +23 @@
 
 #include "Console.hpp"
+#include <stdio.h>
 #include <stdarg.h>
 

cafu/trunk/SConscript

@@ -101 +101 @@
     envCafu.Append(LIBS=Split("lightwave"))     # For the GuiSys::ModelWindowT class.
 
-    WinResource = envCafu.RES("Ca3DE/Cafu.rc")  # + envCafu.RES("Ca3DE/Dialog1.rc")
+    WinResource = envCafu.RES("Ca3DE/Cafu.rc")
 
 elif sys.platform=="linux2":
@@ -107 +107 @@
     # -Wl,--export-dynamic   is so that the exe exports its symbols so that the MatSys, SoundSys and game .so libs can in turn resolve theirs.
     envCafu.Append(LINKFLAGS=['-Wl,-rpath,.', '-Wl,--export-dynamic'])
-    envCafu.Append(LIBS=Split("MatSys SoundSys SceneGraph cfsLib cfs_png cfs_jpeg bulletdynamics bulletcollision bulletmath openal alut mpg123 ogg vorbis vorbisfile minizip z lua lightwave ClipSys GuiSysNullEditor"))
+    envCafu.Append(LIBS=Split("MatSys SoundSys SceneGraph ClipSys cfs_png"))
 
     # We need GLU for e.g. gluBuild2DMipmaps() in the renderers.
@@ -124 +124 @@
     # See my post "Having the GNU linker *not* remove unused symbols..." to the gnu.g++.help newsgroup on 2006-04-07,
     # and the replies by Maett and Paul Pluzhnikov.
-    # Implementing this by appending to LINKCOM and using --allow-multiple-definition is a SCons-specific hack though,
+    # Implementing this by appending to LINKCOM is a SCons-specific hack though,
     # because SCons currently does not support such kind of "wrapping". See my post to the scons-users mailing list on 2006-04-09
     # at http://scons.tigris.org/servlets/BrowseList?list=users&by=thread&from=455553.
@@ -131 +131 @@
     # Note that this (using --whole-archive) is actually the proper strategy under Linux (vs. Windows), because this is *the* way
     # in order to make sure that the -fPIC can be handled correctly - otherwise we had to link .so libs with non-fPIC object files...
-    envCafu.Append(LINKCOM=" -Wl,--allow-multiple-definition -Wl,--whole-archive -lcfsLib -lbulletdynamics -lbulletcollision -lbulletmath -lopenal -lalut -lmpg123 -logg -lvorbis -lvorbisfile -Wl,--no-whole-archive -llightwave -lz")
+    envCafu.Append(LINKCOM=" -Wl,--whole-archive -lcfsLib -lbulletdynamics -lbulletcollision -lbulletmath -lopenal -lalut -lmpg123 -logg -lvorbis -lvorbisfile -Wl,--no-whole-archive -lGuiSysNullEditor -llua -llightwave -lminizip -lz -lcfs_jpeg")
 
     WinResource = []
@@ -139 +139 @@
     Ca3DE/Server/Server.cpp Ca3DE/Server/ServerWorld.cpp Ca3DE/Server/ClientInfo.cpp"""))
 
-envCafu.Program('Ca3DE/Cafu',
+appCafu = envCafu.Program('Ca3DE/Cafu',
     EngineCommonAndServerObjs + CommonWorldObject + ["Common/WorldMan.cpp"] + WinResource +
     Glob("Ca3DE/Client/*.cpp"))
+
+if sys.platform=="linux2":
+    # This is a work-around for the fact that SCons doesn't automatically add dependencies for the libraries mentioned in LINKCOM.
+    for LibName in Split("cfsLib bulletdynamics bulletcollision bulletmath openal alut mpg123 ogg vorbis vorbisfile GuiSysNullEditor lua lightwave minizip z cfs_jpeg"):
+        LibFile = envCafu.FindFile("lib" + LibName + ".so", envCafu['LIBPATH'])
+        if LibFile==None:
+            LibFile = envCafu.FindFile("lib" + LibName + ".a", envCafu['LIBPATH'])
+        # print "appCafu depends on: ", LibFile
+        envCafu.Depends(appCafu, LibFile)
 
 

cafu/trunk/SConstruct

@@ -1 @@
-import os, shutil, sys
+import os, platform, shutil, sys
 
 
@@ -282 +282 @@
 
 elif sys.platform=="linux2":
-    envRelease.Install(".", ["#/ExtLibs/Cg/lib/libCg.so", "#/ExtLibs/Cg/lib/libCgGL.so"]);
-    envRelease.Install(".", ["#/ExtLibs/fmod/api/libfmod-3.75.so"]);
+    if platform.machine()!="x86_64":
+        envRelease.Install(".", ["#/ExtLibs/Cg/lib/libCg.so", "#/ExtLibs/Cg/lib/libCgGL.so"]);
+        envRelease.Install(".", ["#/ExtLibs/fmod/api/libfmod-3.75.so"]);
+    else:
+        envRelease.Install(".", ["#/ExtLibs/Cg/lib.x64/libCg.so", "#/ExtLibs/Cg/lib.x64/libCgGL.so"]);
 
     if "r" in BVs: