[Commits] [wesnoth/wesnoth] 2f7368: Fix broken Windows compilation.

Thu Jun 2 09:20:16 UTC 2016

  Branch: refs/heads/renderpath_redo
  Home:   https://github.com/wesnoth/wesnoth
  Commit: 2f73681499c5b8216967feb8e74e7ddce7a8c7e2
      https://github.com/wesnoth/wesnoth/commit/2f73681499c5b8216967feb8e74e7ddce7a8c7e2
  Author: Wedge009 <wedge009 at wedge009.net>
  Date:   2016-06-01 (Wed, 01 Jun 2016)

  Changed paths:
    M src/server/server.cpp

  Log Message:
  -----------
  Fix broken Windows compilation.

  Commit: c8c1e750de7bb94ae533a23a34df31cb4a41abf4
      https://github.com/wesnoth/wesnoth/commit/c8c1e750de7bb94ae533a23a34df31cb4a41abf4
  Author: Wedge009 <wedge009 at wedge009.net>
  Date:   2016-06-01 (Wed, 01 Jun 2016)

  Changed paths:
    M projectfiles/VC12/wesnoth.vcxproj
    M projectfiles/VC12/wesnoth.vcxproj.filters
    M projectfiles/VC12/wesnothd.vcxproj
    M projectfiles/VC12/wesnothd.vcxproj.filters

  Log Message:
  -----------
  Update VC project files to correspond with PR #645 being merged.

  Commit: dc9db2e830cf0853e37e33120663e2c13c491ba8
      https://github.com/wesnoth/wesnoth/commit/dc9db2e830cf0853e37e33120663e2c13c491ba8
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2016-06-01 (Wed, 01 Jun 2016)

  Changed paths:
    M projectfiles/CodeBlocks/wesnoth.cbp
    M projectfiles/CodeBlocks/wesnothd.cbp

  Log Message:
  -----------
  Updated CB projfiles

  Commit: d350d91c40c390dad29a68846aec641f3afebd01
      https://github.com/wesnoth/wesnoth/commit/d350d91c40c390dad29a68846aec641f3afebd01
  Author: Andreas Löf <andreas at alternating.net>
  Date:   2016-06-01 (Wed, 01 Jun 2016)

  Changed paths:
    M SConstruct
    M src/lua/SConscript

  Log Message:
  -----------
  Make strict compilation under scons behave like cmake

