[Scummvm-cvs-logs] SF.net SVN: scummvm:[44035] scummvm/trunk

[dhewg at users.sourceforge.net]

Revision: 44035
          http://scummvm.svn.sourceforge.net/scummvm/?rev=44035&view=rev
Author:   dhewg
Date:     2009-09-11 18:13:27 +0000 (Fri, 11 Sep 2009)

Log Message:
-----------
Added support for WINDRESFLAGS, required for e.g. multilib enabled MinGW toolchains

Modified Paths:
--------------
    scummvm/trunk/Makefile
    scummvm/trunk/configure
    scummvm/trunk/ports.mk

Modified: scummvm/trunk/Makefile
===================================================================
--- scummvm/trunk/Makefile	2009-09-11 17:38:36 UTC (rev 44034)
+++ scummvm/trunk/Makefile	2009-09-11 18:13:27 UTC (rev 44035)
@@ -68,8 +68,10 @@
 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

Modified: scummvm/trunk/configure
===================================================================
--- scummvm/trunk/configure	2009-09-11 17:38:36 UTC (rev 44034)
+++ scummvm/trunk/configure	2009-09-11 18:13:27 UTC (rev 44035)
@@ -30,6 +30,7 @@
 SAVED_CXXFLAGS=$CXXFLAGS
 SAVED_CPPFLAGS=$CPPFLAGS
 SAVED_ASFLAGS=$ASFLAGS
+SAVED_WINDRESFLAGS=$WINDRESFLAGS
 
 # Use environment vars if set
 CXXFLAGS="$CXXFLAGS $CPPFLAGS"
@@ -640,13 +641,14 @@
   --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 @@
 AS := $_as
 ASFLAGS := $ASFLAGS
 WINDRES := $_windres
+WINDRESFLAGS := $WINDRESFLAGS
 WIN32PATH=$_win32path
 AOS4PATH=$_aos4path
 STATICLIBPATH=$_staticlibpath
@@ -2401,12 +2404,13 @@
 
 $_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
 
 #

Modified: scummvm/trunk/ports.mk
===================================================================
--- scummvm/trunk/ports.mk	2009-09-11 17:38:36 UTC (rev 44034)
+++ scummvm/trunk/ports.mk	2009-09-11 18:13:27 UTC (rev 44035)
@@ -146,7 +146,7 @@
 #
 
 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)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.