Changeset 116 for cafu/branches/cafu_to_wx/SConscript

Timestamp:

08/13/10 22:27:00 (22 months ago)

Author:

Carsten

Message:

This revision implements (much of) the big step of replacing the previous OS layer with wxWidgets, achieving a good deal of the objective of ticket #34:
The Cafu engine runs now as a wxWidgets application! ;-)
The most important loose ends have already been tied up, such as app initialization and mouse and keyboard event forwarding, but there are also many details left that for clarity have been scheduled for separate revisions.

Files:

• cafu/branches/cafu_to_wx/SConscript (modified) (4 diffs)

cafu/branches/cafu_to_wx/SConscript

@@ -49 +49 @@
     # glu32 is only needed for the TerrainViewerOld...
     envTools.Append(LIBS=Split("SceneGraph MatSys cfsCoreLib cfsLib ClipSys cfs_png cfs_jpeg bulletcollision lua minizip lightwave z")
-                       + Split("gdi32 glu32 opengl32 user32") + ['dinput', 'dxguid'])
+                       + Split("gdi32 glu32 opengl32 user32") + ['cfsOpenGL', 'dinput', 'dxguid'])
 elif sys.platform=="linux2":
     # envTools.Append(LINKFLAGS = ['-Wl,--export-dynamic'])     # Not needed any more, .so libs now link to the required .a libs directly, just as under Windows.
     # 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 cfsLib cfsCoreLib cfsLib ClipSys cfs_png cfs_jpeg bulletcollision lua minizip lightwave z")
+    envTools.Append(LIBS=Split("SceneGraph MatSys cfsOpenGL cfsLib cfsCoreLib cfsLib ClipSys cfs_png cfs_jpeg bulletcollision lua minizip lightwave z")
                        + Split("GL GLU"))
 
@@ -76 +76 @@
 
 
-envCafu = env.Clone()
-envCafu.Append(CPPPATH=['ExtLibs/lua/src'])
-
-CafuMainObj     = envCafu.StaticObject("Ca3DE/Ca3DE",      "Ca3DE/Cafu.cpp")
-CafuMainDediObj = envCafu.StaticObject("Ca3DE/Ca3DE-dedi", "Ca3DE/Cafu.cpp", CPPDEFINES=env['CPPDEFINES']+['CAFU_DEDICATED_SERVER'])
-
-EngineCommonAndServerObjs = envCafu.StaticObject(Split("""
-    Ca3DE/Both/Ca3DEWorld.cpp Ca3DE/Both/EntityManager.cpp Ca3DE/Both/EngineEntity.cpp
-    Ca3DE/Server/Server.cpp Ca3DE/Server/ServerWorld.cpp Ca3DE/Server/ClientInfo.cpp"""))
+# Create a common construction environment for our wxWidgets-based programs (Cafu and CaWE).
+wxEnv = env.Clone()
 
 if sys.platform=="win32":
