Make SDL2 the default in cmake and scons

This changes the default settings in the cmake and scons to make all
targets be compiled with SDL2 as opposed to SDL1.
This commit is contained in:
Andreas Löf 2015-09-15 20:45:27 +12:00
parent 8a86b547ce
commit e8c3e99dad
2 changed files with 2 additions and 2 deletions

View File

@ -49,7 +49,7 @@ option(ENABLE_CAMPAIGN_SERVER "Enable compilation of campaign server")
option(ENABLE_SERVER "Enable compilation of server" ON)
option(ENABLE_TOOLS "Enable building and installation of tools for artists and WML maintainers")
option(ENABLE_SDL2_TOOLS "Enable building and installation of tools for testing with SDL2" OFF)
option(ENABLE_SDL2 "Enable building the game with SDL2" OFF)
option(ENABLE_SDL2 "Enable building the game with SDL2" ON)
option(ENABLE_TESTS "Build unit tests")
option(ENABLE_NLS "Enable building of translations" ON)
option(ENABLE_LOW_MEM "Reduce memory usage by removing extra functionality" OFF)

View File

@ -107,7 +107,7 @@ opts.AddVariables(
BoolVariable("lockfile", "Create a lockfile to prevent multiple instances of scons from being run at the same time on this working copy.", False),
BoolVariable("OS_ENV", "Forward the entire OS environment to scons", False),
BoolVariable("history", "Clear to disable GNU history support in lua console", True),
BoolVariable("sdl2", "Build with SDL2 support (experimental!)", False)
BoolVariable("sdl2", "Build with SDL2 support (experimental!)", True)
)
#