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

Remove the scons workaround for Travis only having SDL 2.0.2

Browse source
This commit is contained in:
pentarctagon 2017-12-03 15:34:22 -06:00 • committed by Charles Dang
parent dcfdcfd986
commit 817e9dbb33
1 changed files with 1 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
SConstruct
View file

@ -176,11 +176,6 @@ if env['distcc']:
if env['ccache']: env.Tool('ccache')
if 'TRAVIS' in os.environ:
SDL2_version = '2.0.2'
else:
SDL2_version = '2.0.4'
boost_version = '1.50.0'
@ -356,7 +351,7 @@ if env["prereqs"]:
def have_sdl_other():
return \
conf.CheckSDL(require_version = SDL2_version) & \
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")