-    envCafu.Append(LIBPATH=['ExtLibs/DirectX7/lib'])
-    envCafu.Append(LIBS=Split("SceneGraph MatSys SoundSys cfsLib cfsCoreLib cfs_png cfs_jpeg bulletcollision minizip z lua ClipSys GuiSysNullEditor"))
-    envCafu.Append(LIBS=Split("lightwave"))    # For the GuiSys::ModelWindowT class.
-    envCafu.Append(LIBS=Split("gdi32 opengl32 user32 wsock32") + ['dinput', 'dxguid'])
-    WinResource=envCafu.RES("Ca3DE/Dialog1.rc") + envCafu.RES("Ca3DE/Cafu.rc", CPPPATH=[CompilerSetup.wxMSW_Path+'/include'])
-
-elif sys.platform=="linux2":
-    WinResource=[]
-    # -Wl,-rpath,.           is so that also the . directory is searched for dynamic libraries when they're opened.
-    # -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 cfsCoreLib cfs_png cfs_jpeg bulletdynamics bulletcollision bulletmath openal alut mpg123 ogg vorbis vorbisfile minizip z lua lightwave ClipSys GuiSysNullEditor"))
-    # We need GLU for e.g. gluBuild2DMipmaps() in the renderers.
-    # pthread is needed because some libraries that we load (possibly indirectly), e.g. the libCg.so and libopenal.so, use functions
-    # from the pthread library, but have not been linked themselves against it. They rely on the executable to be linked appropriately
-    # in order to resolve the pthread symbols. Paul Pluzhnikov states in a newsgroup posting (see [1]) that even if the .so libs were
-    # linked against libpthread.so, the main exe still *must* link with -lpthread, too, because:
-    # "Note that dlopen()ing an MT library from non-MT executable is not supported on most platforms, certainly not on Linux."
-    # [1] http://groups.google.de/group/gnu.gcc.help/browse_thread/thread/1e8f8dfd6027d7fa/
-    # rt is required in order to resolve clock_gettime() in openal-soft.
-    envCafu.Append(LIBS=Split("GL GLU rt pthread"))
-    # Wrapping -lcfsLib in --whole-archive and --no-whole-archive is required so that the linker puts all symbols that are in libcfsLib.a
-    # into the executable, because otherwise, it would omit e.g. some ParticleEngine-related stuff that is not referenced by the engine,
-    # and when the game DLL later needs it, we get an "undefined symbol" error from dlopen().
-    # 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,
-    # 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.
-    # The "-llightwave, ..." are all needed as a direct consequence of the forced --whole-archive for cfsLib,
-    # which in turn requires these...
-    # 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.Program('Ca3DE/Cafu',
-    CafuMainObj + EngineCommonAndServerObjs + CommonWorldObject + ["Common/WorldMan.cpp"] + WinResource +
-    Glob("Ca3DE/Client/*.cpp"))
-
-# Build an explicit dedicated server currently only under Linux.
-# Build it with env.Program() instead of envCafu.Program()?  I used env before, and lazily fixed link problems by switching to envCafu...
-if sys.platform=="linux2":
-    envCafu.Program('Ca3DE/Cafu-dedicated', CafuMainDediObj + EngineCommonAndServerObjs + CommonWorldObject + ["Common/WorldMan.cpp"])
-
-
-
-SourceFilesList=(Glob("CaWE/*.cpp")
-    +Glob("CaWE/FontWizard/*.cpp")
-    +Glob("CaWE/GuiEditor/*.cpp")+Glob("CaWE/GuiEditor/Commands/*.cpp")+Glob("CaWE/GuiEditor/EditorData/*.cpp")
-    +Glob("CaWE/MapCommands/*.cpp")
-    +Glob("CaWE/MaterialBrowser/*.cpp")
-    +Glob("CaWE/ModelEditor/*.cpp")
-    +Glob("CaWE/wxExt/*.cpp")
-    +Glob("CaWE/wxFB/*.cpp"))
-
-wxEnv = env.Clone()
-wxEnv.Append(CPPPATH=['ExtLibs/lua/src',
-                      'ExtLibs/noise/src'])
-
-if sys.platform=="win32":
-    wxPath=CompilerSetup.wxMSW_Path;
+    wxPath="#/ExtLibs/wxWidgets";
 
     wxEnv.Append(CPPPATH = [wxPath+'/include'])
@@ -163 +96 @@
     LibPath += "_lib"
 
-    wxEnv.Append(CPPPATH=['ExtLibs/freetype/include'])      # Linux builds (must) use the systems freetype library instead.
     wxEnv.Append(LIBPATH = [wxPath+LibPath])
-    wxEnv.Append(LIBS = Split("SceneGraph MatSys cfsLib cfsCoreLib ClipSys cfs_png cfs_jpeg bulletcollision noise lua minizip lightwave z"))
-    wxEnv.Append(LIBS = Split("freetype"))
-    wxEnv.Append(LIBS = Split("advapi32 comctl32 comdlg32 gdi32 ole32 oleaut32 opengl32 rpcrt4 shell32 user32 winspool wsock32"))
 
     if buildMode=="dbg":
