2008-08-06 Tor Lillqvist <tml@novell.com>
* configure.in: On Windows set LIB_EXE_MACHINE_FLAG to X86 or X64
depending on host architecture.
* atk/Makefile.am: Use it if/when running lib.exe.
svn path=/trunk/; revision=1263
+2008-08-06 Tor Lillqvist <tml@novell.com>
+
+ * configure.in: On Windows set LIB_EXE_MACHINE_FLAG to X86 or X64
+ depending on host architecture.
+
+ * atk/Makefile.am: Use it if/when running lib.exe.
+
2008-07-28 Tor Lillqvist <tml@novell.com>
* atk/Makefile.am (libatk_1_0_la_DEPENDENCIES): Depend on atk.def
2008-07-28 Tor Lillqvist <tml@novell.com>
* atk/Makefile.am (libatk_1_0_la_DEPENDENCIES): Depend on atk.def
(echo -e EXPORTS; $(CPP) -P -DINCLUDE_VARIABLES -DG_OS_WIN32 -DALL_FILES - <$(srcdir)/atk.symbols | sed -e '/^$$/d' -e 's/^/ /' -e 's/G_GNUC_[^ ]*//g') > atk.def
atk-$(ATK_API_VERSION).lib: libatk-$(ATK_API_VERSION).la atk.def
(echo -e EXPORTS; $(CPP) -P -DINCLUDE_VARIABLES -DG_OS_WIN32 -DALL_FILES - <$(srcdir)/atk.symbols | sed -e '/^$$/d' -e 's/^/ /' -e 's/G_GNUC_[^ ]*//g') > atk.def
atk-$(ATK_API_VERSION).lib: libatk-$(ATK_API_VERSION).la atk.def
- lib -name:libatk-$(ATK_API_VERSION)-$(LT_CURRENT_MINUS_AGE).dll -def:atk.def -out:$@
+ lib -machine:$(LIB_EXE_MACHINE_FLAG) -name:libatk-$(ATK_API_VERSION)-$(LT_CURRENT_MINUS_AGE).dll -def:atk.def -out:$@
EXTRA_DIST = atk.symbols atk.rc.in atkmarshal.list atkintl.h
EXTRA_DIST = atk.symbols atk.rc.in atkmarshal.list atkintl.h
case "$host" in
*-*-mingw*)
atk_native_win32=yes
case "$host" in
*-*-mingw*)
atk_native_win32=yes
+ case "$host" in
+ x86_64-*-*)
+ LIB_EXE_MACHINE_FLAG=X64
+ ;;
+ *)
+ LIB_EXE_MACHINE_FLAG=X86
+ ;;
+ esac
;;
*)
atk_native_win32=no
;;
*)
atk_native_win32=no
AC_MSG_RESULT([$atk_native_win32])
AM_CONDITIONAL(OS_WIN32, test "$atk_native_win32" = "yes")
AC_MSG_RESULT([$atk_native_win32])
AM_CONDITIONAL(OS_WIN32, test "$atk_native_win32" = "yes")
+AC_SUBST(LIB_EXE_MACHINE_FLAG)
+
if test "$atk_native_win32" = "yes"; then
AC_CHECK_TOOL(WINDRES, windres, no)
if test "$WINDRES" = no; then
if test "$atk_native_win32" = "yes"; then
AC_CHECK_TOOL(WINDRES, windres, no)
if test "$WINDRES" = no; then