Mercurial > mplayer.hg
changeset 25506:a5dd78186fdc
Make windres binary name configurable, useful for cross-compiling.
patch by sheba, sheba469 yahoo com
| author | diego |
|---|---|
| date | Fri, 28 Dec 2007 10:33:22 +0000 |
| parents | 8d329f7bbc3c |
| children | 8dfe02cab924 |
| files | configure osdep/Makefile vidix/dhahelperwin/Makefile |
| diffstat | 3 files changed, 8 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/configure Fri Dec 28 03:45:01 2007 +0000 +++ b/configure Fri Dec 28 10:33:22 2007 +0000 @@ -400,6 +400,7 @@ --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 @@ _altivec=auto _install=install _ranlib=ranlib +_windres=windres _ldconfig=ldconfig _cc=cc _ar=ar @@ -770,6 +772,9 @@ --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 @@ CXX = $_cc HOST_CC = $_host_cc RANLIB = $_ranlib +WINDRES = $_windres LDCONFIG = $_ldconfig INSTALL = $_install EXTRA_INC = $_inc_extra
--- a/osdep/Makefile Fri Dec 28 03:45:01 2007 +0000 +++ b/osdep/Makefile Fri Dec 28 10:33:22 2007 +0000 @@ -30,4 +30,4 @@ include ../mpcommon.mak mplayer-rc.o: mplayer.rc - windres -o $@ $< + $(WINDRES) -o $@ $<
--- a/vidix/dhahelperwin/Makefile Fri Dec 28 03:45:01 2007 +0000 +++ b/vidix/dhahelperwin/Makefile Fri Dec 28 10:33:22 2007 +0000 @@ -9,7 +9,7 @@ $(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,$@ \