Set convert to BIN_CONVERT in Makefile.bitmaps.
Originally committed to SVN as r2531.
This commit is contained in:
parent
b7e5b367d2
commit
9f8c45bf65
2 changed files with 3 additions and 3 deletions
|
@ -273,7 +273,7 @@ touch ${srcdir}/aegisub/posix/config.h
|
|||
|
||||
echo "--- Converting BMP resource files -> XPM ---"
|
||||
# BMP -> XPM via src/res.rc
|
||||
cat ${srcdir}/aegisub/res.rc | ${BIN_AWK} -f ${srcdir}/scripts/genxpm.awk > ${srcdir}/aegisub/bitmaps/Makefile.bitmaps
|
||||
cat ${srcdir}/aegisub/res.rc | ${BIN_AWK} -f ${srcdir}/scripts/genxpm.awk BIN_CONVERT="$BIN_CONVERT" > ${srcdir}/aegisub/bitmaps/Makefile.bitmaps
|
||||
cd ${srcdir}/aegisub/bitmaps
|
||||
make -f Makefile.bitmaps
|
||||
cd ${srcdir}
|
||||
|
|
|
@ -8,8 +8,8 @@ END {
|
|||
printf(" \
|
||||
all: bmp2xpm wxicon_xpm.xpm \n \
|
||||
.PHONY: all bmp2xpm \n \
|
||||
CONVERT ?= convert \n \
|
||||
")
|
||||
CONVERT ?= %s \n \
|
||||
", BIN_CONVERT)
|
||||
|
||||
printf("wxicon_xpm.xpm: icon.ico\n $(CONVERT) 'icon.ico[2]' wxicon_xpm.xpm\n");
|
||||
|
||||
|
|
Loading…
Reference in a new issue