summaryrefslogtreecommitdiffstats
path: root/gdk-pixbuf
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2012-04-12 16:05:31 +0100
committerCaolán McNamara <caolanm@redhat.com>2012-04-13 13:15:25 +0100
commit452af5f4522e750627d0c0ac9fbc794aeb1f1f8f (patch)
tree950d062f9e183873d64b06e212568a3b0968bb58 /gdk-pixbuf
parentWaE: declaration of 'rand' shadows a global declaration (diff)
downloadcore-452af5f4522e750627d0c0ac9fbc794aeb1f1f8f.tar.gz
core-452af5f4522e750627d0c0ac9fbc794aeb1f1f8f.zip
gbuildize internal zlib
and stick headers into the solver in the same hierarchy as is "standard" so we don't have to patch so much, similiarly rename to libz
Diffstat (limited to 'gdk-pixbuf')
-rw-r--r--gdk-pixbuf/gdk-pixbuf-2.23.0-win32.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/gdk-pixbuf/gdk-pixbuf-2.23.0-win32.patch b/gdk-pixbuf/gdk-pixbuf-2.23.0-win32.patch
index 142ea346f2d0..37a3d0884c5e 100644
--- a/gdk-pixbuf/gdk-pixbuf-2.23.0-win32.patch
+++ b/gdk-pixbuf/gdk-pixbuf-2.23.0-win32.patch
@@ -208,7 +208,7 @@
+GLIB_LIB = $(OUTDIR)\lib\glib-2.0.lib $(OUTDIR)\lib\gobject-2.0.lib $(OUTDIR)\lib\gmodule-2.0.lib $(OUTDIR)\lib\gio-2.0.lib $(OUTDIR)\lib\gthread-2.0.lib
+LIBJPEG_LIB = $(OUTDIR)\lib\jpeg.lib
+LIBPNG_LIB = $(OUTDIR)\lib\libpng.lib
-+ZLIB_LIB = $(OUTDIR)\lib\zlib.lib
++ZLIB_LIB = $(OUTDIR)\lib\z.lib
+GDIPLUS_LIB = gdiplus.lib
-!INCLUDE $(TOP)/glib/build/win32/make.msc