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:
Tor Lillqvist
2005-07-08 23:04:06 +00:00
committed by Tor Lillqvist
parent 352742b86a
commit d22f051252
17 changed files with 168 additions and 41 deletions

View File

@@ -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", "GThread"
VALUE "FileVersion", "@GLIB_VERSION@.BUILDNUMBER"
VALUE "FileVersion", "@GLIB_VERSION@.0"
VALUE "InternalName", "libgthread-2.0-@LT_CURRENT_MINUS_AGE@"
VALUE "LegalCopyright", "Copyright <20> 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald. Copyright <20> 1998 Sebastian Wilhelmi. Modified by the GLib Team and others 1997-2004."
VALUE "OriginalFilename", "libgthread-2.0-@LT_CURRENT_MINUS_AGE@.dll"