0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #348 from techtonik/sdl1215

Browse source 
Require SDL 1.2.15, which has important bug fix for Wesnoth
This commit is contained in:
Chris Beck 2014-12-30 20:18:53 -05:00
commit bcc5be9f50
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
INSTALL
View file

@ -21,7 +21,7 @@ You'll need to have these libraries and their development headers to build Wesno
boost_system >= 1.36.0
libfontconfig >= 2.4.1
libpango (with cairo backend) >= 1.21.3
libsdl >= 1.2.7
libsdl >= 1.2.10
libsdl-image >= 1.2 (with png and jpg support)
libsdl-mixer >= 1.2.12 (with Vorbis support)
vorbisfile
@ -30,10 +30,12 @@ You'll need to have these libraries and their development headers to build Wesno
libz
libbz2
Note that problems with SDL 1.2.14 have been reported, thus we advise you to use SDL
1.2.13 for now.
Note that although differring boost requirements are displayed, boost libs
from different releases are in general incompatible and you should not mix
and match.
(Note also that although differring boost requirements are displayed, boost libs from different releases are in general incompatible and you should not mix and match.)
Also note that SDL 1.2.14 is known to have problems on Windows, so we advise
you to use SDL 1.2.15.
These libraries are optional dependencies that enable additional features:

4
SConstruct
View file

@ -360,12 +360,12 @@ if env["prereqs"]:
else:
def have_sdl_net():
return \
conf.CheckSDL(require_version = '1.2.0') & \
conf.CheckSDL(require_version = '1.2.10') & \
conf.CheckSDL('SDL_net')
def have_sdl_other():
return \
conf.CheckSDL(require_version = '1.2.0') & \
conf.CheckSDL(require_version = '1.2.10') & \
conf.CheckSDL("SDL_ttf", require_version = "2.0.8") & \
conf.CheckSDL("SDL_mixer", require_version = '1.2.12') & \
conf.CheckSDL("SDL_image", require_version = '1.2.0')