diff options
| -rwxr-xr-x | configure | 6 | ||||
| -rw-r--r-- | osdep/Makefile | 2 | ||||
| -rw-r--r-- | vidix/dhahelperwin/Makefile | 2 |
3 files changed, 8 insertions, 2 deletions
@@ -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 diff --git a/osdep/Makefile b/osdep/Makefile index d2af3b8e61..3f22bcacad 100644 --- a/osdep/Makefile +++ b/osdep/Makefile @@ -30,4 +30,4 @@ SRCS_COMMON += $(getch) include ../mpcommon.mak mplayer-rc.o: mplayer.rc - windres -o $@ $< + $(WINDRES) -o $@ $< diff --git a/vidix/dhahelperwin/Makefile b/vidix/dhahelperwin/Makefile index d0965b7faf..d6f8f94408 100644 --- a/vidix/dhahelperwin/Makefile +++ b/vidix/dhahelperwin/Makefile @@ -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,$@ \ |