diff options
| author | Johannes Schickel | 2015-01-25 18:41:57 +0100 |
|---|---|---|
| committer | Johannes Schickel | 2015-01-25 19:26:16 +0100 |
| commit | defe71792dfc0ab4bcb14a64a9fc8eab9a638e69 (patch) | |
| tree | dd77da4c0875a39b63842bb3bcaf3909ef36c775 | |
| parent | d97889cea719dd5a5d129ceed7ecc809cd290f51 (diff) | |
| download | scummvm-rg350-defe71792dfc0ab4bcb14a64a9fc8eab9a638e69.tar.gz scummvm-rg350-defe71792dfc0ab4bcb14a64a9fc8eab9a638e69.tar.bz2 scummvm-rg350-defe71792dfc0ab4bcb14a64a9fc8eab9a638e69.zip | |
CONFIGURE: Allow to overwrite sdl-config to use with SDL_CONFIG.
| -rw-r--r-- | Makefile | 1 | ||||
| -rwxr-xr-x | configure | 4 |
2 files changed, 4 insertions, 1 deletions
@@ -91,6 +91,7 @@ ifeq "$(findstring config.mk,$(MAKEFILE_LIST))" "config.mk" LDFLAGS="$(SAVED_LDFLAGS)" CXX="$(SAVED_CXX)" \ CXXFLAGS="$(SAVED_CXXFLAGS)" CPPFLAGS="$(SAVED_CPPFLAGS)" \ ASFLAGS="$(SAVED_ASFLAGS)" WINDRESFLAGS="$(SAVED_WINDRESFLAGS)" \ + SDL_CONFIG="$(SAVED_SDL_CONFIG)" \ $(srcdir)/configure $(SAVED_CONFIGFLAGS) else $(error You need to run $(srcdir)/configure before you can run make. Check $(srcdir)/configure --help for a list of parameters) @@ -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" @@ -170,7 +171,7 @@ _stagingpath="staging" _win32path="c:/scummvm" _amigaospath="Games:ScummVM" _staticlibpath= -_sdlconfig=sdl-config +_sdlconfig="$SDL_CONFIG" _freetypeconfig=freetype-config _sdlpath="$PATH" _freetypepath="$PATH" @@ -4581,6 +4582,7 @@ SAVED_CXXFLAGS := $SAVED_CXXFLAGS SAVED_CPPFLAGS := $SAVED_CPPFLAGS SAVED_ASFLAGS := $SAVED_ASFLAGS SAVED_WINDRESFLAGS := $SAVED_WINDRESFLAGS +SAVED_SDL_CONFIG := $SAVED_SDL_CONFIG EOF # |