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

Added support for WINDRESFLAGS, required for e.g. multilib enabled MinGW toolchains

Browse source 
svn-id: r44035
This commit is contained in:
Andre Heider 2009-09-11 18:13:27 +00:00
parent 68ae279aff
commit 9f7c0a24e2
3 changed files with 22 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Makefile
View file

@ -68,7 +68,9 @@ config.h config.mk: $(srcdir)/configure
ifeq "$(findstring config.mk,$(MAKEFILE_LIST))" "config.mk"
@echo "Running $(srcdir)/configure with the last specified parameters"
@sleep 2
LDFLAGS="$(SAVED_LDFLAGS)" CXX="$(SAVED_CXX)" CXXFLAGS="$(SAVED_CXXFLAGS)" CPPFLAGS="$(SAVED_CPPFLAGS)" ASFLAGS="$(SAVED_ASFLAGS)" \
LDFLAGS="$(SAVED_LDFLAGS)" CXX="$(SAVED_CXX)" \
CXXFLAGS="$(SAVED_CXXFLAGS)" CPPFLAGS="$(SAVED_CPPFLAGS)" \
ASFLAGS="$(SAVED_ASFLAGS)" WINDRESFLAGS="$(SAVED_WINDRESFLAGS)" \
$(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)

4
configure vendored
View file

@ -30,6 +30,7 @@ SAVED_CXX=$CXX
SAVED_CXXFLAGS=$CXXFLAGS
SAVED_CPPFLAGS=$CPPFLAGS
SAVED_ASFLAGS=$ASFLAGS
SAVED_WINDRESFLAGS=$WINDRESFLAGS
# Use environment vars if set
CXXFLAGS="$CXXFLAGS $CPPFLAGS"
@ -647,6 +648,7 @@ Some influential environment variables:
CPPFLAGS C++ preprocessor flags, e.g. -I<include dir> if you have
headers in a nonstandard directory <include dir>
ASFLAGS assembler flags
WINDRESFLAGS Windows resource compiler flags
EOF
exit 0
@ -2375,6 +2377,7 @@ AR := $_ar
AS := $_as
ASFLAGS := $ASFLAGS
WINDRES := $_windres
WINDRESFLAGS := $WINDRESFLAGS
WIN32PATH=$_win32path
AOS4PATH=$_aos4path
STATICLIBPATH=$_staticlibpath
@ -2407,6 +2410,7 @@ SAVED_CXX := $SAVED_CXX
SAVED_CXXFLAGS := $SAVED_CXXFLAGS
SAVED_CPPFLAGS := $SAVED_CPPFLAGS
SAVED_ASFLAGS := $SAVED_ASFLAGS
SAVED_WINDRESFLAGS := $SAVED_WINDRESFLAGS
EOF
#

2
ports.mk
View file

@ -146,7 +146,7 @@ osxsnap: bundle
#
scummvmico.o: $(srcdir)/icons/scummvm.ico
$(WINDRES) -I$(srcdir) $(srcdir)/dists/scummvm.rc scummvmico.o
$(WINDRES) $(WINDRESFLAGS) -I$(srcdir) $(srcdir)/dists/scummvm.rc scummvmico.o
# Special target to create a win32 snapshot binary
win32dist: $(EXECUTABLE)