@@ -176 +105 @@
         wxEnv.Append(LIBS = Split("wxbase29u wxbase29u_net wxjpeg wxmsw29u_adv wxmsw29u_core wxmsw29u_gl wxmsw29u_aui wxmsw29u_propgrid wxregexu"))
 
-    WinResource=wxEnv.RES("CaWE/CaWE.rc")
+elif sys.platform=="linux2":
+    # Geht es auch ohne die naechste Zeile? Woher weiss es, dass es freetype linken soll???
+    wxEnv.Append(LIBS = Split("wx_gtk2u_gl-2.9 wx_gtk2u_aui-2.9 wx_gtk2u_propgrid-2.9 wx_gtk2u_xrc-2.9 wx_gtk2u_qa-2.9 wx_gtk2u_html-2.9 wx_gtk2u_adv-2.9 wx_gtk2u_core-2.9 wx_baseu_xml-2.9 wx_baseu_net-2.9 wx_baseu-2.9"))
+    wxEnv.ParseConfig(Dir("#/ExtLibs/wxWidgets").abspath + "/build-gtk/wx-config --cxxflags --libs std,gl")
+
+
+
+envCafu = wxEnv.Clone()
+envCafu.Append(CPPPATH=['ExtLibs/lua/src'])
+
+if sys.platform=="win32":
+    envCafu.Append(LIBS=Split("SceneGraph MatSys SoundSys cfsLib cfsCoreLib cfs_png cfs_jpeg bulletcollision minizip z lua ClipSys GuiSysNullEditor"))
+    envCafu.Append(LIBS=Split("lightwave"))    # For the GuiSys::ModelWindowT class.
+    envCafu.Append(LIBS=Split("advapi32 comctl32 comdlg32 gdi32 ole32 oleaut32 opengl32 rpcrt4 shell32 user32 winspool wsock32"))
+
+    WinResource=envCafu.RES("Ca3DE/Cafu.rc")    # + envCafu.RES("Ca3DE/Dialog1.rc")
 
 elif sys.platform=="linux2":
-    wxPath=Dir(CompilerSetup.wxGTK_Path).abspath;
+    # -Wl,-rpath,.           is so that also the . directory is searched for dynamic libraries when they're opened.
+    # -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 cfsCoreLib cfs_png cfs_jpeg bulletdynamics bulletcollision bulletmath openal alut mpg123 ogg vorbis vorbisfile minizip z lua lightwave ClipSys GuiSysNullEditor"))
 
-    wxEnv.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.
-    wxEnv.Append(LINKFLAGS = ['-Wl,--export-dynamic'])      # Need this so that the Renderer DLLs can have their unresolved symbols dynamically resolved at load time.
-    wxEnv.Append(LIBS = Split("SceneGraph MatSys cfsCoreLib cfsLib ClipSys cfs_png cfs_jpeg bulletcollision noise lua minizip lightwave z"))
+    # We need GLU for e.g. gluBuild2DMipmaps() in the renderers.
+    # pthread is needed because some libraries that we load (possibly indirectly), e.g. the libCg.so and libopenal.so, use functions
+    # from the pthread library, but have not been linked themselves against it. They rely on the executable to be linked appropriately
+    # in order to resolve the pthread symbols. Paul Pluzhnikov states in a newsgroup posting (see [1]) that even if the .so libs were
+    # linked against libpthread.so, the main exe still *must* link with -lpthread, too, because:
+    # "Note that dlopen()ing an MT library from non-MT executable is not supported on most platforms, certainly not on Linux."
+    # [1] http://groups.google.de/group/gnu.gcc.help/browse_thread/thread/1e8f8dfd6027d7fa/
+    # rt is required in order to resolve clock_gettime() in openal-soft.
+    envCafu.Append(LIBS=Split("GL GLU rt pthread"))
 
