[Commits] [wesnoth/wesnoth] f1b4f7: Fix the scons Wesnoth Windows executable icon.

GitHub noreply at github.com
Mon Nov 20 05:56:59 UTC 2017


  Branch: refs/heads/master
  Home:   https://github.com/wesnoth/wesnoth
  Commit: f1b4f79afc7dc7debe51ab610b7571137654e052
      https://github.com/wesnoth/wesnoth/commit/f1b4f79afc7dc7debe51ab610b7571137654e052
  Author: pentarctagon <pentarctagon at tutamail.com>
  Date:   2017-11-20 (Mon, 20 Nov 2017)

  Changed paths:
    M src/SConscript

  Log Message:
  -----------
  Fix the scons Wesnoth Windows executable icon.


  Commit: c8b37856c59149f7d0c58cf6fe4779971e7a5177
      https://github.com/wesnoth/wesnoth/commit/c8b37856c59149f7d0c58cf6fe4779971e7a5177
  Author: pentarctagon <pentarctagon at tutamail.com>
  Date:   2017-11-20 (Mon, 20 Nov 2017)

  Changed paths:
    M src/SConscript

  Log Message:
  -----------
  Add explanation comment.


  Commit: 5535b363955a0af133b05c72407e0f3743425a2a
      https://github.com/wesnoth/wesnoth/commit/5535b363955a0af133b05c72407e0f3743425a2a
  Author: Jyrki Vesterinen <sandgtx at gmail.com>
  Date:   2017-11-20 (Mon, 20 Nov 2017)

  Changed paths:
    M src/filesystem_boost.cpp

  Log Message:
  -----------
  Fix build with TDM-GCC

@newfrenchy83 said that the build is failing:
https://github.com/wesnoth/wesnoth/commit/37225d24eaa52183f897e223dc3847bf89c89282#commitcomment-25629052

It looks like TDM-GCC uses Windows XP development headers, unfortunately.
However, the problem is easy to work around by simply #defining the missing
value ourselves. We should consider dropping TDM-GCC support after the 1.14
release, though.


  Commit: 17c0fd97a818d6847c2a9dea31181009b4a564f9
      https://github.com/wesnoth/wesnoth/commit/17c0fd97a818d6847c2a9dea31181009b4a564f9
  Author: Jyrki Vesterinen <sandgtx at gmail.com>
  Date:   2017-11-20 (Mon, 20 Nov 2017)

  Changed paths:
    M src/gui/widgets/integer_selector.hpp
    M src/gui/widgets/toggle_panel.hpp

  Log Message:
  -----------
  Fix MSVC compiler warning about overriding a function

Visual Studio 2013 omits a warning if a parameter is const-qualified in the
original function but not the overriding one (or the reverse).


  Commit: e45e8244991ff635646cc9c563a33a07ba414c5d
      https://github.com/wesnoth/wesnoth/commit/e45e8244991ff635646cc9c563a33a07ba414c5d
  Author: pentarctagon <pentarctagon at tutamail.com>
  Date:   2017-11-20 (Mon, 20 Nov 2017)

  Changed paths:
    M CMakeLists.txt
    M SConstruct
    M src/CMakeLists.txt
    M src/SConscript

  Log Message:
  -----------
  Have scons and cmake link against same static libraries.


  Commit: 7d910ab07569a77559749fe2744be95ed13333ad
      https://github.com/wesnoth/wesnoth/commit/7d910ab07569a77559749fe2744be95ed13333ad
  Author: lundberg <gregory_lundberg at gmx.com>
  Date:   2017-11-20 (Mon, 20 Nov 2017)

  Changed paths:
    M src/halo.cpp

  Log Message:
  -----------
  Fix MSVC variable hides variable warning


  Commit: 0e57d0840a1fc8a65427a5fdc83ee420c51e75ad
      https://github.com/wesnoth/wesnoth/commit/0e57d0840a1fc8a65427a5fdc83ee420c51e75ad
  Author: David Seifert <soap at gentoo.org>
  Date:   2017-11-20 (Mon, 20 Nov 2017)

  Changed paths:
    M CMakeLists.txt
    M doc/man/CMakeLists.txt
    M doc/manual/CMakeLists.txt
    M packaging/systemd/wesnothd.service.in
    M po/CMakeLists.txt
    M src/CMakeLists.txt

  Log Message:
  -----------
  Use GNUInstallDirs to specify directories

* GNUInstallDirs is the only Kitware-supported
  way to change the default directories. Most
  distributions have hooks for changing these
  directories, which makes integrating wesnoth
  easier and more consistent with the rest of
  the CMake ecosystem.
* Make build system perfectly out-of-source
  compatible. The build system should never
  touch files in the source tree.


  Commit: 870f896a53c7b368664d807a9c19e861cada424c
      https://github.com/wesnoth/wesnoth/commit/870f896a53c7b368664d807a9c19e861cada424c
  Author: David Seifert <soap at gentoo.org>
  Date:   2017-11-20 (Mon, 20 Nov 2017)

  Changed paths:
    M changelog

  Log Message:
  -----------
  Update changelog

* Detail the `GNUInstallDirs` changes
* Non-Windows builds now use the absolute path for all
  data paths. This is less brittle, as relative path
  lookup in Unix always depends on the current value of
  the PWD environmental variable.


  Commit: 321c350d7618795df774bc48a2f0a662949e56ce
      https://github.com/wesnoth/wesnoth/commit/321c350d7618795df774bc48a2f0a662949e56ce
  Author: Jyrki Vesterinen <sandgtx at gmail.com>
  Date:   2017-11-20 (Mon, 20 Nov 2017)

  Changed paths:
    M CMakeLists.txt
    M SConstruct
    M po/CMakeLists.txt
    M src/CMakeLists.txt
    M src/SConscript

  Log Message:
  -----------
  Merge branch 'static-libs'

Manual merge of pull request #2208.


Compare: https://github.com/wesnoth/wesnoth/compare/34008913ede6...321c350d7618


More information about the Commits mailing list