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

Update build requirements to SDL 2.0.4

Browse source
This commit is contained in:
Andreas Löf 2016-01-17 08:26:14 +13:00
parent c699c23e86
commit 4650202390
2 changed files with 3 additions and 3 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.0 REQUIRED)
find_package(SDL2 2.0.4 REQUIRED)
else(ENABLE_SDL2)
find_package(SDL 1.2.7 REQUIRED)
endif(ENABLE_SDL2)

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.0') & \
conf.CheckSDL(require_version = '2.0.4') & \
conf.CheckSDL("SDL2_net", header_file = "SDL_net")
def have_sdl_other():
return \
conf.CheckSDL(require_version = '2.0.0') & \
conf.CheckSDL(require_version = '2.0.4') & \
conf.CheckSDL("SDL2_ttf", header_file = "SDL_ttf") & \
conf.CheckSDL("SDL2_mixer", header_file = "SDL_mixer") & \
conf.CheckSDL("SDL2_image", header_file = "SDL_image")