upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-03 12:59:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #828 from GregoryLundberg/GL_Require_SDL-2.0.4

Browse Source 
Require SDL2 2.0.4 on all target platforms.
This commit is contained in:
Charles Dang 2016-10-16 16:58:58 +11:00 committed by GitHub
commit ae18397608
2 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -58,11 +58,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(UNIX AND NOT APPLE AND NOT CYGWIN)
find_package(SDL2 2.0.2 REQUIRED)
else (UNIX AND NOT APPLE AND NOT CYGWIN)
find_package(SDL2 2.0.4 REQUIRED)
endif (UNIX AND NOT APPLE AND NOT CYGWIN)
find_package(SDL2 2.0.4 REQUIRED)
find_package(Boost 1.36 REQUIRED COMPONENTS iostreams program_options regex system thread)
find_package(Boost 1.40 REQUIRED COMPONENTS random)

6
SConstruct
View File

@ -178,11 +178,7 @@ if env['distcc']:
if env['ccache']: env.Tool('ccache')
SDL2_version = '';
if env["PLATFORM"] is "win32" or env["PLATFORM"] is "cygwin" or env["PLATFORM"] is "darwin":
SDL2_version = '2.0.4';
else:
SDL2_version = '2.0.2';
SDL2_version = '2.0.4';
Help("""Arguments may be a mixture of switches and targets in any order.