mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2025-07-25 11:27:53 +02:00
Don't use autoconf variables for the resource object files on Win32 any
2005-07-09 Tor Lillqvist <tml@novell.com> * configure.in: Don't use autoconf variables for the resource object files on Win32 any longer. Instead handle that in the Makefile.am files. Check for windres. * glibconfig.h.win32.in: Minor tuning to match the configure-produced glibconfig.h closely. * */Makefile.am: Don't use the scripts in build/win32 to compile the .rc file into a resource object file. (This means we loose the build number increment magic, but I doubt it was that useful anyway.) Instead use windres directly. To pass the normal .o file produced by windres through libtool, which wants .lo files, pass it directly to the linker using a -Wl option. * */*.rc.in: Thus replace BUILDNUMBER with 0.
This commit is contained in:
committed by
Tor Lillqvist
parent
352742b86a
commit
d22f051252
@@ -1,3 +1,14 @@
|
||||
2005-07-09 Tor Lillqvist <tml@novell.com>
|
||||
|
||||
* Makefile.am: Don't use the scripts in build/win32 to compile
|
||||
gobject.rc into a resource object file. (This means we loose the
|
||||
build number increment magic, but I doubt it was that useful
|
||||
anyway.) Instead use windres directly. To pass the normal .o file
|
||||
produced by windres through libtool, which wants .lo files, pass
|
||||
it directly to the linker using a -Wl option.
|
||||
|
||||
* gobject.rc.in: Thus replace BUILDNUMBER with 0.
|
||||
|
||||
2005-07-08 Matthias Clasen <mclasen@redhat.com>
|
||||
|
||||
* === Released 2.7.2 ===
|
||||
|
@@ -65,15 +65,21 @@ uninstall-def-file:
|
||||
export_symbols = $(LIBTOOL_EXPORT_OPTIONS)
|
||||
endif
|
||||
|
||||
if OS_WIN32
|
||||
gobject_win32_res = gobject-win32-res.o
|
||||
gobject_win32_res_ldflag = -Wl,$(gobject_win32_res)
|
||||
endif
|
||||
|
||||
# libtool stuff: set version and export symbols for resolving
|
||||
libgobjectincludedir = $(includedir)/glib-2.0/gobject
|
||||
libgobject_2_0_la_LDFLAGS = \
|
||||
-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
|
||||
$(gobject_win32_res_ldflag) \
|
||||
-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
|
||||
-export-dynamic $(no_undefined) $(export_symbols)
|
||||
|
||||
libgobject_2_0_la_LIBADD = $(G_OBJECT_WIN32_RESOURCE) $(libglib)
|
||||
libgobject_2_0_la_LIBADD = $(libglib)
|
||||
|
||||
libgobject_2_0_la_DEPENDENCIES = $(G_OBJECT_WIN32_RESOURCE) $(GOBJECT_DEF)
|
||||
libgobject_2_0_la_DEPENDENCIES = $(gobject_win32_res) $(GOBJECT_DEF)
|
||||
|
||||
#
|
||||
# setup source file variables
|
||||
@@ -230,8 +236,8 @@ BUILT_EXTRA_DIST = \
|
||||
|
||||
|
||||
if OS_WIN32
|
||||
$(G_OBJECT_WIN32_RESOURCE): gobject.rc
|
||||
$(top_srcdir)/build/win32/lt-compile-resource gobject.rc $@
|
||||
gobject-win32-res.o: gobject.rc
|
||||
$(WINDRES) gobject.rc $@
|
||||
endif
|
||||
|
||||
gobject-2.0.lib: libgobject-2.0.la gobject.def
|
||||
|
@@ -1,7 +1,7 @@
|
||||
#include <winver.h>
|
||||
|
||||
VS_VERSION_INFO VERSIONINFO
|
||||
FILEVERSION @GLIB_MAJOR_VERSION@,@GLIB_MINOR_VERSION@,@GLIB_MICRO_VERSION@,BUILDNUMBER
|
||||
FILEVERSION @GLIB_MAJOR_VERSION@,@GLIB_MINOR_VERSION@,@GLIB_MICRO_VERSION@,0
|
||||
PRODUCTVERSION @GLIB_MAJOR_VERSION@,@GLIB_MINOR_VERSION@,@GLIB_MICRO_VERSION@,0
|
||||
FILEFLAGSMASK 0
|
||||
FILEFLAGS 0
|
||||
@@ -15,7 +15,7 @@ VS_VERSION_INFO VERSIONINFO
|
||||
BEGIN
|
||||
VALUE "CompanyName", "The GLib developer community"
|
||||
VALUE "FileDescription", "GObject"
|
||||
VALUE "FileVersion", "@GLIB_VERSION@.BUILDNUMBER"
|
||||
VALUE "FileVersion", "@GLIB_VERSION@.0"
|
||||
VALUE "InternalName", "libgobject-2.0-@LT_CURRENT_MINUS_AGE@"
|
||||
VALUE "LegalCopyright", "Copyright <20> 1998-2004 Tim Janik and Red Hat, Inc."
|
||||
VALUE "OriginalFilename", "libgobject-2.0-@LT_CURRENT_MINUS_AGE@.dll"
|
||||
|
Reference in New Issue
Block a user