Commit 19bc5804 authored by Maurice van der Pot's avatar Maurice van der Pot Committed by Maurice van der Pot

Fix makefile for Windows to work with both libpng <= 1.2.8, where the dll

2008-07-29  Maurice van der Pot  <griffon26@kfk4ever.com>

	* Makefile.win32: Fix makefile for Windows to work with both libpng <=
	1.2.8, where the dll was named libpng13.dll, and libpng >= 1.2.29, where it
	is named libpng12-0.dll.


svn path=/trunk/; revision=928
parent f91d2f75
2008-07-29 Maurice van der Pot <griffon26@kfk4ever.com>
* Makefile.win32: Fix makefile for Windows to work with both libpng <=
1.2.8, where the dll was named libpng13.dll, and libpng >= 1.2.29, where it
is named libpng12-0.dll.
2008-07-29 Maurice van der Pot <griffon26@kfk4ever.com>
* Makefile.win32: Added font description files needed for printing on
......
......@@ -153,7 +153,6 @@ GTK_BINFILES = \
libpangocairo-1.0-0.dll \
libpangoft2-1.0-0.dll \
libpangowin32-1.0-0.dll \
libpng13.dll \
libxml2.dll \
libxslt.dll \
zlib1.dll
......@@ -179,8 +178,17 @@ GTK_ICONFILES = \
createinstaller:
DESTDIR=$$(pwd)/$(INSTALLERTMP) $(MAKE) -f Makefile.win32 install
@LOADERSPATH=`grep "loaders/libpixbufloader" $(PREFIX)/etc/gtk-2.0/gdk-pixbuf.loaders|head -n1|sed -e 's#.*/\(lib/gtk-2.0/[^/]*/loaders\)/.*#\1#'`; \
GTK_TRANSLATIONS=`echo $(INSTALLERTMP)/planner/share/locale/*|sed -e "s#$(INSTALLERTMP)/planner##g"`; \
@LOADERSPATH=`grep "loaders/libpixbufloader" $(PREFIX)/etc/gtk-2.0/gdk-pixbuf.loaders | \
head -n1 | \
sed -e 's#.*/\(lib/gtk-2.0/[^/]*/loaders\)/.*#\1#'`; \
case `grep libpng $(PREFIX)/lib/pkgconfig/cairo.pc | \
sed -e 's/.*\(libpng[0-9]*\).*/\1/'` in \
libpng12) LIBPNG=/bin/libpng12-0.dll ;; \
libpng13) LIBPNG=/bin/libpng13.dll ;; \
*) echo "Unable to find libpng"; exit -1 ;; \
esac; \
GTK_TRANSLATIONS=`echo $(INSTALLERTMP)/planner/share/locale/* | \
sed -e "s#$(INSTALLERTMP)/planner##g"`; \
GTK_FILES="/etc/gtk-2.0/gdk-pixbuf.loaders \
$${LOADERSPATH} \
/etc/gtk-2.0/gtkrc \
......@@ -189,6 +197,7 @@ createinstaller:
/share/libgnomeprint \
/share/libgnomeprintui \
$(addprefix /bin/,$(GTK_BINFILES)) \
$${LIBPNG} \
$(addprefix /share/icons/gnome/,$(GTK_ICONFILES)) \
$${GTK_TRANSLATIONS}"; \
mkdir -p $(INSTALLERTMP)/planner; \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment