diff options
| author | Tor Lillqvist <tml@novell.com> | 2008-07-27 15:54:15 +0000 |
|---|---|---|
| committer | Tor Lillqvist <tml@src.gnome.org> | 2008-07-27 15:54:15 +0000 |
| commit | a076a3045770456e6932d41eba97adf9b19b43f4 (patch) | |
| tree | 35727ce8be92ef8e2f22d8123329e48cf22d9560 /gmodule | |
| parent | 0a2cd70e5eb3ae8f1386fed43e9f0f3054ab9425 (diff) | |
| download | glib-a076a3045770456e6932d41eba97adf9b19b43f4.tar.gz | |
Set LIB_EXE_MACHINE_FLAG to either X86 or X64 on Windows. AC_SUBST it.
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.
svn path=/trunk/; revision=7255
Diffstat (limited to 'gmodule')
| -rw-r--r-- | gmodule/ChangeLog | 4 | ||||
| -rw-r--r-- | gmodule/Makefile.am | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/gmodule/ChangeLog b/gmodule/ChangeLog index 89b4afd7b..0af7dbdd0 100644 --- a/gmodule/ChangeLog +++ b/gmodule/ChangeLog @@ -1,3 +1,7 @@ +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 === diff --git a/gmodule/Makefile.am b/gmodule/Makefile.am index 852aabbad..98cae0f21 100644 --- a/gmodule/Makefile.am +++ b/gmodule/Makefile.am @@ -91,7 +91,7 @@ gmodule-win32-res.o: gmodule.rc $(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 |