-    wxEnv.Append(LIBS = Split("wx_gtk2u_gl-2.9 wx_gtk2u_aui-2.9 wx_gtk2u_propgrid-2.9 wx_gtk2u_xrc-2.9 wx_gtk2u_qa-2.9 wx_gtk2u_html-2.9 wx_gtk2u_adv-2.9 wx_gtk2u_core-2.9 wx_baseu_xml-2.9 wx_baseu_net-2.9 wx_baseu-2.9"))
-    wxEnv.ParseConfig(wxPath + "/build-gtk/wx-config --cxxflags --libs std,gl")
+    # Wrapping -lcfsLib in --whole-archive and --no-whole-archive is required so that the linker puts all symbols that are in libcfsLib.a
+    # into the executable, because otherwise, it would omit e.g. some ParticleEngine-related stuff that is not referenced by the engine,
+    # and when the game DLL later needs it, we get an "undefined symbol" error from dlopen().
+    # 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,
+    # 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.
+    # The "-llightwave, ..." are all needed as a direct consequence of the forced --whole-archive for cfsLib,
+    # which in turn requires these...
+    # 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")
 
     WinResource=[]
 
-wxEnv.Program('CaWE/CaWE', SourceFilesList + WinResource + CommonWorldObject)
+EngineCommonAndServerObjs = envCafu.StaticObject(Split("""Ca3DE/AppCafu.cpp Ca3DE/MainCanvas.cpp Ca3DE/MainFrame.cpp Ca3DE/ConDefs.cpp
+    Ca3DE/Both/Ca3DEWorld.cpp Ca3DE/Both/EntityManager.cpp Ca3DE/Both/EngineEntity.cpp
+    Ca3DE/Server/Server.cpp Ca3DE/Server/ServerWorld.cpp Ca3DE/Server/ClientInfo.cpp"""))
+
+envCafu.Program('Ca3DE/Cafu',
+    EngineCommonAndServerObjs + CommonWorldObject + ["Common/WorldMan.cpp"] + WinResource +
+    Glob("Ca3DE/Client/*.cpp"))
+
+
+
+envCaWE = wxEnv.Clone()
+envCaWE.Append(CPPPATH=['ExtLibs/lua/src', 'ExtLibs/noise/src'])
+envCaWE.Append(LIBS = Split("SceneGraph MatSys cfsCoreLib cfsLib ClipSys cfs_png cfs_jpeg bulletcollision noise lua minizip lightwave z"))
+
+if sys.platform=="win32":
+    envCaWE.Append(CPPPATH=['ExtLibs/freetype/include'])    # Windows builds use our local copy, Linux builds (must) use the systems freetype library instead.
+    envCaWE.Append(LIBS = Split("freetype"))
+    envCaWE.Append(LIBS = Split("advapi32 comctl32 comdlg32 gdi32 ole32 oleaut32 opengl32 rpcrt4 shell32 user32 winspool wsock32"))
+
+    WinResource=envCaWE.RES("CaWE/CaWE.rc")
+
+elif sys.platform=="linux2":
+    envCaWE.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.
+    envCaWE.Append(LINKFLAGS = ['-Wl,--export-dynamic'])    # Need this so that the Renderer DLLs can have their unresolved symbols dynamically resolved at load time.
+
+    WinResource=[]
+
+SourceFilesList=(Glob("CaWE/*.cpp")
+    +Glob("CaWE/FontWizard/*.cpp")
+    +Glob("CaWE/GuiEditor/*.cpp")+Glob("CaWE/GuiEditor/Commands/*.cpp")+Glob("CaWE/GuiEditor/EditorData/*.cpp")
+    +Glob("CaWE/MapCommands/*.cpp")
+    +Glob("CaWE/MaterialBrowser/*.cpp")
+    +Glob("CaWE/ModelEditor/*.cpp")
+    +Glob("CaWE/wxExt/*.cpp")
+    +Glob("CaWE/wxFB/*.cpp"))
+
+envCaWE.Program('CaWE/CaWE', SourceFilesList + WinResource + CommonWorldObject)