luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-08-01 15:03:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Tor Lillqvist
2008-07-27 15:54:15 +00:00
committed by Tor Lillqvist
parent 0a2cd70e5e
commit a076a30457
11 changed files with 38 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gio/ChangeLog
View File

@@ -1,3 +1,7 @@
2008-07-27 Tor Lillqvist <tml@novell.com>
* Makefile.am (gio-2.0.lib): Pass appropriate -machine flag to lib.exe.
2008-07-24 David Zeuthen <davidz@redhat.com>
* gmount.[ch]:

4
gio/Makefile.am
View File

@@ -147,7 +147,7 @@ endif
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: $(gio_headers) gioenumtypes.c.template
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:$@