gtk+ r20957 - in trunk: . gdk gtk

[tml svn gnome org]

Author: tml
Date: Sun Aug  3 23:47:10 2008
New Revision: 20957
URL: http://svn.gnome.org/viewvc/gtk+?rev=20957&view=rev

Log:
2008-08-04  Tor Lillqvist  <tml novell com>

	* configure.in: Set LIB_EXE_MACHINE_FLAG to either X86 or X64 on
	Windows. AC_SUBST it.

	* gdk/Makefile.am
	* gtk/Makefile.am: Pass appropriate -machine flag to lib.exe.



Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/gdk/Makefile.am
   trunk/gtk/Makefile.am

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Sun Aug  3 23:47:10 2008
@@ -123,11 +123,17 @@
 
 MATH_LIB=-lm
 AC_MSG_CHECKING([for native Win32])
+LIB_EXE_MACHINE_FLAG=X86
 case "$host" in
   *-*-mingw*)
     os_win32=yes
     gio_can_sniff=no
     MATH_LIB=
+    case "$host" in
+    x86_64-*-*)
+      LIB_EXE_MACHINE_FLAG=X64
+      ;;
+    esac
     ;;
   *)
     os_win32=no
@@ -135,11 +141,14 @@
 esac
 AC_MSG_RESULT([$os_win32])
 
+AC_SUBST(LIB_EXE_MACHINE_FLAG)
+
 case $host in
   *-*-linux*)
     os_linux=yes
     ;;
 esac
+
 dnl Initialize libtool
 AC_PROG_CC
 AM_DISABLE_STATIC

Modified: trunk/gdk/Makefile.am
==============================================================================
--- trunk/gdk/Makefile.am	(original)
+++ trunk/gdk/Makefile.am	Sun Aug  3 23:47:10 2008
@@ -194,7 +194,7 @@
 noinst_DATA = gdk-win32-$(GTK_API_VERSION).lib
 
 gdk-win32-$(GTK_API_VERSION).lib: libgdk-win32-$(GTK_API_VERSION).la gdk.def
-	lib -name:libgdk-win32-$(GTK_API_VERSION)- LT_CURRENT_MINUS_AGE@.dll -def:gdk.def -out:$@
+	lib -machine:@LIB_EXE_MACHINE_FLAG@ -name:libgdk-win32-$(GTK_API_VERSION)- LT_CURRENT_MINUS_AGE@.dll -def:gdk.def -out:$@
 
 install-ms-lib:
 	$(INSTALL) gdk-win32-$(GTK_API_VERSION).lib $(DESTDIR)$(libdir)

Modified: trunk/gtk/Makefile.am
==============================================================================
--- trunk/gtk/Makefile.am	(original)
+++ trunk/gtk/Makefile.am	Sun Aug  3 23:47:10 2008
@@ -71,7 +71,7 @@
 noinst_DATA = gtk-win32-$(GTK_API_VERSION).lib
 
 gtk-win32-$(GTK_API_VERSION).lib: libgtk-win32-$(GTK_API_VERSION).la gtk.def
-	lib -name:libgtk-win32-$(GTK_API_VERSION)- LT_CURRENT_MINUS_AGE@.dll -def:gtk.def -out:$@
+	lib -machine:@LIB_EXE_MACHINE_FLAG@ -name:libgtk-win32-$(GTK_API_VERSION)- LT_CURRENT_MINUS_AGE@.dll -def:gtk.def -out:$@
 
 install-ms-lib:
 	$(INSTALL) gtk-win32-$(GTK_API_VERSION).lib $(DESTDIR)$(libdir)
@@ -271,7 +271,7 @@
 	gtkseparator.h		\
 	gtkseparatormenuitem.h	\
 	gtkseparatortoolitem.h	\
- 	gtkshow.h		\
+	gtkshow.h		\
 	gtksettings.h		\
 	gtksizegroup.h		\
 	gtksocket.h		\