0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Moved Mordante's gui2 sources from libwesnoth to their proper place...

Browse source 
...thus eliminating circular references between libwesnoth and
libwesnoth_core.
This commit is contained in:
Sergey Popov 2008-07-05 21:00:30 +00:00
parent 7e787f5c27
commit 4e00dc4c43
2 changed files with 27 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
SConstruct
View file

@ -302,7 +302,6 @@ env.MergeFlags(env["extra_flags_" + build])
test_env = env.Clone()
if not env['static_test']:
test_env.Append(CPPDEFINES = "BOOST_TEST_DYN_LINK")
test_env['LINKCOM'] = '$LINK -o $TARGET $LINKFLAGS -Wl,--start-group $SOURCES -Wl,--end-group $_LIBDIRFLAGS $_LIBFLAGS'
Export("test_env")

54
src/SConscript
View file

@ -99,33 +99,6 @@ libwesnoth_sources = Split("""
widgets/textbox.cpp
widgets/widget.cpp
wml_exception.cpp
gui/dialogs/addon_connect.cpp
gui/dialogs/dialog.cpp
gui/dialogs/language_selection.cpp
gui/dialogs/mp_connect.cpp
gui/dialogs/mp_method_selection.cpp
gui/widgets/button.cpp
gui/widgets/canvas.cpp
gui/widgets/control.cpp
gui/widgets/container.cpp
gui/widgets/event_handler.cpp
gui/widgets/grid.cpp
gui/widgets/helper.cpp
gui/widgets/label.cpp
gui/widgets/listbox.cpp
gui/widgets/panel.cpp
gui/widgets/settings.cpp
gui/widgets/scrollbar.cpp
gui/widgets/spacer.cpp
gui/widgets/text.cpp
gui/widgets/text_box.cpp
gui/widgets/toggle_button.cpp
gui/widgets/toggle_panel.cpp
gui/widgets/tooltip.cpp
gui/widgets/vertical_scrollbar.cpp
gui/widgets/widget.cpp
gui/widgets/window.cpp
gui/widgets/window_builder.cpp
""")
libwesnoth_sources.extend([
env.Object("font.cpp", EXTRA_DEFINE = env['fribidi'] and "HAVE_FRIBIDI" or None),
@ -222,6 +195,33 @@ wesnoth_sources = Split("""
variant.cpp
widgets/combo.cpp
widgets/scrollpane.cpp
gui/dialogs/addon_connect.cpp
gui/dialogs/dialog.cpp
gui/dialogs/language_selection.cpp
gui/dialogs/mp_connect.cpp
gui/dialogs/mp_method_selection.cpp
gui/widgets/button.cpp
gui/widgets/canvas.cpp
gui/widgets/control.cpp
gui/widgets/container.cpp
gui/widgets/event_handler.cpp
gui/widgets/grid.cpp
gui/widgets/helper.cpp
gui/widgets/label.cpp
gui/widgets/listbox.cpp
gui/widgets/panel.cpp
gui/widgets/settings.cpp
gui/widgets/scrollbar.cpp
gui/widgets/spacer.cpp
gui/widgets/text.cpp
gui/widgets/text_box.cpp
gui/widgets/toggle_button.cpp
gui/widgets/toggle_panel.cpp
gui/widgets/tooltip.cpp
gui/widgets/vertical_scrollbar.cpp
gui/widgets/widget.cpp
gui/widgets/window.cpp
gui/widgets/window_builder.cpp
""")
wesnoth_sources.extend(env.Object("game_preferences_display.cpp", EXTRA_DEFINE = env["PLATFORM"] != "win32" and "WESNOTH_PREFIX='\"$prefix\"'" or None))