mirror of https://github.com/mpv-player/mpv
Make windres binary name configurable, useful for cross-compiling.
patch by sheba, sheba469 yahoo com git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25534 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
1fbd5fb5f4
commit
a9d779578d
|
@ -400,6 +400,7 @@ Miscellaneous options:
|
||||||
--as=ASSEMBLER assembler to build MPlayer [as]
|
--as=ASSEMBLER assembler to build MPlayer [as]
|
||||||
--ar=AR librarian to build MPlayer [ar]
|
--ar=AR librarian to build MPlayer [ar]
|
||||||
--ranlib=RANLIB ranlib to build MPlayer [ranlib]
|
--ranlib=RANLIB ranlib to build MPlayer [ranlib]
|
||||||
|
--windres=WINDRES windres to build MPlayer [windres]
|
||||||
--target=PLATFORM target platform (i386-linux, arm-linux, etc)
|
--target=PLATFORM target platform (i386-linux, arm-linux, etc)
|
||||||
--enable-static build a statically linked binary
|
--enable-static build a statically linked binary
|
||||||
--charset=charset convert the console messages to this character set
|
--charset=charset convert the console messages to this character set
|
||||||
|
@ -478,6 +479,7 @@ _mtrr=auto
|
||||||
_altivec=auto
|
_altivec=auto
|
||||||
_install=install
|
_install=install
|
||||||
_ranlib=ranlib
|
_ranlib=ranlib
|
||||||
|
_windres=windres
|
||||||
_ldconfig=ldconfig
|
_ldconfig=ldconfig
|
||||||
_cc=cc
|
_cc=cc
|
||||||
_ar=ar
|
_ar=ar
|
||||||
|
@ -770,6 +772,9 @@ for ac_option do
|
||||||
--ranlib=*)
|
--ranlib=*)
|
||||||
_ranlib=`echo $ac_option | cut -d '=' -f 2`
|
_ranlib=`echo $ac_option | cut -d '=' -f 2`
|
||||||
;;
|
;;
|
||||||
|
--windres=*)
|
||||||
|
_windres=`echo $ac_option | cut -d '=' -f 2`
|
||||||
|
;;
|
||||||
--charset=*)
|
--charset=*)
|
||||||
_charset=`echo $ac_option | cut -d '=' -f 2`
|
_charset=`echo $ac_option | cut -d '=' -f 2`
|
||||||
;;
|
;;
|
||||||
|
@ -7597,6 +7602,7 @@ CC = $_cc
|
||||||
CXX = $_cc
|
CXX = $_cc
|
||||||
HOST_CC = $_host_cc
|
HOST_CC = $_host_cc
|
||||||
RANLIB = $_ranlib
|
RANLIB = $_ranlib
|
||||||
|
WINDRES = $_windres
|
||||||
LDCONFIG = $_ldconfig
|
LDCONFIG = $_ldconfig
|
||||||
INSTALL = $_install
|
INSTALL = $_install
|
||||||
EXTRA_INC = $_inc_extra
|
EXTRA_INC = $_inc_extra
|
||||||
|
|
|
@ -30,4 +30,4 @@ SRCS_COMMON += $(getch)
|
||||||
include ../mpcommon.mak
|
include ../mpcommon.mak
|
||||||
|
|
||||||
mplayer-rc.o: mplayer.rc
|
mplayer-rc.o: mplayer.rc
|
||||||
windres -o $@ $<
|
$(WINDRES) -o $@ $<
|
||||||
|
|
|
@ -9,7 +9,7 @@ dhahelper.o: dhahelper.c dhahelper.h
|
||||||
$(CC) -Wall -Os -c $< -o $@
|
$(CC) -Wall -Os -c $< -o $@
|
||||||
|
|
||||||
dhahelper-rc.o: dhahelper.rc common.ver ntverp.h
|
dhahelper-rc.o: dhahelper.rc common.ver ntverp.h
|
||||||
windres -I. $< $@
|
$(WINDRES) -I. $< $@
|
||||||
|
|
||||||
base.tmp: dhahelper.o dhahelper-rc.o
|
base.tmp: dhahelper.o dhahelper-rc.o
|
||||||
$(CC) -Wl,--base-file,$@ \
|
$(CC) -Wl,--base-file,$@ \
|
||||||
|
|
Loading…
Reference in New Issue