thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

CONFIGURE: Allow to overwrite sdl-config to use with SDL_CONFIG.

Browse source
This commit is contained in:
Johannes Schickel 2015-01-25 18:41:57 +01:00
parent d97889cea7
commit defe71792d
2 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Makefile
View file

@ -91,6 +91,7 @@ ifeq "$(findstring config.mk,$(MAKEFILE_LIST))" "config.mk"
LDFLAGS="$(SAVED_LDFLAGS)" CXX="$(SAVED_CXX)" \ LDFLAGS="$(SAVED_LDFLAGS)" CXX="$(SAVED_CXX)" \
CXXFLAGS="$(SAVED_CXXFLAGS)" CPPFLAGS="$(SAVED_CPPFLAGS)" \ CXXFLAGS="$(SAVED_CXXFLAGS)" CPPFLAGS="$(SAVED_CPPFLAGS)" \
ASFLAGS="$(SAVED_ASFLAGS)" WINDRESFLAGS="$(SAVED_WINDRESFLAGS)" \ ASFLAGS="$(SAVED_ASFLAGS)" WINDRESFLAGS="$(SAVED_WINDRESFLAGS)" \
SDL_CONFIG="$(SAVED_SDL_CONFIG)" \
$(srcdir)/configure $(SAVED_CONFIGFLAGS) $(srcdir)/configure $(SAVED_CONFIGFLAGS)
else else
$(error You need to run $(srcdir)/configure before you can run make. Check $(srcdir)/configure --help for a list of parameters) $(error You need to run $(srcdir)/configure before you can run make. Check $(srcdir)/configure --help for a list of parameters)

4
configure vendored
View file

@ -35,6 +35,7 @@ SAVED_CXXFLAGS=$CXXFLAGS
SAVED_CPPFLAGS=$CPPFLAGS SAVED_CPPFLAGS=$CPPFLAGS
SAVED_ASFLAGS=$ASFLAGS SAVED_ASFLAGS=$ASFLAGS
SAVED_WINDRESFLAGS=$WINDRESFLAGS SAVED_WINDRESFLAGS=$WINDRESFLAGS
SAVED_SDL_CONFIG=$SDL_CONFIG
# Use environment vars if set # Use environment vars if set
CXXFLAGS="$CXXFLAGS $CPPFLAGS" CXXFLAGS="$CXXFLAGS $CPPFLAGS"
@ -170,7 +171,7 @@ _stagingpath="staging"
_win32path="c:/scummvm" _win32path="c:/scummvm"
_amigaospath="Games:ScummVM" _amigaospath="Games:ScummVM"
_staticlibpath= _staticlibpath=
_sdlconfig=sdl-config _sdlconfig="$SDL_CONFIG"
_freetypeconfig=freetype-config _freetypeconfig=freetype-config
_sdlpath="$PATH" _sdlpath="$PATH"
_freetypepath="$PATH" _freetypepath="$PATH"
@ -4581,6 +4582,7 @@ SAVED_CXXFLAGS := $SAVED_CXXFLAGS
SAVED_CPPFLAGS := $SAVED_CPPFLAGS SAVED_CPPFLAGS := $SAVED_CPPFLAGS
SAVED_ASFLAGS := $SAVED_ASFLAGS SAVED_ASFLAGS := $SAVED_ASFLAGS
SAVED_WINDRESFLAGS := $SAVED_WINDRESFLAGS SAVED_WINDRESFLAGS := $SAVED_WINDRESFLAGS
SAVED_SDL_CONFIG := $SAVED_SDL_CONFIG
EOF EOF
# #