[Commits] [wesnoth/wesnoth] 972ae8: fixup preprocessor symbols controlling SDL MIXER m...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/wesnoth/wesnoth
  Commit: 972ae8d78a318e1dece92bf57a4d77672373c60a
      https://github.com/wesnoth/wesnoth/commit/972ae8d78a318e1dece92bf57a4d77672373c60a
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-10-30 (Thu, 30 Oct 2014)

  Changed paths:
    M src/sound.cpp

  Log Message:
  -----------
  fixup preprocessor symbols controlling SDL MIXER min version

Previously, the code that requires SDL_mixer v 1.2.12 was guarded
by #ifdef PANDORA, since this was the only platform intended to
use this. However, it turns out that OS X < 10.5 has a hard time
getting this library as well.

Instead of branching by platform, here we just check the version
defind by the SDL_mixer header, and include the code appropriate.

We rely on the scons / cmake / project file to fail any build which
should be done with the recent version.


  Commit: 774cafc2be26855db43649ba0c9decc2739508a4
      https://github.com/wesnoth/wesnoth/commit/774cafc2be26855db43649ba0c9decc2739508a4
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-10-30 (Thu, 30 Oct 2014)

  Changed paths:
    M src/game_data.hpp

  Log Message:
  -----------
  Merge branch 'master' of https://github.com/wesnoth/wesnoth


Compare: https://github.com/wesnoth/wesnoth/compare/2d8807357a5a...774cafc2be26