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

svn-id: r44035

3 files changed, 22 insertions, 16 deletions

diff --git a/Makefile b/Makefile
index b9a37accbe..2ed634bdc5 100644
--- a/Makefile
+++ b/Makefile
@@ -68,8 +68,10 @@ 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)" \
-		$(srcdir)/configure $(SAVED_CONFIGFLAGS)
+	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)
 endif
diff --git a/configure b/configure
index 5e3e54a96f..115108d488 100755
--- a/configure
+++ b/configure
@@ -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"
@@ -640,13 +641,14 @@ Optional Libraries:
   --disable-readline       disable readline support in text console [autodetect]
 
 Some influential environment variables:
-  LDFLAGS   linker flags, e.g. -L<lib dir> if you have libraries in a
-            nonstandard directory <lib dir>
-  CXX       C++ compiler command
-  CXXFLAGS  C++ compiler flags
-  CPPFLAGS  C++ preprocessor flags, e.g. -I<include dir> if you have
-            headers in a nonstandard directory <include dir>
-  ASFLAGS   assembler flags
+  LDFLAGS        linker flags, e.g. -L<lib dir> if you have libraries in a
+                 nonstandard directory <lib dir>
+  CXX            C++ compiler command
+  CXXFLAGS       C++ compiler flags
+  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
@@ -2401,12 +2404,13 @@ LDFLAGS += $LDFLAGS
 
 $_mak_plugins
 
-SAVED_CONFIGFLAGS := $SAVED_CONFIGFLAGS
-SAVED_LDFLAGS     := $SAVED_LDFLAGS
-SAVED_CXX         := $SAVED_CXX
-SAVED_CXXFLAGS    := $SAVED_CXXFLAGS
-SAVED_CPPFLAGS    := $SAVED_CPPFLAGS
-SAVED_ASFLAGS     := $SAVED_ASFLAGS
+SAVED_CONFIGFLAGS  := $SAVED_CONFIGFLAGS
+SAVED_LDFLAGS      := $SAVED_LDFLAGS
+SAVED_CXX          := $SAVED_CXX
+SAVED_CXXFLAGS     := $SAVED_CXXFLAGS
+SAVED_CPPFLAGS     := $SAVED_CPPFLAGS
+SAVED_ASFLAGS      := $SAVED_ASFLAGS
+SAVED_WINDRESFLAGS := $SAVED_WINDRESFLAGS
 EOF
 
 #
diff --git a/ports.mk b/ports.mk
index 90141574df..ccac27251a 100644
--- a/ports.mk
+++ b/ports.mk
@@ -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)