diff options
| author | Johannes Schickel | 2015-03-05 01:10:34 +0100 |
|---|---|---|
| committer | Johannes Schickel | 2015-03-05 01:10:34 +0100 |
| commit | 4d13d44f8a2db8f887e285dbcbd3bb75ccc0ae2e (patch) | |
| tree | 9fd0cb9d8b0965a2c823e690f7d467c9ff3c5aea /configure | |
| parent | cecb9a9ecc1ec1897fdd27e1bafc7f6d494cd6af (diff) | |
| parent | b5ac3ecb1f25b2d47fd99a3c4fd3b1cddcb695c6 (diff) | |
| download | scummvm-rg350-4d13d44f8a2db8f887e285dbcbd3bb75ccc0ae2e.tar.gz scummvm-rg350-4d13d44f8a2db8f887e285dbcbd3bb75ccc0ae2e.tar.bz2 scummvm-rg350-4d13d44f8a2db8f887e285dbcbd3bb75ccc0ae2e.zip | |
Merge pull request #572 from lordhoto/sdl2-support
SDL: Add experimental support for SDL2
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 7 |
1 files changed, 6 insertions, 1 deletions
@@ -35,6 +35,7 @@ SAVED_CXXFLAGS=$CXXFLAGS SAVED_CPPFLAGS=$CPPFLAGS SAVED_ASFLAGS=$ASFLAGS SAVED_WINDRESFLAGS=$WINDRESFLAGS +SAVED_SDL_CONFIG=$SDL_CONFIG # Use environment vars if set CXXFLAGS="$CXXFLAGS $CPPFLAGS" @@ -353,7 +354,7 @@ define_in_config_if_yes() { # TODO: small bit of code to test sdl usability find_sdlconfig() { echo_n "Looking for sdl-config... " - sdlconfigs="$_sdlconfig:sdl-config:sdl11-config:sdl12-config" + sdlconfigs="$SDL_CONFIG:$_sdlconfig:sdl-config:sdl11-config:sdl12-config" _sdlconfig= IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="$SEPARATOR" @@ -3069,6 +3070,9 @@ case $_backend in 1.3.*) add_line_to_config_mk "USE_SDL13 = 1" ;; + 2.0.*) + add_line_to_config_mk "USE_SDL2 = 1" + ;; *) ;; esac @@ -4581,6 +4585,7 @@ SAVED_CXXFLAGS := $SAVED_CXXFLAGS SAVED_CPPFLAGS := $SAVED_CPPFLAGS SAVED_ASFLAGS := $SAVED_ASFLAGS SAVED_WINDRESFLAGS := $SAVED_WINDRESFLAGS +SAVED_SDL_CONFIG := $SAVED_SDL_CONFIG EOF # |