[Commits] [wesnoth/wesnoth] 5b2980: Have cmake and scons use same lists of source file...

GitHub noreply at github.com
Thu Dec 15 20:51:30 UTC 2016


  Branch: refs/heads/master
  Home:   https://github.com/wesnoth/wesnoth
  Commit: 5b29805554178e66fcdc97693cfcb110cffc27ac
      https://github.com/wesnoth/wesnoth/commit/5b29805554178e66fcdc97693cfcb110cffc27ac
  Author: Pentarctagon <Pentarctagon at users.noreply.github.com>
  Date:   2016-12-15 (Thu, 15 Dec 2016)

  Changed paths:
    A source_lists/campaignd
    A source_lists/create_images
    A source_lists/cutter
    A source_lists/exploder
    A source_lists/libwesnoth
    A source_lists/libwesnoth_core
    A source_lists/libwesnoth_sdl
    A source_lists/lua
    A source_lists/schema_generator
    A source_lists/schema_validator
    A source_lists/test
    A source_lists/wesmage
    A source_lists/wesnoth
    A source_lists/wesnothd
    M src/CMakeLists.txt
    M src/SConscript
    R src/lua/SConscript

  Log Message:
  -----------
  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





More information about the Commits mailing list