[Commits] [wesnoth/wesnoth] 55e7eb: cherry-pick of ab9baacf6eb8a5668713457ea2f135508f7...

[GitHub]

  Branch: refs/heads/1.12
  Home:   https://github.com/wesnoth/wesnoth
  Commit: 55e7ebdfd7d616021379db710517b7faabab4295
      https://github.com/wesnoth/wesnoth/commit/55e7ebdfd7d616021379db710517b7faabab4295
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-10-26 (Sun, 26 Oct 2014)

  Changed paths:
    M .travis.yml
    M CMakeLists.txt
    M SConstruct
    M src/filesystem.hpp
    M src/filesystem_common.cpp
    M src/font.cpp
    M src/image.cpp
    M src/sound.cpp

  Log Message:
  -----------
  cherry-pick of ab9baacf6eb8a5668713457ea2f135508f77a7a7 -SDL_RWops

Also adds a saucy repository to travis


  Commit: 9d48adbfe12c174b49cdc6546f12c4f68fa8c877
      https://github.com/wesnoth/wesnoth/commit/9d48adbfe12c174b49cdc6546f12c4f68fa8c877
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-10-26 (Sun, 26 Oct 2014)

  Changed paths:
    M CMakeLists.txt
    M src/sound.cpp

  Log Message:
  -----------
  fixup pandora compilation with SDL < 1.2.12

This was checked to compile (but not link of course) on my system,
using cmake with pandora enabled, and pointed to the SDL_mixer
1.2.0 header. (the master version, not this cherry-pick)

I also essentially backported this commit:

cef5e2ed9ca9fcec93ae0a5f8fdf1c9fe49efb58

which checks reduces the CMake version requirement for pandora


  Commit: 5db8126caf367df606005092e48f9ea56d997f26
      https://github.com/wesnoth/wesnoth/commit/5db8126caf367df606005092e48f9ea56d997f26
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-10-26 (Sun, 26 Oct 2014)

  Changed paths:
    M src/savegame.cpp

  Log Message:
  -----------
  disable ansi conversions (backport from master)

backport of 8611975db984de6b911e33e06f02ff71b2919c56


  Commit: c2f6072b9b28394226dc4f77206b94f617a31c08
      https://github.com/wesnoth/wesnoth/commit/c2f6072b9b28394226dc4f77206b94f617a31c08
  Author: gfgtdf <tischpapier at gmail.com>
  Date:   2014-10-26 (Sun, 26 Oct 2014)

  Changed paths:
    M src/filesystem_boost.cpp

  Log Message:
  -----------
  reenable ".." in get_binary_file_location

this was also how ".." behaved in the old code.


  Commit: f1c71a1eb781a2cdc113f28d9a0d1e0e61b0d83f
      https://github.com/wesnoth/wesnoth/commit/f1c71a1eb781a2cdc113f28d9a0d1e0e61b0d83f
  Author: Chris Beck <beck.ct at gmail.com>
  Date:   2014-10-26 (Sun, 26 Oct 2014)

  Changed paths:
    M .travis.yml
    M CMakeLists.txt
    M SConstruct
    M src/filesystem.hpp
    M src/filesystem_boost.cpp
    M src/filesystem_common.cpp
    M src/font.cpp
    M src/image.cpp
    M src/savegame.cpp
    M src/sound.cpp

  Log Message:
  -----------
  Merge pull request #313 from cbeck88/backport_SDL_RW_ops

Backport sdl rw ops


Compare: https://github.com/wesnoth/wesnoth/compare/593528749988...f1c71a1eb781