+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
dnl
AC_MSG_CHECKING([for Win32])
+LIB_EXE_MACHINE_FLAG=X86
case "$host" in
*-*-mingw*)
glib_native_win32=yes
# 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
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([
+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]:
if OS_WIN32
appinfo_sources += gwin32appinfo.c gwin32appinfo.h
-platform_libadd += -lshlwapi
+platform_libadd += -lshlwapi -lwininet
win32_sources = \
gwin32mount.c \
gwin32mount.h \
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:$@
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)'; \
+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 ===
$(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
+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
$(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)'; \
+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 ===
$(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)'; \