diff options
| author | Tor Lillqvist <tml@novell.com> | 2005-07-09 00:10:12 +0000 |
|---|---|---|
| committer | Tor Lillqvist <tml@src.gnome.org> | 2005-07-09 00:10:12 +0000 |
| commit | c0dace5fd9deb9197415ba7c994f392acdfde0ea (patch) | |
| tree | 14ae690ab3aeab5bdaa9b3da054f8a8b5f37dc6c /gdk-pixbuf | |
| parent | 13d49dd3d1981591554262b46e3ab633dd64db75 (diff) | |
| download | gdk-pixbuf-c0dace5fd9deb9197415ba7c994f392acdfde0ea.tar.gz | |
Look for windres on Win32.
2005-07-09 Tor Lillqvist <tml@novell.com>
* configure.in: Look for windres on Win32.
* gdk-pixbuf/Makefile.am
* gdk/win32/rc/Makefile.am
* gdk/Makefile.am
* gtk/Makefile.am: Don't use the scripts in build/win32 to compile
the rc files into resource object files. (This means we lose the
build number increment magic, but I doubt it was that useful
anyway.) Instead use windres directly. To pass a normal .o file
produced by windres through libtool, which would want a .lo file,
pass it directly to the linker using a -Wl option.
* gdk-pixbuf/gdk_pixbuf.rc.in
* gdk/win32/rc/gdk.rc.in
* gtk/gtk-win32.rc.in: Replace BUILDNUMBER with 0.
Diffstat (limited to 'gdk-pixbuf')
| -rw-r--r-- | gdk-pixbuf/ChangeLog | 11 | ||||
| -rw-r--r-- | gdk-pixbuf/Makefile.am | 12 | ||||
| -rw-r--r-- | gdk-pixbuf/gdk_pixbuf.rc.in | 6 |
3 files changed, 21 insertions, 8 deletions
diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog index 773ce2b95..083da7452 100644 --- a/gdk-pixbuf/ChangeLog +++ b/gdk-pixbuf/ChangeLog @@ -1,3 +1,14 @@ +2005-07-09 Tor Lillqvist <tml@novell.com> + + * Makefile.am: Don't use the scripts in build/win32 to compile the + rc file into a resource object file. (This means we lose 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 would want a .lo file, + pass it directly to the linker using a -Wl option. + + * gdk_pixbuf.rc.in: Replace BUILDNUMBER with 0. + 2005-07-08 Matthias Clasen <mclasen@redhat.com> * === Released 2.7.2 === diff --git a/gdk-pixbuf/Makefile.am b/gdk-pixbuf/Makefile.am index d038f40ef..1a5de6fc0 100644 --- a/gdk-pixbuf/Makefile.am +++ b/gdk-pixbuf/Makefile.am @@ -9,10 +9,11 @@ if OS_WIN32 gdk_pixbuf_def = $(srcdir)/gdk_pixbuf.def gdk_pixbuf_symbols = -export-symbols $(gdk_pixbuf_def) -gdk_pixbuf_win32res_lo = gdk_pixbuf-win32res.lo +gdk_pixbuf_win32_res = gdk_pixbuf-win32-res.o +gdk_pixbuf_win32_res_ldflag = -Wl,$(gdk_pixbuf_win32_res) -gdk_pixbuf-win32res.lo : gdk_pixbuf.rc - $(top_srcdir)/build/win32/lt-compile-resource gdk_pixbuf.rc gdk_pixbuf-win32res.lo +gdk_pixbuf-win32-res.o : gdk_pixbuf.rc + $(WINDRES) gdk_pixbuf.rc $@ install-def-file: $(INSTALL) $(gdk_pixbuf_def) $(DESTDIR)$(libdir)/gdk_pixbuf-2.0.def @@ -314,14 +315,15 @@ libgdk_pixbuf_2_0_la_SOURCES = \ gdk-pixbuf-enum-types.c libgdk_pixbuf_2_0_la_LDFLAGS = \ + $(gdk_pixbuf_win32_res_ldflag) \ -version-info $(LT_VERSION_INFO) \ $(LIBTOOL_EXPORT_OPTIONS) \ $(no_undefined) \ $(gdk_pixbuf_symbols) -libgdk_pixbuf_2_0_la_LIBADD = pixops/libpixops.la $(builtin_objs) $(gdk_pixbuf_win32res_lo) $(GDK_PIXBUF_DEP_LIBS) -libgdk_pixbuf_2_0_la_DEPENDENCIES = pixops/libpixops.la $(builtin_objs) $(gdk_pixbuf_def) $(gdk_pixbuf_win32res_lo) +libgdk_pixbuf_2_0_la_LIBADD = pixops/libpixops.la $(builtin_objs) $(GDK_PIXBUF_DEP_LIBS) +libgdk_pixbuf_2_0_la_DEPENDENCIES = pixops/libpixops.la $(builtin_objs) $(gdk_pixbuf_def) $(gdk_pixbuf_win32_res) gdk_pixbuf_headers = \ gdk-pixbuf.h \ diff --git a/gdk-pixbuf/gdk_pixbuf.rc.in b/gdk-pixbuf/gdk_pixbuf.rc.in index fadca262a..090b1da3e 100644 --- a/gdk-pixbuf/gdk_pixbuf.rc.in +++ b/gdk-pixbuf/gdk_pixbuf.rc.in @@ -1,7 +1,7 @@ #include <winver.h> VS_VERSION_INFO VERSIONINFO - FILEVERSION @GTK_MAJOR_VERSION@,@GTK_MINOR_VERSION@,@GTK_MICRO_VERSION@,BUILDNUMBER + FILEVERSION @GTK_MAJOR_VERSION@,@GTK_MINOR_VERSION@,@GTK_MICRO_VERSION@,0 PRODUCTVERSION @GTK_MAJOR_VERSION@,@GTK_MINOR_VERSION@,@GTK_MICRO_VERSION@,0 FILEFLAGSMASK 0 FILEFLAGS 0 @@ -15,9 +15,9 @@ VS_VERSION_INFO VERSIONINFO BEGIN VALUE "CompanyName", "The GTK developer community" VALUE "FileDescription", "GIMP Toolkit" - VALUE "FileVersion", "@GTK_VERSION@.BUILDNUMBER" + VALUE "FileVersion", "@GTK_VERSION@.0" VALUE "InternalName", "libgdk_pixbuf-@GTK_API_VERSION@-@LT_CURRENT_MINUS_AGE@" - VALUE "LegalCopyright", "Copyright (C) 1999 The Free Software Foundation. Modified by the GTK+ Team and others 1999-2002." + VALUE "LegalCopyright", "Copyright (C) 1999 The Free Software Foundation. Modified by the GTK+ Team and others 1999-2005." VALUE "OriginalFilename", "libgdk_pixbuf-@GTK_API_VERSION@-@LT_CURRENT_MINUS_AGE@.dll" VALUE "ProductName", "GTK+" VALUE "ProductVersion", "@GTK_VERSION@" |