diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | configure.in | 8 | ||||
| -rw-r--r-- | gio/ChangeLog | 4 | ||||
| -rw-r--r-- | gio/Makefile.am | 4 | ||||
| -rw-r--r-- | glib/Makefile.am | 2 | ||||
| -rw-r--r-- | gmodule/ChangeLog | 4 | ||||
| -rw-r--r-- | gmodule/Makefile.am | 2 | ||||
| -rw-r--r-- | gobject/ChangeLog | 4 | ||||
| -rw-r--r-- | gobject/Makefile.am | 2 | ||||
| -rw-r--r-- | gthread/ChangeLog | 4 | ||||
| -rw-r--r-- | gthread/Makefile.am | 2 |
11 files changed, 38 insertions, 6 deletions
@@ -1,3 +1,11 @@ +2008-07-27 Tor Lillqvist <tml@novell.com> + + * configure.in: Set LIB_EXE_MACHINE_FLAG to either X86 or X64 on + Windows. AC_SUBST it. + + * glib/Makefile.am (glib-2.0.lib): Pass appropriate -machine flag + to lib.exe. + 2008-07-25 15:47:08 Tim Janik <timj@imendio.com> * glib/tests/testing.c (test_random_conversions): added new sample diff --git a/configure.in b/configure.in index 5376f794d..c96778d6f 100644 --- a/configure.in +++ b/configure.in @@ -115,6 +115,7 @@ AC_MSG_RESULT([$glib_native_beos]) dnl AC_MSG_CHECKING([for Win32]) +LIB_EXE_MACHINE_FLAG=X86 case "$host" in *-*-mingw*) glib_native_win32=yes @@ -129,6 +130,11 @@ case "$host" in # So preset the autoconf cache variables. ac_cv_func_vsnprintf_c99=no ac_cv_func_snprintf_c99=no + case "$host" in + x86_64-*-*) + LIB_EXE_MACHINE_FLAG=X64 + ;; + esac ;; *) glib_native_win32=no @@ -143,6 +149,8 @@ esac AC_MSG_RESULT([$glib_native_win32]) +AC_SUBST(LIB_EXE_MACHINE_FLAG) + glib_have_carbon=no AC_MSG_CHECKING([for Mac OS X Carbon support]) AC_TRY_CPP([ diff --git a/gio/ChangeLog b/gio/ChangeLog index a53a94333..b6fd1c2ab 100644 --- a/gio/ChangeLog +++ b/gio/ChangeLog @@ -1,3 +1,7 @@ +2008-07-27 Tor Lillqvist <tml@novell.com> + + * Makefile.am (gio-2.0.lib): Pass appropriate -machine flag to lib.exe. + 2008-07-24 David Zeuthen <davidz@redhat.com> * gmount.[ch]: diff --git a/gio/Makefile.am b/gio/Makefile.am index ced7571d3..c992a1e59 100644 --- a/gio/Makefile.am +++ b/gio/Makefile.am @@ -147,7 +147,7 @@ endif if OS_WIN32 appinfo_sources += gwin32appinfo.c gwin32appinfo.h -platform_libadd += -lshlwapi +platform_libadd += -lshlwapi -lwininet win32_sources = \ gwin32mount.c \ gwin32mount.h \ @@ -350,4 +350,4 @@ gioenumtypes.c: $(gio_headers) gioenumtypes.c.template gioenumtypes.c.tmp && mv gioenumtypes.c.tmp gioenumtypes.c gio-2.0.lib: libgio-2.0.la gio.def - lib -name:libgio-2.0-$(LT_CURRENT_MINUS_AGE).dll -def:gio.def -out:$@ + lib -machine:@LIB_EXE_MACHINE_FLAG@ -name:libgio-2.0-$(LT_CURRENT_MINUS_AGE).dll -def:gio.def -out:$@ diff --git a/glib/Makefile.am b/glib/Makefile.am index fbdf900b9..d0e9795f0 100644 --- a/glib/Makefile.am +++ b/glib/Makefile.am @@ -339,7 +339,7 @@ install-exec-hook: endif glib-2.0.lib: libglib-2.0.la glib.def - lib -name:libglib-2.0-$(LT_CURRENT_MINUS_AGE).dll -def:glib.def -out:$@ + lib -machine:@LIB_EXE_MACHINE_FLAG@ -name:libglib-2.0-$(LT_CURRENT_MINUS_AGE).dll -def:glib.def -out:$@ dist-hook: $(BUILT_EXTRA_DIST) files='$(BUILT_EXTRA_DIST)'; \ diff --git a/gmodule/ChangeLog b/gmodule/ChangeLog index 89b4afd7b..0af7dbdd0 100644 --- a/gmodule/ChangeLog +++ b/gmodule/ChangeLog @@ -1,3 +1,7 @@ +2008-07-27 Tor Lillqvist <tml@novell.com> + + * Makefile.am (gmodule-2.0.lib): Pass appropriate -machine flag to lib.exe. + 2008-07-21 Matthias Clasen <mclasen2redhat.com> * === Released 2.17.4 === diff --git a/gmodule/Makefile.am b/gmodule/Makefile.am index 852aabbad..98cae0f21 100644 --- a/gmodule/Makefile.am +++ b/gmodule/Makefile.am @@ -91,7 +91,7 @@ gmodule-win32-res.o: gmodule.rc $(WINDRES) gmodule.rc $@ gmodule-2.0.lib: libgmodule-2.0.la gmodule.def - lib -name:libgmodule-2.0-$(LT_CURRENT_MINUS_AGE).dll -def:$(srcdir)/gmodule.def -out:$@ + lib -machine:@LIB_EXE_MACHINE_FLAG@ -name:libgmodule-2.0-$(LT_CURRENT_MINUS_AGE).dll -def:$(srcdir)/gmodule.def -out:$@ .PHONY: files release diff --git a/gobject/ChangeLog b/gobject/ChangeLog index d582d27c4..aa2e8341c 100644 --- a/gobject/ChangeLog +++ b/gobject/ChangeLog @@ -1,3 +1,7 @@ +2008-07-27 Tor Lillqvist <tml@novell.com> + + * Makefile.am (gobject-2.0.lib): Pass appropriate -machine flag to lib.exe. + 2008-07-24 Tor Lillqvist <tml@novell.com> * gtype.h: Define G_TYPE_FORMAT as the printf format for a GType diff --git a/gobject/Makefile.am b/gobject/Makefile.am index 4d59fc035..f8a7de4c1 100644 --- a/gobject/Makefile.am +++ b/gobject/Makefile.am @@ -244,7 +244,7 @@ gobject-win32-res.o: gobject.rc $(WINDRES) gobject.rc $@ gobject-2.0.lib: libgobject-2.0.la gobject.def - lib -name:libgobject-2.0-$(LT_CURRENT_MINUS_AGE).dll -def:gobject.def -out:$@ + lib -machine:@LIB_EXE_MACHINE_FLAG@ -name:libgobject-2.0-$(LT_CURRENT_MINUS_AGE).dll -def:gobject.def -out:$@ dist-hook: $(BUILT_EXTRA_DIST) files='$(BUILT_EXTRA_DIST)'; \ diff --git a/gthread/ChangeLog b/gthread/ChangeLog index 4da2fb6c0..9d854d344 100644 --- a/gthread/ChangeLog +++ b/gthread/ChangeLog @@ -1,3 +1,7 @@ +2008-07-27 Tor Lillqvist <tml@novell.com> + + * Makefile.am (gthread-2.0.lib): Pass appropriate -machine flag to lib.exe. + 2008-07-21 Matthias Clasen <mclasen2redhat.com> * === Released 2.17.4 === diff --git a/gthread/Makefile.am b/gthread/Makefile.am index ab7dd2aa8..a7b53cf58 100644 --- a/gthread/Makefile.am +++ b/gthread/Makefile.am @@ -80,7 +80,7 @@ gthread-win32-res.o: gthread.rc $(WINDRES) gthread.rc $@ gthread-2.0.lib: libgthread-2.0.la gthread.def - lib -name:libgthread-2.0-$(LT_CURRENT_MINUS_AGE).dll -def:$(srcdir)/gthread.def -out:$@ + lib -machine:@LIB_EXE_MACHINE_FLAG@ -name:libgthread-2.0-$(LT_CURRENT_MINUS_AGE).dll -def:$(srcdir)/gthread.def -out:$@ dist-hook: $(BUILT_EXTRA_DIST) files='$(BUILT_EXTRA_DIST)'; \ |