Author: esr
Date: Fri Mar 21 12:12:25 2008
New Revision: 24939
URL: http://svn.gna.org/viewcvs/wesnoth?rev=24939&view=rev
Log:
Another tep towards scons build.
Modified:
trunk/SConstruct
Modified: trunk/SConstruct
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/SConstruct?rev=24939&r1=24938&r2=24939&view=diff
==============================================================================
--- trunk/SConstruct (original)
+++ trunk/SConstruct Fri Mar 21 12:12:25 2008
@@ -5,7 +5,7 @@
# it builds an autotools-like config.h for the C++ code. The optipng
# and internal-data options are omitted.
#
-version = "1.3.14+svn"
+version = "1.5.0-svn"
min_savegame_version = "1.3.10"
#
@@ -51,7 +51,7 @@
#
# Program declarations (incomplete, no libraries yet)
#
-commonlibs = Split("wesnoth_core boost_iostreams-gcc41-mt-1_34_1 SDL_net SDL
pthread")
+commonlibs = Split("wesnoth_core boost_iostreams-mt SDL_net SDL pthread")
libwesnoth_core_sources = [
"src/color_range.cpp",
@@ -75,77 +75,79 @@
CPPPATH = ['src', 'src/serialization', "/usr/include/SDL"])
wesnoth_sources = [
- "about.cpp",
- "actions.cpp",
- "ai.cpp",
- "ai_dfool.cpp",
- "ai_attack.cpp",
- "ai_move.cpp",
- "ai_python.cpp",
- "ai_village.cpp",
- "animated_game.cpp",
- "attack_prediction.cpp",
- "callable_objects.cpp",
- "config_adapter.cpp",
- "dialogs.cpp",
- "floating_textbox.cpp",
- "formula.cpp",
- "formula_ai.cpp",
- "formula_function.cpp",
- "formula_tokenizer.cpp",
- "game_display.cpp",
- "game_events.cpp",
- "game_preferences.cpp",
- "game_preferences_display.cpp",
- "gamestatus.cpp",
- "game.cpp",
- "generate_report.cpp",
- "generic_event.cpp",
- "halo.cpp",
- "help.cpp",
- "intro.cpp",
- "leader_list.cpp",
- "menu_events.cpp",
- "mouse_events.cpp",
- "multiplayer.cpp",
- "multiplayer_ui.cpp",
- "multiplayer_wait.cpp",
- "multiplayer_connect.cpp",
- "multiplayer_create.cpp",
- "multiplayer_lobby.cpp",
- "network.cpp",
- "network_worker.cpp",
- "pathfind.cpp",
- "playcampaign.cpp",
- "play_controller.cpp",
- "playmp_controller.cpp",
- "playsingle_controller.cpp",
- "playturn.cpp",
- "publish_campaign.cpp",
- "replay.cpp",
- "replay_controller.cpp",
- "sha1.cpp",
- "settings.cpp",
- "statistics.cpp",
- "team.cpp",
- "terrain_filter.cpp",
- "titlescreen.cpp",
- "tooltips.cpp",
- "unit.cpp",
- "unit_abilities.cpp",
- "unit_animation.cpp",
- "unit_display.cpp",
- "unit_frame.cpp",
- "unit_map.cpp",
- "unit_types.cpp",
- "upload_log.cpp",
- "variable.cpp",
- "variant.cpp",
- "widgets/combo.cpp",
- "widgets/scrollpane.cpp",
+ "src/about.cpp",
+ "src/actions.cpp",
+ "src/ai.cpp",
+ "src/ai_dfool.cpp",
+ "src/ai_attack.cpp",
+ "src/ai_move.cpp",
+ "src/ai_python.cpp",
+ "src/ai_village.cpp",
+ "src/animated_game.cpp",
+ "src/attack_prediction.cpp",
+ "src/callable_objects.cpp",
+ "src/config_adapter.cpp",
+ "src/dialogs.cpp",
+ "src/floating_textbox.cpp",
+ "src/formula.cpp",
+ "src/formula_ai.cpp",
+ "src/formula_function.cpp",
+ "src/formula_tokenizer.cpp",
+ "src/game_display.cpp",
+ "src/game_events.cpp",
+ "src/game_preferences.cpp",
+ "src/game_preferences_display.cpp",
+ "src/gamestatus.cpp",
+ "src/game.cpp",
+ "src/generate_report.cpp",
+ "src/generic_event.cpp",
+ "src/halo.cpp",
+ "src/help.cpp",
+ "src/intro.cpp",
+ "src/leader_list.cpp",
+ "src/menu_events.cpp",
+ "src/mouse_events.cpp",
+ "src/multiplayer.cpp",
+ "src/multiplayer_ui.cpp",
+ "src/multiplayer_wait.cpp",
+ "src/multiplayer_connect.cpp",
+ "src/multiplayer_create.cpp",
+ "src/multiplayer_lobby.cpp",
+ "src/network.cpp",
+ "src/network_worker.cpp",
+ "src/pathfind.cpp",
+ "src/playcampaign.cpp",
+ "src/play_controller.cpp",
+ "src/playmp_controller.cpp",
+ "src/playsingle_controller.cpp",
+ "src/playturn.cpp",
+ "src/publish_campaign.cpp",
+ "src/replay.cpp",
+ "src/replay_controller.cpp",
+ "src/sha1.cpp",
+ "src/settings.cpp",
+ "src/statistics.cpp",
+ "src/team.cpp",
+ "src/terrain_filter.cpp",
+ "src/titlescreen.cpp",
+ "src/tooltips.cpp",
+ "src/unit.cpp",
+ "src/unit_abilities.cpp",
+ "src/unit_animation.cpp",
+ "src/unit_display.cpp",
+ "src/unit_frame.cpp",
+ "src/unit_map.cpp",
+ "src/unit_types.cpp",
+ "src/upload_log.cpp",
+ "src/variable.cpp",
+ "src/variant.cpp",
+ "src/widgets/combo.cpp",
+ "src/widgets/scrollpane.cpp",
]
env.Program("wesnoth", wesnoth_sources,
- CPPPATH = ['src', "/usr/include/SDL"])
+ CPPPATH = ['src', 'src/server', "/usr/include/SDL"],
+ LIBS = commonlibs,
+ LIBPATH = [".", "src", "/lib", "/usr/lib"])
wesnothd_sources = [
"src/server/game.cpp",
@@ -155,7 +157,6 @@
"src/server/proxy.cpp",
"src/server/server.cpp",
"src/server/simple_wml.cpp",
- #"src/server/monitor.cpp",
"src/network.cpp",
"src/network_worker.cpp",
"src/loadscreen_empty.cpp"
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