This adds -Wold-style-cast to the CCFLAGS when compiling everything
but lua. Lua requires an exception from the flags and there's thus a
workaround added.

  Commit: 724408ceb828781cf73001020ecc83a1b730ac95
      https://github.com/wesnoth/wesnoth/commit/724408ceb828781cf73001020ecc83a1b730ac95
  Author: loonycyborg <loonycyborg at gmail.com>
  Date:   2016-06-01 (Wed, 01 Jun 2016)

  Changed paths:
    M src/SDL_SavePNG/savepng.cpp
    M src/network_worker.cpp
    M src/server/server.cpp
    M src/server/server.hpp

  Log Message:
  -----------
  Fixed -Wold-style-cast warnings

  Commit: 2755920ba268a9237c182c867b6acef7161fee67
      https://github.com/wesnoth/wesnoth/commit/2755920ba268a9237c182c867b6acef7161fee67
  Author: loonycyborg <loonycyborg at gmail.com>
  Date:   2016-06-01 (Wed, 01 Jun 2016)

  Changed paths:
    M src/server/server.cpp

  Log Message:
  -----------
  Fixed wesnothd not showing MOTD

  Commit: 0cd14d875d9ec04b9327aaff14567b1d522f7fa3
      https://github.com/wesnoth/wesnoth/commit/0cd14d875d9ec04b9327aaff14567b1d522f7fa3
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2016-06-02 (Thu, 02 Jun 2016)

  Changed paths:
    M src/editor/controller/editor_controller.cpp
    M src/play_controller.cpp
    M src/preferences.cpp
    M src/preferences.hpp
    M src/preferences_display.cpp
    M src/preferences_display.hpp

  Log Message:
  -----------
  Fixed accelerated speed settings not being respected in-game (bug #24653)

Since the preference display manager was refactored out in d2bec9ec9d39b783f,
the display class setters for preferences such as accelerated speed weren't getting
called when opening the editor or starting a new game. This commit adds a function
calling the relevant setters.

This also cleans up a few redundant pref setter functions.

  Commit: 67479e4074142a87453beb92064b1413c90ad328
      https://github.com/wesnoth/wesnoth/commit/67479e4074142a87453beb92064b1413c90ad328
  Author: loonycyborg <loonycyborg at gmail.com>
  Date:   2016-06-01 (Wed, 01 Jun 2016)

  Changed paths:
    M SConstruct

  Log Message:
  -----------
  scons: properly move asio check to serverside checks

  Commit: 904b4668cec65f849037e6e7d5507d9ac66e90b3
      https://github.com/wesnoth/wesnoth/commit/904b4668cec65f849037e6e7d5507d9ac66e90b3
  Author: loonycyborg <loonycyborg at gmail.com>
  Date:   2016-06-01 (Wed, 01 Jun 2016)

  Changed paths:
    M src/server/forum_user_handler.cpp
    M src/server/forum_user_handler.hpp

  Log Message:
  -----------
  Replace shared_ptr with unique_ptr as suggested in TODO item

  Commit: 0f9e04501f2de74880234299875763f854f206ce
      https://github.com/wesnoth/wesnoth/commit/0f9e04501f2de74880234299875763f854f206ce
  Author: loonycyborg <loonycyborg at gmail.com>
  Date:   2016-06-01 (Wed, 01 Jun 2016)

  Changed paths:
    M CMakeLists.txt
    M SConstruct

  Log Message:
  -----------
  Remove obsolete and unused HAVE_CXX0X macro from buildsystems

  Commit: cc8fcf81181b1d91c14d529465173468965a66a8
      https://github.com/wesnoth/wesnoth/commit/cc8fcf81181b1d91c14d529465173468965a66a8
  Author: ln-zookeeper <lari.nieminen at iki.fi>
  Date:   2016-06-01 (Wed, 01 Jun 2016)

  Changed paths:
    M src/util.hpp

  Log Message:
  -----------
  Fixed compilation issue

  Commit: 7528852484ed01a04be233c15d06431ef5502852
      https://github.com/wesnoth/wesnoth/commit/7528852484ed01a04be233c15d06431ef5502852
  Author: Andreas Löf <andreas at alternating.net>
  Date:   2016-06-02 (Thu, 02 Jun 2016)

  Changed paths:
    M .travis.yml

  Log Message:
  -----------
  attempt to make travis also compile with cmake

  Commit: ac8d026c6fd54f37b870e97f9cdba950544b573b
      https://github.com/wesnoth/wesnoth/commit/ac8d026c6fd54f37b870e97f9cdba950544b573b
  Author: Andreas Löf <andreas at alternating.net>
  Date:   2016-06-02 (Thu, 02 Jun 2016)

  Changed paths:
    M .travis.yml

  Log Message:
  -----------
  make cmake buils honour the NLS flag

  Commit: 0f3b4c7e26f36a1aa4dc7236b09a881bb0059604
      https://github.com/wesnoth/wesnoth/commit/0f3b4c7e26f36a1aa4dc7236b09a881bb0059604
  Author: Andreas Löf <andreas at alternating.net>
  Date:   2016-06-02 (Thu, 02 Jun 2016)

  Changed paths:
    M .travis.yml
    M CMakeLists.txt
    M SConstruct
    M projectfiles/CodeBlocks/wesnoth.cbp
    M projectfiles/CodeBlocks/wesnothd.cbp
    M projectfiles/VC12/wesnoth.vcxproj
    M projectfiles/VC12/wesnoth.vcxproj.filters
    M projectfiles/VC12/wesnothd.vcxproj
    M projectfiles/VC12/wesnothd.vcxproj.filters
    M src/SDL_SavePNG/savepng.cpp
    M src/editor/controller/editor_controller.cpp
    M src/lua/SConscript
    M src/network_worker.cpp
    M src/play_controller.cpp
    M src/preferences.cpp
    M src/preferences.hpp
    M src/preferences_display.cpp
    M src/preferences_display.hpp
    M src/server/forum_user_handler.cpp
    M src/server/forum_user_handler.hpp
    M src/server/server.cpp
    M src/server/server.hpp
    M src/util.hpp

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master' into renderpath_redo

Compare: https://github.com/wesnoth/wesnoth/compare/f2e9decca7d0...0f3b4c7e26f3