API tools faq
paste
shadowm

Untitled

shadowm
Jul 9th, 2011
195
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 13.81 KB | None | 0 0
raw download clone embed print report
  1. diff --git a/src/SConscript b/src/SConscript
  2. index 26a37b3..7a4c94b 100644
  3. --- a/src/SConscript
  4. +++ b/src/SConscript
  5. @@ -79,11 +79,11 @@ libwesnoth_sources = Split("""
  6.      cursor.cpp
  7.      display.cpp
  8.      events.cpp
  9. -    filechooser.cpp
  10.      generic_event.cpp
  11.      hotkeys.cpp
  12.      image.cpp
  13. -    image_function.cpp
  14. +    image_modifications.cpp
  15. +    joystick.cpp
  16.      key.cpp
  17.      language.cpp
  18.      loadscreen.cpp
  19. @@ -184,109 +184,61 @@ wesnoth_sources = Split("""
  20.      ai/gamestate_observer.cpp
  21.      ai/interface.cpp
  22.      ai/lua/core.cpp
  23. +    ai/lua/lua_object.cpp
  24.      ai/manager.cpp
  25.      ai/registry.cpp
  26. +    ai/testing.cpp
  27.      ai/testing/aspect_attacks.cpp
  28.      ai/testing/ca.cpp
  29. +    ai/testing/ca_global_fallback.cpp
  30.      ai/testing/ca_testing_move_to_targets.cpp
  31.      ai/testing/ca_testing_recruitment.cpp
  32. -    ai/testing/stage_rca.cpp
  33.      ai/testing/stage_fallback.cpp
  34. -    ai/testing.cpp
  35. +    ai/testing/stage_rca.cpp
  36.      animated_game.cpp
  37.      attack_prediction.cpp
  38.      attack_prediction_display.cpp
  39.      callable_objects.cpp
  40. +    commandline_options.cpp
  41.      config_cache.cpp
  42.      controller_base.cpp
  43.      dialogs.cpp
  44. -    exceptions.cpp
  45. +    editor/action.cpp
  46. +    editor/brush.cpp
  47. +    editor/editor_controller.cpp
  48. +    editor/editor_display.cpp
  49. +    editor/editor_layout.cpp
  50. +    editor/editor_main.cpp
  51. +    editor/editor_map.cpp
  52. +    editor/editor_palettes.cpp
  53. +    editor/editor_preferences.cpp
  54. +    editor/map_context.cpp
  55. +    editor/map_fragment.cpp
  56. +    editor/mouse_action.cpp
  57. +    filechooser.cpp
  58.      floating_textbox.cpp
  59.      formula.cpp
  60.      formula_debugger.cpp
  61.      formula_debugger_fwd.cpp
  62.      formula_function.cpp
  63. -    formula_tokenizer.cpp
  64.      formula_string_utils.cpp
  65. +    formula_tokenizer.cpp
  66. +    game_controller.cpp
  67. +    game_controller_abstract.cpp
  68. +    game_controller_new.cpp
  69.      game_display.cpp
  70. +    game_errors.cpp
  71.      game_events.cpp
  72. +    game_instance.cpp
  73.      game_preferences.cpp
  74.      gamestatus.cpp
  75. -    halo.cpp
  76. -    help.cpp
  77. -    intro.cpp
  78. -    leader_list.cpp
  79. -    lobby_preferences.cpp
  80. -    menu_events.cpp
  81. -    mouse_events.cpp
  82. -    mouse_handler_base.cpp
  83. -   mp_game_settings.cpp
  84. -    multiplayer.cpp
  85. -    multiplayer_ui.cpp
  86. -    multiplayer_wait.cpp
  87. -    multiplayer_create.cpp
  88. -    multiplayer_lobby.cpp
  89. -    multiplayer_connect.cpp
  90. -    pathfind/pathfind.cpp
  91. -    persist_context.cpp
  92. -    persist_manager.cpp
  93. -    persist_var.cpp
  94. -    playcampaign.cpp
  95. -    play_controller.cpp
  96. -    playmp_controller.cpp
  97. -    playsingle_controller.cpp
  98. -    playturn.cpp
  99. -    portrait.cpp
  100. -    replay.cpp
  101. -    replay_controller.cpp
  102. -    resources.cpp
  103. -    save_blocker.cpp
  104. -    savegame.cpp
  105. -    savegame_config.cpp
  106. -    scripting/lua.cpp
  107. -    sha1.cpp
  108. -    settings.cpp
  109. -    side_filter.cpp
  110. -    statistics.cpp
  111. -    statistics_dialog.cpp
  112. -    storyscreen/interface.cpp
  113. -    storyscreen/controller.cpp
  114. -    storyscreen/part.cpp
  115. -    storyscreen/render.cpp
  116. -    team.cpp
  117. -    terrain_filter.cpp
  118. -    tod_manager.cpp
  119. -    unit.cpp
  120. -    unit_abilities.cpp
  121. -    unit_animation.cpp
  122. -    unit_display.cpp
  123. -    unit_frame.cpp
  124. -    unit_helper.cpp
  125. -    unit_id.cpp
  126. -    unit_map.cpp
  127. -    unit_types.cpp
  128. -    variable.cpp
  129. -    variant.cpp
  130. -    whiteboard/action.cpp
  131. -    whiteboard/attack.cpp
  132. -    whiteboard/manager.cpp
  133. -    whiteboard/move.cpp
  134. -    whiteboard/highlight_visitor.cpp
  135. -    whiteboard/mapbuilder_visitor.cpp
  136. -    whiteboard/recall.cpp
  137. -    whiteboard/recruit.cpp
  138. -    whiteboard/side_actions.cpp
  139. -    whiteboard/utility.cpp
  140. -    whiteboard/validate_visitor.cpp
  141. -    whiteboard/visitor.cpp
  142. -    widgets/combo.cpp
  143. -    widgets/combo_drag.cpp
  144. -    widgets/drop_target.cpp
  145. -    widgets/scrollpane.cpp
  146.      gui/auxiliary/canvas.cpp
  147.      gui/auxiliary/event/dispatcher.cpp
  148.      gui/auxiliary/event/distributor.cpp
  149.      gui/auxiliary/event/handler.cpp
  150. +    gui/auxiliary/iterator/iterator.cpp
  151. +    gui/auxiliary/iterator/walker_grid.cpp
  152. +    gui/auxiliary/iterator/walker_widget.cpp
  153.      gui/auxiliary/log.cpp
  154.      gui/auxiliary/old_markup.cpp
  155.      gui/auxiliary/timer.cpp
  156. @@ -304,7 +256,6 @@ wesnoth_sources = Split("""
  157.      gui/auxiliary/widget_definition/progress_bar.cpp
  158.      gui/auxiliary/widget_definition/repeating_button.cpp
  159.      gui/auxiliary/widget_definition/scroll_label.cpp
  160. -    gui/auxiliary/widget_definition/vertical_scrollbar.cpp
  161.      gui/auxiliary/widget_definition/scrollbar_panel.cpp
  162.      gui/auxiliary/widget_definition/slider.cpp
  163.      gui/auxiliary/widget_definition/spacer.cpp
  164. @@ -312,12 +263,13 @@ wesnoth_sources = Split("""
  165.      gui/auxiliary/widget_definition/text_box.cpp
  166.      gui/auxiliary/widget_definition/toggle_button.cpp
  167.      gui/auxiliary/widget_definition/toggle_panel.cpp
  168. -    gui/auxiliary/widget_definition/tooltip.cpp
  169.      gui/auxiliary/widget_definition/tree_view.cpp
  170. +    gui/auxiliary/widget_definition/vertical_scrollbar.cpp
  171.      gui/auxiliary/widget_definition/window.cpp
  172. +    gui/auxiliary/window_builder.cpp
  173.      gui/auxiliary/window_builder/button.cpp
  174. -    gui/auxiliary/window_builder/drawing.cpp
  175.      gui/auxiliary/window_builder/control.cpp
  176. +    gui/auxiliary/window_builder/drawing.cpp
  177.      gui/auxiliary/window_builder/helper.cpp
  178.      gui/auxiliary/window_builder/horizontal_listbox.cpp
  179.      gui/auxiliary/window_builder/horizontal_scrollbar.cpp
  180. @@ -326,6 +278,9 @@ wesnoth_sources = Split("""
  181.      gui/auxiliary/window_builder/listbox.cpp
  182.      gui/auxiliary/window_builder/minimap.cpp
  183.      gui/auxiliary/window_builder/multi_page.cpp
  184. +    gui/auxiliary/window_builder/panel.cpp
  185. +    gui/auxiliary/window_builder/password_box.cpp
  186. +    gui/auxiliary/window_builder/progress_bar.cpp
  187.      gui/auxiliary/window_builder/repeating_button.cpp
  188.      gui/auxiliary/window_builder/scroll_label.cpp
  189.      gui/auxiliary/window_builder/scrollbar_panel.cpp
  190. @@ -334,25 +289,26 @@ wesnoth_sources = Split("""
  191.      gui/auxiliary/window_builder/stacked_widget.cpp
  192.      gui/auxiliary/window_builder/text_box.cpp
  193.      gui/auxiliary/window_builder/toggle_button.cpp
  194. -    gui/auxiliary/window_builder/vertical_scrollbar.cpp
  195. -    gui/auxiliary/window_builder/panel.cpp
  196. -    gui/auxiliary/window_builder/progress_bar.cpp
  197. -    gui/auxiliary/window_builder/password_box.cpp
  198.      gui/auxiliary/window_builder/toggle_panel.cpp
  199.      gui/auxiliary/window_builder/tree_view.cpp
  200. -    gui/auxiliary/window_builder.cpp
  201. +    gui/auxiliary/window_builder/vertical_scrollbar.cpp
  202. +    gui/dialogs/addon/description.cpp
  203.      gui/dialogs/addon_connect.cpp
  204.      gui/dialogs/addon_list.cpp
  205. -    gui/dialogs/addon/description.cpp
  206.      gui/dialogs/campaign_difficulty.cpp
  207.      gui/dialogs/campaign_selection.cpp
  208.      gui/dialogs/data_manage.cpp
  209.      gui/dialogs/debug_clock.cpp
  210.      gui/dialogs/dialog.cpp
  211.      gui/dialogs/edit_label.cpp
  212. +    gui/dialogs/editor_generate_map.cpp
  213. +    gui/dialogs/editor_new_map.cpp
  214. +    gui/dialogs/editor_resize_map.cpp
  215. +    gui/dialogs/editor_settings.cpp
  216. +    gui/dialogs/folder_create.cpp
  217.      gui/dialogs/formula_debugger.cpp
  218. -    gui/dialogs/game_load.cpp
  219.      gui/dialogs/game_delete.cpp
  220. +    gui/dialogs/game_load.cpp
  221.      gui/dialogs/game_save.cpp
  222.      gui/dialogs/gamestate_inspector.cpp
  223.      gui/dialogs/language_selection.cpp
  224. @@ -361,21 +317,26 @@ wesnoth_sources = Split("""
  225.      gui/dialogs/lobby_main.cpp
  226.      gui/dialogs/lobby_player_info.cpp
  227.      gui/dialogs/message.cpp
  228. +    gui/dialogs/mp_cmd_wrapper.cpp
  229. +    gui/dialogs/mp_change_control.cpp
  230.      gui/dialogs/mp_connect.cpp
  231.      gui/dialogs/mp_create_game.cpp
  232.      gui/dialogs/mp_create_game_set_password.cpp
  233. +    gui/dialogs/mp_login.cpp
  234.      gui/dialogs/mp_method_selection.cpp
  235. -    gui/dialogs/mp_cmd_wrapper.cpp
  236. +    gui/dialogs/network_transmission.cpp
  237. +    gui/dialogs/popup.cpp
  238.      gui/dialogs/simple_item_selector.cpp
  239. +    gui/dialogs/tip.cpp
  240.      gui/dialogs/title_screen.cpp
  241.      gui/dialogs/transient_message.cpp
  242.      gui/dialogs/unit_attack.cpp
  243.      gui/dialogs/unit_create.cpp
  244.      gui/dialogs/wml_message.cpp
  245.      gui/widgets/button.cpp
  246. -    gui/widgets/drawing.cpp
  247. -    gui/widgets/control.cpp
  248.      gui/widgets/container.cpp
  249. +    gui/widgets/control.cpp
  250. +    gui/widgets/drawing.cpp
  251.      gui/widgets/generator.cpp
  252.      gui/widgets/grid.cpp
  253.      gui/widgets/helper.cpp
  254. @@ -387,14 +348,14 @@ wesnoth_sources = Split("""
  255.      gui/widgets/minimap.cpp
  256.      gui/widgets/multi_page.cpp
  257.      gui/widgets/panel.cpp
  258. -    gui/widgets/progress_bar.cpp
  259.      gui/widgets/password_box.cpp
  260. +    gui/widgets/progress_bar.cpp
  261.      gui/widgets/repeating_button.cpp
  262. -    gui/widgets/settings.cpp
  263.      gui/widgets/scroll_label.cpp
  264. +    gui/widgets/scrollbar.cpp
  265.      gui/widgets/scrollbar_container.cpp
  266.      gui/widgets/scrollbar_panel.cpp
  267. -    gui/widgets/scrollbar.cpp
  268. +    gui/widgets/settings.cpp
  269.      gui/widgets/slider.cpp
  270.      gui/widgets/spacer.cpp
  271.      gui/widgets/stacked_widget.cpp
  272. @@ -402,38 +363,89 @@ wesnoth_sources = Split("""
  273.      gui/widgets/text_box.cpp
  274.      gui/widgets/toggle_button.cpp
  275.      gui/widgets/toggle_panel.cpp
  276. -    gui/widgets/tooltip.cpp
  277.      gui/widgets/tree_view.cpp
  278.      gui/widgets/tree_view_node.cpp
  279.      gui/widgets/vertical_scrollbar.cpp
  280.      gui/widgets/widget.cpp
  281.      gui/widgets/window.cpp
  282. +    halo.cpp
  283. +    help.cpp
  284. +    intro.cpp
  285. +    leader_list.cpp
  286. +    lobby_preferences.cpp
  287. +    menu_events.cpp
  288. +    mouse_events.cpp
  289. +    mouse_handler_base.cpp
  290. +    mp_game_settings.cpp
  291. +    multiplayer.cpp
  292. +    multiplayer_connect.cpp
  293. +    multiplayer_create.cpp
  294. +    multiplayer_lobby.cpp
  295. +    multiplayer_ui.cpp
  296. +    multiplayer_wait.cpp
  297. +    network_asio.cpp
  298. +    pathfind/pathfind.cpp
  299. +    pathfind/teleport.cpp
  300. +    persist_context.cpp
  301. +    persist_manager.cpp
  302. +    persist_var.cpp
  303. +    play_controller.cpp
  304. +    playcampaign.cpp
  305. +    playmp_controller.cpp
  306. +    playsingle_controller.cpp
  307. +    playturn.cpp
  308. +    portrait.cpp
  309. +    replay.cpp
  310. +    replay_controller.cpp
  311. +    resources.cpp
  312. +    save_blocker.cpp
  313. +    savegame.cpp
  314. +    savegame_config.cpp
  315. +    scripting/lua.cpp
  316. +    settings.cpp
  317. +    sha1.cpp
  318. +    side_filter.cpp
  319. +    statistics.cpp
  320. +    statistics_dialog.cpp
  321. +    storyscreen/controller.cpp
  322. +    storyscreen/interface.cpp
  323. +    storyscreen/part.cpp
  324. +    storyscreen/render.cpp
  325. +    team.cpp
  326. +    terrain_filter.cpp
  327. +    tod_manager.cpp
  328. +    unit.cpp
  329. +    unit_abilities.cpp
  330. +    unit_animation.cpp
  331. +    unit_display.cpp
  332. +    unit_frame.cpp
  333. +    unit_helper.cpp
  334. +    unit_id.cpp
  335. +    unit_map.cpp
  336. +    unit_types.cpp
  337. +    variable.cpp
  338. +    variant.cpp
  339. +    whiteboard/action.cpp
  340. +    whiteboard/attack.cpp
  341. +    whiteboard/highlight_visitor.cpp
  342. +    whiteboard/manager.cpp
  343. +    whiteboard/mapbuilder_visitor.cpp
  344. +    whiteboard/move.cpp
  345. +    whiteboard/recall.cpp
  346. +    whiteboard/recruit.cpp
  347. +    whiteboard/side_actions.cpp
  348. +    whiteboard/suppose_dead.cpp
  349. +    whiteboard/utility.cpp
  350. +    whiteboard/validate_visitor.cpp
  351. +    whiteboard/visitor.cpp
  352. +    widgets/combo.cpp
  353. +    widgets/combo_drag.cpp
  354. +    widgets/drop_target.cpp
  355. +    widgets/scrollpane.cpp
  356.      """)
  357.  
  358.  wesnoth_sources.extend(client_env.Object("game_preferences_display.cpp", EXTRA_DEFINE = env["PLATFORM"] != "win32" and "WESNOTH_PREFIX='\"$prefix\"'" or None))
  359.  
  360. -wesnoth_editor_sources = Split("""
  361. -    gui/dialogs/editor_generate_map.cpp
  362. -    gui/dialogs/editor_new_map.cpp
  363. -    gui/dialogs/editor_resize_map.cpp
  364. -    gui/dialogs/editor_settings.cpp
  365. -    editor/action.cpp
  366. -    editor/brush.cpp
  367. -    editor/editor_main.cpp
  368. -    editor/editor_controller.cpp
  369. -    editor/editor_display.cpp
  370. -    editor/editor_layout.cpp
  371. -    editor/editor_map.cpp
  372. -    editor/editor_palettes.cpp
  373. -    editor/editor_preferences.cpp
  374. -    editor/map_context.cpp
  375. -    editor/map_fragment.cpp
  376. -    editor/mouse_action.cpp
  377. -    """)
  378. -    
  379. -if env["editor"]:
  380. -    wesnoth_sources += wesnoth_editor_sources
  381. -
  382.  libwesnoth_extras = client_env.Library("wesnoth_extras", wesnoth_sources)
  383.  
  384.  libwesnoth_extras.extend(SConscript("lua/SConscript"))
  385. @@ -505,6 +517,14 @@ exploder_sources = Split("""
  386.      """)
  387.  client_env.WesnothProgram("exploder", exploder_sources + [libcutter, libwesnoth_core, libwesnoth_sdl, libwesnothd, libwesnoth], have_client_prereqs, LIBS = ["$LIBS", "png"])
  388.  
  389. +schema_generator_sources = Split("""
  390. +    tools/schema/schema_generator.cpp
  391. +    tools/schema/sourceparser.cpp
  392. +    tools/schema/error_container.cpp
  393. +    tools/schema/tag.cpp
  394. +    """)
  395. +client_env.WesnothProgram("schema_generator", schema_generator_sources + [libwesnoth_core, libwesnothd], have_client_prereqs)
  396. +
  397.  test_utils_sources = Split("""
  398.      tests/utils/game_config_manager.cpp
  399.      tests/utils/fake_event_source.cpp
  400. @@ -515,22 +535,27 @@ libtest_utils = test_env.Library("test_utils", test_utils_sources)
  401.  
  402.  test_sources = Split("""
  403.      tests/main.cpp
  404. +    tests/test_commandline_options.cpp
  405.      tests/test_formula_ai.cpp
  406.      tests/test_formula_function.cpp
  407. -    tests/test_lexical_cast.cpp   
  408. +    tests/test_image_modifications.cpp
  409. +    tests/test_lexical_cast.cpp
  410.      tests/test_network_worker.cpp
  411.      tests/test_team.cpp
  412.      tests/test_util.cpp
  413.      tests/test_serialization.cpp
  414.      tests/test_version.cpp
  415. +    tests/gui/fire_event.cpp
  416. +    tests/gui/iterator.cpp
  417.      tests/gui/test_drop_target.cpp
  418.      tests/gui/test_gui2.cpp
  419.      tests/gui/test_save_dialog.cpp
  420. +    tests/gui/visitor.cpp
  421.      tests/utils/play_scenario.cpp
  422.      """)
  423.  test_sources.extend(test_env.Object("tests/test_config_cache.cpp"))
  424.  
  425. -test = test_env.WesnothProgram("test", test_sources +  [libwesnoth_extras, libwesnoth_core, libwesnoth_sdl, libwesnoth,libtest_utils], have_test_prereqs)
  426. +test = test_env.WesnothProgram("test", test_sources +  [libwesnoth_extras, libwesnoth_core, libwesnoth_sdl, libwesnoth, libwesnoth_extras, libtest_utils], have_test_prereqs)
  427.  
  428.  if env["svnrev"] != "" and env["svnrev"] != "exported":
  429.      revision_define = "#define REVISION \"%s\"\n" % env["svnrev"]
Advertisement
Add Comment
Please, Sign In to add comment
Public Pastes
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!