iqbalrifai
/
Aegisub
mirror of https://github.com/odrling/Aegisub
1
0
Fork 0
Code Issues Releases Wiki Activity

autoconfify convert 

Originally committed to SVN as r371.
This commit is contained in:
David Lamparter 2006-05-06 12:59:09 +00:00
parent 4001dc5eff
commit 75704bc980
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
configure.ac
View File

@ -43,6 +43,11 @@ AC_PROG_CC
AC_PROG_CXX AC_PROG_CXX
AC_PROG_RANLIB AC_PROG_RANLIB
AC_PATH_PROGS(CONVERT, [convert], [])
if test -z "$CONVERT"
then AC_MSG_FAILURE([aegisub needs convert (from ImageMagick) to produce xpms from the supplied bitmaps/icons])
fi
AC_C_FLAG([-pthread]) AC_C_FLAG([-pthread])
AC_CXX_FLAG([-pthread]) AC_CXX_FLAG([-pthread])
AC_CHECK_LIB([pthread], [pthread_join]) AC_CHECK_LIB([pthread], [pthread_join])

2
core/bitmaps/Makefile.am
View File

@ -9,6 +9,6 @@ Makefile.bitmaps: $(srcdir)/genxpm.sh $(srcdir)/../res.rc
all: all-bitmaps all: all-bitmaps
all-bitmaps: Makefile.bitmaps all-bitmaps: Makefile.bitmaps
make -f Makefile.bitmaps all make -f Makefile.bitmaps CONVERT=$(CONVERT) all

4
core/bitmaps/genxpm.sh
View File

@ -13,7 +13,7 @@ all: bmp2xpm wxicon_xpm.xpm
srcdir=${SRCDIR} srcdir=${SRCDIR}
wxicon_xpm.xpm: \$(srcdir)/icon.ico wxicon_xpm.xpm: \$(srcdir)/icon.ico
convert \$(srcdir)/'icon.ico[2]' wxicon_xpm.xpm \$(CONVERT) \$(srcdir)/'icon.ico[2]' wxicon_xpm.xpm
EOF EOF
@ -23,7 +23,7 @@ for I in *.bmp
do do
DNAME="`grep "bitmaps/$I" $RESFILE | cut -d ' ' -f 1`" DNAME="`grep "bitmaps/$I" $RESFILE | cut -d ' ' -f 1`"
echo -e "${DNAME}_xpm.xpm: \$(srcdir)/$I echo -e "${DNAME}_xpm.xpm: \$(srcdir)/$I
\tconvert -transparent \\#c0c0c0 \$(srcdir)/$I ${DNAME}_xpm.xpm \t\$(CONVERT) -transparent \\#c0c0c0 \$(srcdir)/$I ${DNAME}_xpm.xpm
" "
XPMNAMES="${XPMNAMES} ${DNAME}_xpm.xpm" XPMNAMES="${XPMNAMES} ${DNAME}_xpm.xpm"
done done