forked from AuroraMiddleware/gtk
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.
This commit is contained in:
parent
13d49dd3d1
commit
c0dace5fd9
16
ChangeLog
16
ChangeLog
@ -1,3 +1,19 @@
|
||||
2005-07-09 Tor Lillqvist <tml@novell.com>
|
||||
|
||||
* configure.in: Look for windres on Win32.
|
||||
|
||||
* 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/win32/rc/gdk.rc.in
|
||||
* gtk/gtk-win32.rc.in: Replace BUILDNUMBER with 0.
|
||||
|
||||
2005-07-08 Kristian Rietveld <kris@gtk.org>
|
||||
|
||||
Fixes #165034, reported by Jorn Baayen.
|
||||
|
@ -1,3 +1,19 @@
|
||||
2005-07-09 Tor Lillqvist <tml@novell.com>
|
||||
|
||||
* configure.in: Look for windres on Win32.
|
||||
|
||||
* 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/win32/rc/gdk.rc.in
|
||||
* gtk/gtk-win32.rc.in: Replace BUILDNUMBER with 0.
|
||||
|
||||
2005-07-08 Kristian Rietveld <kris@gtk.org>
|
||||
|
||||
Fixes #165034, reported by Jorn Baayen.
|
||||
|
@ -1,3 +1,19 @@
|
||||
2005-07-09 Tor Lillqvist <tml@novell.com>
|
||||
|
||||
* configure.in: Look for windres on Win32.
|
||||
|
||||
* 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/win32/rc/gdk.rc.in
|
||||
* gtk/gtk-win32.rc.in: Replace BUILDNUMBER with 0.
|
||||
|
||||
2005-07-08 Kristian Rietveld <kris@gtk.org>
|
||||
|
||||
Fixes #165034, reported by Jorn Baayen.
|
||||
|
@ -174,6 +174,10 @@ AM_CONDITIONAL(OS_UNIX, test "$os_win32" != "yes")
|
||||
AM_CONDITIONAL(OS_LINUX, test "$os_linux" = "yes")
|
||||
|
||||
if test "$os_win32" = "yes"; then
|
||||
AC_CHECK_TOOL(WINDRES, windres, no)
|
||||
if test "$WINDRES" = no; then
|
||||
AC_MSG_ERROR([*** Could not find an implementation of windres in your PATH.])
|
||||
fi
|
||||
AC_CHECK_PROG(ms_librarian, lib.exe, yes, no)
|
||||
fi
|
||||
AM_CONDITIONAL(MS_LIB_AVAILABLE, test x$ms_librarian = xyes)
|
||||
|
@ -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 ===
|
||||
|
@ -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 \
|
||||
|
@ -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@"
|
||||
|
@ -147,8 +147,8 @@ libgdk_linux_fb_2_0_la_LDFLAGS = $(LDADD)
|
||||
libgdk_win32_2_0_la_SOURCES = $(common_sources) gdkkeynames.c
|
||||
libgdk_win32_2_0_la_LIBADD = win32/libgdk-win32.la $(GDK_DEP_LIBS) \
|
||||
$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la
|
||||
libgdk_win32_2_0_la_DEPENDENCIES = win32/libgdk-win32.la gdk.def
|
||||
libgdk_win32_2_0_la_LDFLAGS = -export-symbols gdk.def $(LDADD)
|
||||
libgdk_win32_2_0_la_DEPENDENCIES = win32/libgdk-win32.la win32/rc/gdk-win32-res.o gdk.def
|
||||
libgdk_win32_2_0_la_LDFLAGS = -Wl,win32/rc/gdk-win32-res.o -export-symbols gdk.def $(LDADD)
|
||||
if HAVE_WINTAB
|
||||
libgdk_win32_2_0_la_LIBADD += -Lwin32 -lwntab32x
|
||||
endif
|
||||
|
@ -4,18 +4,8 @@ EXTRA_DIST = \
|
||||
gtk.ico
|
||||
|
||||
if USE_WIN32
|
||||
noinst_DATA = gdk-win32res.lo
|
||||
noinst_DATA = gdk-win32-res.o
|
||||
endif
|
||||
|
||||
noinst_PROGRAMS = foo
|
||||
|
||||
# Compile a dummy object file into the foo.lo libtool object so that
|
||||
# the ugly hack in lt-compile-resource knows what kind of libtool
|
||||
# object to produce. (It checks whether there are any .libs/*.o
|
||||
# files.)
|
||||
|
||||
gdk-win32res.lo : gdk.rc gtk.ico foo.lo
|
||||
$(top_srcdir)/build/win32/lt-compile-resource gdk.rc gdk-win32res.lo
|
||||
|
||||
foo.c:
|
||||
echo 'int main (int argc, char **argv) { return 0; }' >foo.c
|
||||
gdk-win32-res.o : gdk.rc gtk.ico
|
||||
$(WINDRES) gdk.rc $@
|
||||
|
@ -3,7 +3,7 @@
|
||||
GTK_ICON ICON "gtk.ico"
|
||||
|
||||
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
|
||||
@ -17,9 +17,9 @@ VS_VERSION_INFO VERSIONINFO
|
||||
BEGIN
|
||||
VALUE "CompanyName", "The GTK developer community"
|
||||
VALUE "FileDescription", "GIMP Drawing Kit"
|
||||
VALUE "FileVersion", "@GTK_VERSION@.BUILDNUMBER"
|
||||
VALUE "FileVersion", "@GTK_VERSION@.0"
|
||||
VALUE "InternalName", "libgdk-win32-@GTK_API_VERSION@-@LT_CURRENT_MINUS_AGE@"
|
||||
VALUE "LegalCopyright", "Copyright © 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald. Modified by the GTK+ Team and others 1997-2002."
|
||||
VALUE "LegalCopyright", "Copyright © 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald. Modified by the GTK+ Team and others 1997-2005."
|
||||
VALUE "OriginalFilename", "libgdk-win32-@GTK_API_VERSION@-@LT_CURRENT_MINUS_AGE@.dll"
|
||||
VALUE "ProductName", "GTK+"
|
||||
VALUE "ProductVersion", "@GTK_VERSION@"
|
||||
|
@ -40,10 +40,11 @@ if OS_WIN32
|
||||
gtk_def = gtk.def
|
||||
gtk_win32_symbols = -export-symbols $(gtk_def)
|
||||
|
||||
gtk_win32res_lo = gtk-win32res.lo
|
||||
gtk_win32_res = gtk-win32-res.o
|
||||
gtk_win32_res_ldflag = -Wl,$(gtk_win32_res)
|
||||
|
||||
gtk-win32res.lo : gtk-win32.rc
|
||||
$(top_srcdir)/build/win32/lt-compile-resource gtk-win32.rc gtk-win32res.lo
|
||||
gtk-win32-res.o : gtk-win32.rc
|
||||
$(WINDRES) gtk-win32.rc $@
|
||||
|
||||
install-def-file: gtk.def
|
||||
$(INSTALL) $(gtk_def) $(DESTDIR)$(libdir)/gtk-win32-2.0.def
|
||||
@ -662,11 +663,11 @@ libgtk_win32_2_0_la_LDFLAGS = $(libtool_opts)
|
||||
|
||||
libgtk_x11_2_0_la_LIBADD = $(libadd)
|
||||
libgtk_linux_fb_2_0_la_LIBADD = $(libadd)
|
||||
libgtk_win32_2_0_la_LIBADD = $(libadd) $(gtk_win32res_lo)
|
||||
libgtk_win32_2_0_la_DEPENDENCIES = $(gtk_def) $(gtk_win32res_lo)
|
||||
libgtk_win32_2_0_la_LIBADD = $(libadd) -lole32
|
||||
libgtk_win32_2_0_la_DEPENDENCIES = $(gtk_def) $(gtk_win32_res)
|
||||
|
||||
if USE_WIN32
|
||||
libgtk_target_ldflags = $(gtk_win32_symbols) -lole32 -lwsock32
|
||||
libgtk_target_ldflags = $(gtk_win32_res_ldflag) $(gtk_win32_symbols)
|
||||
endif
|
||||
EXTRA_LTLIBRARIES = libgtk-x11-2.0.la libgtk-linux-fb-2.0.la libgtk-win32-2.0.la
|
||||
|
||||
|
@ -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", "libgtk-win32-@GTK_API_VERSION@-@LT_CURRENT_MINUS_AGE@"
|
||||
VALUE "LegalCopyright", "Copyright © 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald. Modified by the GTK+ Team and others 1997-2000."
|
||||
VALUE "LegalCopyright", "Copyright © 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald. Modified by the GTK+ Team and others 1997-2005."
|
||||
VALUE "OriginalFilename", "libgtk-win32-@GTK_API_VERSION@-@LT_CURRENT_MINUS_AGE@.dll"
|
||||
VALUE "ProductName", "GTK+"
|
||||
VALUE "ProductVersion", "@GTK_VERSION@"
|
||||
|
Loading…
Reference in New Issue
Block a user