summaryrefslogtreecommitdiff
path: root/gdk-pixbuf
diff options
context:
space:
mode:
authorTor Lillqvist <tml@novell.com>2008-08-03 23:47:52 +0000
committerTor Lillqvist <tml@src.gnome.org>2008-08-03 23:47:52 +0000
commita2b0ed658e671c28f259e90c138f16a626f21ee2 (patch)
tree4a3a4b3ca168f6af647ae2dec09bf269e0b3d820 /gdk-pixbuf
parent71d9f3d45bfed728872c961473b24022a77af63d (diff)
downloadgdk-pixbuf-a2b0ed658e671c28f259e90c138f16a626f21ee2.tar.gz
Pass appropriate -machine flag to lib.exe.
2008-08-04 Tor Lillqvist <tml@novell.com> * Makefile.am: Pass appropriate -machine flag to lib.exe. svn path=/trunk/; revision=20958
Diffstat (limited to 'gdk-pixbuf')
-rw-r--r--gdk-pixbuf/ChangeLog4
-rw-r--r--gdk-pixbuf/Makefile.am2
2 files changed, 5 insertions, 1 deletions
diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog
index 9fc9f9339..901755533 100644
--- a/gdk-pixbuf/ChangeLog
+++ b/gdk-pixbuf/ChangeLog
@@ -1,3 +1,7 @@
+2008-08-04 Tor Lillqvist <tml@novell.com>
+
+ * Makefile.am: Pass appropriate -machine flag to lib.exe.
+
2008-07-23 Matthias Clasen <mclasen@redhat.com>
* gdk-pixbuf-io.c (_gdk_pixbuf_get_module): Compare two content
diff --git a/gdk-pixbuf/Makefile.am b/gdk-pixbuf/Makefile.am
index 0e2864b87..9efb22605 100644
--- a/gdk-pixbuf/Makefile.am
+++ b/gdk-pixbuf/Makefile.am
@@ -31,7 +31,7 @@ if MS_LIB_AVAILABLE
noinst_DATA = gdk_pixbuf-$(GTK_API_VERSION).lib
gdk_pixbuf-$(GTK_API_VERSION).lib: libgdk_pixbuf-$(GTK_API_VERSION).la gdk_pixbuf.def
- lib -name:libgdk_pixbuf-$(GTK_API_VERSION)-@LT_CURRENT_MINUS_AGE@.dll -def:gdk_pixbuf.def -out:$@
+ lib -machine:@LIB_EXE_MACHINE_FLAG@ -name:libgdk_pixbuf-$(GTK_API_VERSION)-@LT_CURRENT_MINUS_AGE@.dll -def:gdk_pixbuf.def -out:$@
install-ms-lib:
$(INSTALL) gdk_pixbuf-$(GTK_API_VERSION).lib $(DESTDIR)$(libdir)