Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Have cmake and scons use same lists of source files (#882)
* Use separate files to build scons and to build lua for cmake Move lists of source files into their own directory Make scons use the lists of source files Move lua build step to src/SConscript and delete src/lua/SConscript Make cmake use the separate file with the list of lua sources to build * Finish changing over to source lists scons move source files from libraries that don't appear in cmake over to existing source lists - libcampaignd, libcutter, libdummy_video, libtest_utils add the defines FIFODIR and WESNOTH_PATH to all compiled source files, as cmake does, and move the single files those defines had previously been defined on into the source lists remove WESNOTH_PREFIX, as not used added schema_validator sources from cmake added OBJPREFIX to - cutter, exploder, campaignd, schema_generator, schema_validator cmake change over to using the source lists move source files from libraries that don't appear in scons over to existing source lists - wesnoth-gui_types, wesnoth-gui_event, wesnoth-gui_iterator, wesnoth-gui_placer, wesnoth-gui_tooltip, wesnoth-gui_widget, wesnoth-gui_widget_definition, wesnoth-gui1_widgets, wesnoth-schema_validator
- Loading branch information
1 parent
fad53ea
commit 5b29805
Showing
17 changed files
with
821 additions
and
1,603 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
addon/validation.cpp | ||
campaign_server/addon_utils.cpp | ||
campaign_server/blacklist.cpp | ||
campaign_server/campaign_server.cpp | ||
server/server_base.cpp | ||
server/simple_wml.cpp |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
sdl/utils.cpp | ||
sdl/window.cpp | ||
tests/create_images.cpp | ||
tools/exploder_utils.cpp | ||
tracer.cpp |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
sdl/utils.cpp | ||
tools/cutter.cpp | ||
tools/exploder_cutter.cpp | ||
tools/exploder_utils.cpp | ||
tracer.cpp |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
sdl/utils.cpp | ||
tools/exploder.cpp | ||
tools/exploder_composer.cpp | ||
tools/exploder_cutter.cpp | ||
tools/exploder_utils.cpp | ||
tracer.cpp |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,63 @@ | ||
arrow.cpp | ||
construct_dialog.cpp | ||
cursor.cpp | ||
desktop/clipboard.cpp | ||
display.cpp | ||
display_context.cpp | ||
events.cpp | ||
floating_label.cpp | ||
font/font_config.cpp | ||
font/marked-up_text.cpp | ||
font/sdl_ttf.cpp | ||
font/standard_colors.cpp | ||
font/text.cpp | ||
font/text_cache.cpp | ||
font/text_formatting.cpp | ||
font/text_surface.cpp | ||
format_time_summary.cpp | ||
game_end_exceptions.cpp | ||
generators/cave_map_generator.cpp | ||
generators/default_map_generator.cpp | ||
generators/default_map_generator_job.cpp | ||
generators/lua_map_generator.cpp | ||
generators/map_create.cpp | ||
generators/map_generator.cpp | ||
generic_event.cpp | ||
hotkey/command_executor.cpp | ||
hotkey/hotkey_command.cpp | ||
hotkey/hotkey_item.cpp | ||
hotkey/hotkey_manager.cpp | ||
image.cpp | ||
image_modifications.cpp | ||
joystick.cpp | ||
key.cpp | ||
language.cpp | ||
map/label.cpp | ||
minimap.cpp | ||
pathfind/astarsearch.cpp | ||
pathutils.cpp | ||
preferences.cpp | ||
quit_confirmation.cpp | ||
reports.cpp | ||
show_dialog.cpp | ||
sound.cpp | ||
sound_music_track.cpp | ||
soundsource.cpp | ||
terrain/builder.cpp | ||
terrain/terrain.cpp | ||
terrain/translation.cpp | ||
theme.cpp | ||
time_of_day.cpp | ||
tooltips.cpp | ||
utils/make_enum.cpp | ||
video.cpp | ||
widgets/button.cpp | ||
widgets/label.cpp | ||
widgets/menu.cpp | ||
widgets/menu_style.cpp | ||
widgets/scrollarea.cpp | ||
widgets/scrollbar.cpp | ||
widgets/slider.cpp | ||
widgets/textbox.cpp | ||
widgets/widget.cpp | ||
wml_exception.cpp |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
color.cpp | ||
color_range.cpp | ||
config.cpp | ||
filesystem_boost.cpp | ||
filesystem_common.cpp | ||
font/constants.cpp | ||
game_config.cpp | ||
gettext_boost.cpp | ||
hash.cpp | ||
log.cpp | ||
map/location.cpp | ||
map/map.cpp | ||
md5.cpp | ||
mt_rng.cpp | ||
seed_rng.cpp | ||
serialization/binary_or_text.cpp | ||
serialization/parser.cpp | ||
serialization/preprocessor.cpp | ||
serialization/schema_validator.cpp | ||
serialization/string_utils.cpp | ||
serialization/tokenizer.cpp | ||
serialization/unicode.cpp | ||
serialization/validator.cpp | ||
terrain/type_data.cpp | ||
tools/schema/tag.cpp | ||
tstring.cpp | ||
version.cpp |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
sdl/exception.cpp | ||
sdl/rect.cpp | ||
sdl/surface.cpp | ||
sdl/utils.cpp | ||
sdl/window.cpp | ||
tracer.cpp | ||
xBRZ/xbrz.cpp |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,33 @@ | ||
lua_jailbreak_exception.cpp | ||
lua/lapi.cpp | ||
lua/lauxlib.cpp | ||
lua/lbaselib.cpp | ||
lua/lbitlib.cpp | ||
lua/lcode.cpp | ||
lua/lcorolib.cpp | ||
lua/lctype.cpp | ||
lua/ldblib.cpp | ||
lua/ldebug.cpp | ||
lua/ldo.cpp | ||
lua/ldump.cpp | ||
lua/lfunc.cpp | ||
lua/lgc.cpp | ||
lua/liolib.cpp | ||
lua/llex.cpp | ||
lua/lmathlib.cpp | ||
lua/lmem.cpp | ||
lua/loadlib.cpp | ||
lua/lobject.cpp | ||
lua/lopcodes.cpp | ||
lua/loslib.cpp | ||
lua/lparser.cpp | ||
lua/lstate.cpp | ||
lua/lstring.cpp | ||
lua/lstrlib.cpp | ||
lua/ltable.cpp | ||
lua/ltablib.cpp | ||
lua/ltm.cpp | ||
lua/lundump.cpp | ||
lua/lutf8lib.cpp | ||
lua/lvm.cpp | ||
lua/lzio.cpp |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
filesystem_boost.cpp | ||
filesystem_common.cpp | ||
tools/schema/error_container.cpp | ||
tools/schema/schema_generator.cpp | ||
tools/schema/sourceparser.cpp | ||
tools/schema/tag.cpp |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
config_cache.cpp | ||
filesystem_boost.cpp | ||
filesystem_common.cpp | ||
serialization/schema_validator.cpp | ||
serialization/validator.cpp | ||
tools/schema/tag.cpp | ||
tools/validator/validator_tool.cpp | ||
utils/sha1.cpp |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,32 @@ | ||
tests/gui/fire_event.cpp | ||
tests/gui/iterator.cpp | ||
tests/gui/test_gui2.cpp | ||
tests/gui/test_save_dialog.cpp | ||
tests/gui/visitor.cpp | ||
tests/main.cpp | ||
tests/test_addons.cpp | ||
tests/test_commandline_options.cpp | ||
tests/test_config.cpp | ||
tests/test_config_cache.cpp | ||
tests/test_filesystem.cpp | ||
tests/test_formula_ai.cpp | ||
tests/test_formula_core.cpp | ||
tests/test_formula_function.cpp | ||
tests/test_image_modifications.cpp | ||
tests/test_lexical_cast.cpp | ||
tests/test_make_enum.cpp | ||
tests/test_map_location.cpp | ||
tests/test_mp_connect.cpp | ||
tests/test_recall_list.cpp | ||
tests/test_rng.cpp | ||
tests/test_sdl_utils.cpp | ||
tests/test_serialization.cpp | ||
tests/test_team.cpp | ||
tests/test_unit_map.cpp | ||
tests/test_util.cpp | ||
tests/test_version.cpp | ||
tests/test_whiteboard_side_actions.cpp | ||
tests/utils/fake_display.cpp | ||
tests/utils/fake_event_source.cpp | ||
tests/utils/game_config_manager.cpp | ||
tests/utils/play_scenario.cpp |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
sdl/utils.cpp | ||
sdl/window.cpp | ||
tools/exploder_utils.cpp | ||
tracer.cpp | ||
wesmage/exit.cpp | ||
wesmage/filter.cpp | ||
wesmage/options.cpp | ||
wesmage/wesmage.cpp |
Oops, something went wrong.