AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Set LIB_EXE_MACHINE_FLAG to either X86 or X64 on Windows. AC_SUBST it.

Browse Source 
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.


svn path=/trunk/; revision=20957
This commit is contained in:
Tor Lillqvist 2008-08-03 23:47:10 +00:00 committed by Tor Lillqvist
parent 963ee0de5e
commit 71d9f3d45b
4 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
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.
2008-08-04 Tor Lillqvist <tml@novell.com> 2008-08-04 Tor Lillqvist <tml@novell.com>
Bug 544684 - Win64 issue, window handles are assumed to be 32-bit Bug 544684 - Win64 issue, window handles are assumed to be 32-bit

9
configure.in
View File

@ -123,11 +123,17 @@ AC_CANONICAL_HOST
MATH_LIB=-lm MATH_LIB=-lm
AC_MSG_CHECKING([for native Win32]) AC_MSG_CHECKING([for native Win32])
LIB_EXE_MACHINE_FLAG=X86
case "$host" in case "$host" in
*-*-mingw*) *-*-mingw*)
os_win32=yes os_win32=yes
gio_can_sniff=no gio_can_sniff=no
MATH_LIB= MATH_LIB=
case "$host" in
x86_64-*-*)
LIB_EXE_MACHINE_FLAG=X64
;;
esac
;; ;;
*) *)
os_win32=no os_win32=no
@ -135,11 +141,14 @@ case "$host" in
esac esac
AC_MSG_RESULT([$os_win32]) AC_MSG_RESULT([$os_win32])
AC_SUBST(LIB_EXE_MACHINE_FLAG)
case $host in case $host in
*-*-linux*) *-*-linux*)
os_linux=yes os_linux=yes
;; ;;
esac esac
dnl Initialize libtool dnl Initialize libtool
AC_PROG_CC AC_PROG_CC
AM_DISABLE_STATIC AM_DISABLE_STATIC

2
gdk/Makefile.am
View File

@ -194,7 +194,7 @@ if MS_LIB_AVAILABLE
noinst_DATA = gdk-win32-$(GTK_API_VERSION).lib noinst_DATA = gdk-win32-$(GTK_API_VERSION).lib
gdk-win32-$(GTK_API_VERSION).lib: libgdk-win32-$(GTK_API_VERSION).la gdk.def 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-ms-lib:
$(INSTALL) gdk-win32-$(GTK_API_VERSION).lib $(DESTDIR)$(libdir) $(INSTALL) gdk-win32-$(GTK_API_VERSION).lib $(DESTDIR)$(libdir)

2
gtk/Makefile.am
View File

@ -71,7 +71,7 @@ if MS_LIB_AVAILABLE
noinst_DATA = gtk-win32-$(GTK_API_VERSION).lib noinst_DATA = gtk-win32-$(GTK_API_VERSION).lib
gtk-win32-$(GTK_API_VERSION).lib: libgtk-win32-$(GTK_API_VERSION).la gtk.def 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-ms-lib:
$(INSTALL) gtk-win32-$(GTK_API_VERSION).lib $(DESTDIR)$(libdir) $(INSTALL) gtk-win32-$(GTK_API_VERSION).lib $(DESTDIR)$(libdir)