[MPlayer-cvslog] r25534 - in trunk: configure osdep/Makefile vidix/dhahelperwin/Makefile

[diego]

Author: diego
Date: Fri Dec 28 11:33:22 2007
New Revision: 25534

Log:
Make windres binary name configurable, useful for cross-compiling.
patch by sheba, sheba469 yahoo com


Modified:
   trunk/configure
   trunk/osdep/Makefile
   trunk/vidix/dhahelperwin/Makefile

Modified: trunk/configure
==============================================================================
--- trunk/configure	(original)
+++ trunk/configure	Fri Dec 28 11:33:22 2007
@@ -400,6 +400,7 @@ Miscellaneous options:
   --as=ASSEMBLER         assembler to build MPlayer [as]
   --ar=AR                librarian to build MPlayer [ar]
   --ranlib=RANLIB        ranlib to build MPlayer [ranlib]
+  --windres=WINDRES      windres to build MPlayer [windres]
   --target=PLATFORM      target platform (i386-linux, arm-linux, etc)
   --enable-static        build a statically linked binary
   --charset=charset      convert the console messages to this character set
@@ -478,6 +479,7 @@ _mtrr=auto
 _altivec=auto
 _install=install
 _ranlib=ranlib
+_windres=windres
 _ldconfig=ldconfig
 _cc=cc
 _ar=ar
@@ -770,6 +772,9 @@ for ac_option do
   --ranlib=*)
     _ranlib=`echo $ac_option | cut -d '=' -f 2`
     ;;
+  --windres=*)
+    _windres=`echo $ac_option | cut -d '=' -f 2`
+    ;;
   --charset=*)
     _charset=`echo $ac_option | cut -d '=' -f 2`
     ;;
@@ -7597,6 +7602,7 @@ CC = $_cc
 CXX = $_cc
 HOST_CC = $_host_cc
 RANLIB = $_ranlib
+WINDRES = $_windres
 LDCONFIG = $_ldconfig
 INSTALL = $_install
 EXTRA_INC = $_inc_extra

Modified: trunk/osdep/Makefile
==============================================================================
--- trunk/osdep/Makefile	(original)
+++ trunk/osdep/Makefile	Fri Dec 28 11:33:22 2007
@@ -30,4 +30,4 @@ SRCS_COMMON += $(getch)
 include ../mpcommon.mak
 
 mplayer-rc.o: mplayer.rc
-	windres -o $@ $<
+	$(WINDRES) -o $@ $<

Modified: trunk/vidix/dhahelperwin/Makefile
==============================================================================
--- trunk/vidix/dhahelperwin/Makefile	(original)
+++ trunk/vidix/dhahelperwin/Makefile	Fri Dec 28 11:33:22 2007
@@ -9,7 +9,7 @@ dhahelper.o: dhahelper.c dhahelper.h
 	$(CC) -Wall -Os -c $< -o $@
 
 dhahelper-rc.o: dhahelper.rc common.ver ntverp.h
-	windres -I. $< $@
+	$(WINDRES) -I. $< $@
 
 base.tmp: dhahelper.o dhahelper-rc.o
 	$(CC)   -Wl,--base-file,$@ \