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

Drop requiered SDL2 version to 2.0.2 on Linux and *BSD

Browse source 
This drops the required version to 2.0.2 on Linux and *BSD, as there are no known bugs that require us to have a later version on these platforms. Windows and Os X remains as 2.0.4.
This commit is contained in:
Andreas Löf 2016-01-17 09:28:18 +13:00
parent 4650202390
commit 9ed01599ee
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -61,7 +61,7 @@ option(ENABLE_LIBINTL "Enable using libintl for translations instead of Boost.Lo
option(ENABLE_HISTORY "Enable using GNU history for history in lua console" ON)
if(ENABLE_SDL2)
find_package(SDL2 2.0.4 REQUIRED)
find_package(SDL2 2.0.2 REQUIRED)
else(ENABLE_SDL2)
find_package(SDL 1.2.7 REQUIRED)
endif(ENABLE_SDL2)

2
INSTALL
View file

@ -26,7 +26,7 @@ order to build Wesnoth:
* Program Options >= 1.36.0
* System >= 1.36.0
* SDL2 libraries:
* SDL2 >= 2.0.4
* SDL2 >= 2.0.4 (>= 2.0.2 on GNU/Linux or *BSD)
* SDL2_image >= 2.0.0 (with PNG and JPEG support)
* SDL2_mixer >= 2.0.0 (with Ogg Vorbis support)
* SDL2_ttf >= 2.0.12

4
SConstruct
View file

@ -360,12 +360,12 @@ if env["prereqs"]:
if env['sdl2']:
def have_sdl_net():
return \
conf.CheckSDL(require_version = '2.0.4') & \
conf.CheckSDL(require_version = '2.0.2') & \
conf.CheckSDL("SDL2_net", header_file = "SDL_net")
def have_sdl_other():
return \
conf.CheckSDL(require_version = '2.0.4') & \
conf.CheckSDL(require_version = '2.0.2') & \
conf.CheckSDL("SDL2_ttf", header_file = "SDL_ttf") & \
conf.CheckSDL("SDL2_mixer", header_file = "SDL_mixer") & \
conf.CheckSDL("SDL2_image", header_file = "SDL_image")