glib r7255 - in trunk: . gio glib gmodule gobject gthread

[tml svn gnome org]

Author: tml
Date: Sun Jul 27 15:54:15 2008
New Revision: 7255
URL: http://svn.gnome.org/viewvc/glib?rev=7255&view=rev

Log:
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.

	* */Makefile.am: Correspondingly, pass appropriate -machine
	flag to lib.exe when producing the import library for the MS
	toolchain.



Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/gio/ChangeLog
   trunk/gio/Makefile.am
   trunk/glib/Makefile.am
   trunk/gmodule/ChangeLog
   trunk/gmodule/Makefile.am
   trunk/gobject/ChangeLog
   trunk/gobject/Makefile.am
   trunk/gthread/ChangeLog
   trunk/gthread/Makefile.am

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Sun Jul 27 15:54:15 2008
@@ -115,6 +115,7 @@
 dnl
 
 AC_MSG_CHECKING([for Win32])
+LIB_EXE_MACHINE_FLAG=X86
 case "$host" in
   *-*-mingw*)
     glib_native_win32=yes
@@ -129,6 +130,11 @@
     # 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 @@
 
 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([

Modified: trunk/gio/Makefile.am
==============================================================================
--- trunk/gio/Makefile.am	(original)
+++ trunk/gio/Makefile.am	Sun Jul 27 15:54:15 2008
@@ -147,7 +147,7 @@
 
 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.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:$@

Modified: trunk/glib/Makefile.am
==============================================================================
--- trunk/glib/Makefile.am	(original)
+++ trunk/glib/Makefile.am	Sun Jul 27 15:54:15 2008
@@ -339,7 +339,7 @@
 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)'; \

Modified: trunk/gmodule/Makefile.am
==============================================================================
--- trunk/gmodule/Makefile.am	(original)
+++ trunk/gmodule/Makefile.am	Sun Jul 27 15:54:15 2008
@@ -91,7 +91,7 @@
 	$(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
 

Modified: trunk/gobject/Makefile.am
==============================================================================
--- trunk/gobject/Makefile.am	(original)
+++ trunk/gobject/Makefile.am	Sun Jul 27 15:54:15 2008
@@ -244,7 +244,7 @@
 	$(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)'; \

Modified: trunk/gthread/Makefile.am
==============================================================================
--- trunk/gthread/Makefile.am	(original)
+++ trunk/gthread/Makefile.am	Sun Jul 27 15:54:15 2008
@@ -80,7 +80,7 @@
 	$(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)'; \