mail[Wesnoth-commits] r25002 - in /trunk: SConstruct src/SConstruct


Others Months | Index by Date | Thread Index
>>   [Date Prev] [Date Next] [Thread Prev] [Thread Next]

Header


Content

Posted by esr on March 23, 2008 - 06:13:
Author: esr
Date: Sun Mar 23 06:13:12 2008
New Revision: 25002

URL: http://svn.gna.org/viewcvs/wesnoth?rev=25002&view=rev
Log:
Add exploder to the scons build.

Modified:
    trunk/SConstruct
    trunk/src/SConstruct

Modified: trunk/SConstruct
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/SConstruct?rev=25002&r1=25001&r2=25002&view=diff
==============================================================================
--- trunk/SConstruct (original)
+++ trunk/SConstruct Sun Mar 23 06:13:12 2008
@@ -58,7 +58,10 @@
 #
 
 Help("""\
-Available build targets include: all wesnoth wesnoth_editor wesnothd 
campaignd
+Available build targets include:
+
+    all wesnoth wesnoth_editor wesnothd campaignd exploder
+
 The 'install' target installs whatever you currently have built.
 If you have built tools and Python is available the Python helper modules
 will also be installed.

Modified: trunk/src/SConstruct
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/src/SConstruct?rev=25002&r1=25001&r2=25002&view=diff
==============================================================================
--- trunk/src/SConstruct (original)
+++ trunk/src/SConstruct Sun Mar 23 06:13:12 2008
@@ -1,6 +1,7 @@
 Import('env')
 
-all = env.Alias("all", ["wesnoth", "wesnoth_editor", "wesnothd", 
"campaignd"])
+all = env.Alias("all", ["wesnoth", "wesnoth_editor", "wesnothd", "campaignd",
+                        "exploder"])
 env.Default("all")
 
 #
@@ -67,7 +68,6 @@
     "race.cpp",
     "random.cpp",
     "reports.cpp",
-    "sdl_utils.cpp",
     "show_dialog.cpp",
     "sound.cpp",
     "soundsource.cpp",
@@ -102,6 +102,12 @@
     "publish_campaign.cpp",
     ]
 env.Library("campaignd", libcampaignd_sources, 
+            CPPPATH = ['.', "/usr/include/SDL"])
+
+libwesnoth_sdl_sources = [
+    "sdl_utils.cpp",
+    ]
+env.Library("wesnoth_sdl", libwesnoth_sdl_sources, 
             CPPPATH = ['.', "/usr/include/SDL"])
 
 wesnoth_sources = [
@@ -171,7 +177,7 @@
 ]
 env.Program("wesnoth", wesnoth_sources,
             CPPPATH = ['.', 'server', "/usr/include/SDL"],
-            LIBS = ['wesnoth_core', 'wesnoth', 'campaignd'] + commonlibs,
+            LIBS = ['wesnoth_core', 'wesnoth_sdl', 'wesnoth', 'campaignd'] + 
commonlibs,
             LIBPATH = [".", "/lib", "/usr/lib"])
 
 wesnoth_editor_sources = [
@@ -188,7 +194,7 @@
     ]
 env.Program("wesnoth_editor", wesnoth_editor_sources,
             CPPPATH = ['.', "/usr/include/SDL"],
-            LIBS = ['wesnoth_core', 'wesnoth'] + commonlibs,
+            LIBS = ['wesnoth_core', 'wesnoth_sdl', 'wesnoth'] + commonlibs,
             LIBPATH = [".", "/lib", "/usr/lib"])
 
 campaignd_sources = [
@@ -213,6 +219,18 @@
             LIBS =  ['wesnoth_core', 'wesnothd'] + commonlibs,
             LIBPATH = [".", "/lib", "/usr/lib"])
 
+exploder_sources = [
+       "tools/exploder.cpp",
+       "tools/exploder_utils.cpp",
+       "tools/exploder_cutter.cpp",
+       "tools/exploder_composer.cpp",
+       "tools/dummy_video.cpp",
+        ]
+env.Program("exploder", exploder_sources,
+            CPPPATH = ['.', "/usr/include/SDL"],
+            LIBS =  ['wesnoth_core', 'wesnoth_sdl', 'wesnothd'] + commonlibs,
+            LIBPATH = [".", "/lib", "/usr/lib"])
+
 # FIXME: Include this in gameconfig.cpp when we switch over to scons.
 # Because of the content check, scons will do the right thing.
 # At that point -DSVNREV can be removed from CXXFLAGS.




Related Messages


Powered by MHonArc, Updated Sun Mar 23 06:42:02 2008