luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-04-02 13:53:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Put a version info resource also in the gio DLL

Browse Source 
Also, distribute gio/gio.rc(.in).
This commit is contained in:
Tor Lillqvist 2010-02-04 00:37:13 +02:00
parent 154a5314be
commit 3f3c163aa2
3 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
configure.in
View File

@ -3577,6 +3577,7 @@ if false; then
gobject/gobject.rc gobject/gobject.rc
gthread/makefile.msc gthread/makefile.msc
gthread/gthread.rc gthread/gthread.rc
gio/gio.rc
tests/makefile.msc tests/makefile.msc
]) ])
fi fi

18
gio/Makefile.am
View File

@ -308,6 +308,9 @@ if OS_WIN32_AND_DLL_COMPILATION
export_symbols = -export-symbols gio.def export_symbols = -export-symbols gio.def
gio_def = gio.def gio_def = gio.def
gio_win32_res = gio-win32-res.o
gio_win32_res_ldflag = -Wl,$(gio_win32_res)
install-def-file: install-def-file:
$(INSTALL) gio.def $(DESTDIR)$(libdir)/gio-2.0.def $(INSTALL) gio.def $(DESTDIR)$(libdir)/gio-2.0.def
@ -326,10 +329,14 @@ install-data-local: install-ms-lib install-def-file
uninstall-local: uninstall-ms-lib uninstall-def-file uninstall-local: uninstall-ms-lib uninstall-def-file
libgio_2_0_la_LDFLAGS = \ libgio_2_0_la_LDFLAGS = \
$(gio_win32_res_ldflag) \
-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
-export-dynamic $(no_undefined) $(export_symbols) -export-dynamic $(no_undefined) $(export_symbols)
libgio_2_0_la_DEPENDENCIES = $(gio_def) $(platform_deps) libgio_2_0_la_DEPENDENCIES = $(gio_win32_res) $(gio_def) $(platform_deps)
gio-win32-res.o: gio.rc
$(WINDRES) gio.rc $@
gio_headers = \ gio_headers = \
gappinfo.h \ gappinfo.h \
@ -429,8 +436,12 @@ EXTRA_DIST += \
makegioalias.pl \ makegioalias.pl \
abicheck.sh \ abicheck.sh \
pltcheck.sh \ pltcheck.sh \
gio.rc.in \
$(NULL) $(NULL)
BUILT_EXTRA_DIST = \
gio.rc
CLEANFILES = \ CLEANFILES = \
$(marshal_sources) \ $(marshal_sources) \
$(NULL) $(NULL)
@ -457,6 +468,11 @@ gio_querymodules_LDADD = \
libgio-2.0.la \ libgio-2.0.la \
$(NULL) $(NULL)
dist-hook: $(BUILT_EXTRA_DIST)
files='$(BUILT_EXTRA_DIST)'; \
for f in $$files; do \
if test -f $$f; then d=.; else d=$(srcdir); fi; \
cp $$d/$$f $(distdir) || exit 1; done
if HAVE_GLIB_RUNTIME_LIBDIR if HAVE_GLIB_RUNTIME_LIBDIR
install-data-hook: install-data-hook:

2
gio/gio.rc.in
View File

@ -17,7 +17,7 @@ VS_VERSION_INFO VERSIONINFO
VALUE "FileDescription", "Gio" VALUE "FileDescription", "Gio"
VALUE "FileVersion", "@GLIB_VERSION@.0" VALUE "FileVersion", "@GLIB_VERSION@.0"
VALUE "InternalName", "libgio-2.0-@LT_CURRENT_MINUS_AGE@" VALUE "InternalName", "libgio-2.0-@LT_CURRENT_MINUS_AGE@"
VALUE "LegalCopyright", "Copyright © 2006-2007 Red Hat, Inc. Modified by the GLib Team and others 2006-2008." VALUE "LegalCopyright", "Copyright © 2006-2010 Red Hat, Inc. and others."
VALUE "OriginalFilename", "libgio-2.0-@LT_CURRENT_MINUS_AGE@.dll" VALUE "OriginalFilename", "libgio-2.0-@LT_CURRENT_MINUS_AGE@.dll"
VALUE "ProductName", "GLib" VALUE "ProductName", "GLib"
VALUE "ProductVersion", "@GLIB_VERSION@" VALUE "ProductVersion", "@GLIB_VERSION@"