Author: esr
Date: Sat Mar 22 06:52:01 2008
New Revision: 24965
URL: http://svn.gna.org/viewcvs/wesnoth?rev=24965&view=rev
Log:
And yet *more* scons warnings cleared.
Modified:
trunk/SConstruct
Modified: trunk/SConstruct
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/SConstruct?rev=24965&r1=24964&r2=24965&view=diff
==============================================================================
--- trunk/SConstruct (original)
+++ trunk/SConstruct Sat Mar 22 06:52:01 2008
@@ -121,6 +121,7 @@
"src/soundsource.cpp",
"src/terrain.cpp",
"src/terrain_translation.cpp",
+ "src/tooltips.cpp",
"src/video.cpp",
"src/theme.cpp",
"src/widgets/button.cpp",
@@ -192,7 +193,6 @@
"src/team.cpp",
"src/terrain_filter.cpp",
"src/titlescreen.cpp",
- "src/tooltips.cpp",
"src/unit.cpp",
"src/unit_abilities.cpp",
"src/unit_animation.cpp",
@@ -212,28 +212,27 @@
LIBPATH = [".", "src", "/lib", "/usr/lib"])
wesnoth_editor_sources = [
- "src/editor/editor.cpp",
- "src/editor/editor_layout.cpp",
- "src/editor/map_manip.cpp",
- "src/editor/editor_display.cpp",
- "src/editor/editor_palettes.cpp",
- "src/editor/editor_main.cpp",
- "src/editor/editor_dialogs.cpp",
- "src/editor/editor_undo.cpp",
- "src/animated_editor.cpp",
- "src/gamestatus_editor.cpp",
- "src/tooltips.cpp",
- ]
+ "src/editor/editor.cpp",
+ "src/editor/editor_layout.cpp",
+ "src/editor/map_manip.cpp",
+ "src/editor/editor_display.cpp",
+ "src/editor/editor_palettes.cpp",
+ "src/editor/editor_main.cpp",
+ "src/editor/editor_dialogs.cpp",
+ "src/editor/editor_undo.cpp",
+ "src/animated_editor.cpp",
+ "src/gamestatus_editor.cpp",
+ ]
env.Program("wesnoth_editor", wesnoth_editor_sources,
CPPPATH = ['src', 'src/server', "/usr/include/SDL"],
LIBS = commonlibs + ['wesnoth_core', 'wesnoth'],
LIBPATH = [".", "src", "/lib", "/usr/lib"])
campaignd_sources = [
- "src/campaign_server/campaign_server.cpp",
- "src/publish_campaign.cpp",
- "src/loadscreen_empty.cpp",
- ]
+ "src/campaign_server/campaign_server.cpp",
+ "src/publish_campaign.cpp",
+ "src/loadscreen_empty.cpp",
+ ]
env.Program("campaignd", campaignd_sources,
CPPPATH = ['src', 'src/server', "/usr/include/SDL"],
LIBS = commonlibs + ['wesnoth_core', 'wesnoth'],
@@ -345,7 +344,7 @@
print "Needed SDL network lib and didn't find it; exiting!"
Exit(1)
-if "wesnoth" not in map(str, BUILD_TARGETS):
+if "all" not in targets and "wesnoth" not in targets:
print "*** Game build disabled, suppressing Python support."
env["python"] = False
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
