callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove.

Browse Source 
2002-03-03  Tor Lillqvist  <tml@iki.fi>

	* gtk-pixbuf.rc.in: Remove.

	* gdk_pixbuf.rc.in: Name like this instead (wrong name used by
	mistake by Hans).

	* makefile.msc: Corresponding changes.

	* Makefile.am: Use gdk_pixbuf.rc on Win32. Distribute it.
This commit is contained in:
Tor Lillqvist
2002-03-02 23:19:59 +00:00
committed by Tor Lillqvist
parent 7fee0db1f0
commit 5d5f53d95d
4 changed files with 24 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
gdk-pixbuf/ChangeLog
View File

@ -1,3 +1,14 @@
2002-03-03 Tor Lillqvist <tml@iki.fi>
* gtk-pixbuf.rc.in: Remove.
* gdk_pixbuf.rc.in: Name like this instead (wrong name used by
mistake by Hans).
* makefile.msc: Corresponding changes.
* Makefile.am: Use gdk_pixbuf.rc on Win32. Distribute it.
2002-02-28 Matthias Clasen <maclas@gmx.de> 2002-02-28 Matthias Clasen <maclas@gmx.de>
* pixops/pixops.c (tile_make_weights): Move the call to * pixops/pixops.c (tile_make_weights): Move the call to

8
gdk-pixbuf/Makefile.am
View File

@ -9,6 +9,11 @@ if OS_WIN32
gdk_pixbuf_def = gdk_pixbuf.def gdk_pixbuf_def = gdk_pixbuf.def
gdk_pixbuf_symbols = -export-symbols $(gdk_pixbuf_def) gdk_pixbuf_symbols = -export-symbols $(gdk_pixbuf_def)
gdk_pixbuf_win32res_lo = gdk_pixbuf-win32res.lo
gdk_pixbuf-win32res.lo : gdk_pixbuf.rc
$(top_srcdir)/build/win32/lt-compile-resource gdk_pixbuf.rc gdk_pixbuf-win32res.lo
install-libtool-import-lib: install-libtool-import-lib:
$(INSTALL) .libs/libgdk_pixbuf-1.3.dll.a $(DESTDIR)$(libdir) $(INSTALL) .libs/libgdk_pixbuf-1.3.dll.a $(DESTDIR)$(libdir)
uninstall-libtool-import-lib: uninstall-libtool-import-lib:
@ -262,7 +267,7 @@ libgdk_pixbuf_1_3_la_LDFLAGS = @STRIP_BEGIN@ \
$(gdk_pixbuf_symbols) \ $(gdk_pixbuf_symbols) \
@STRIP_END@ @STRIP_END@
libgdk_pixbuf_1_3_la_LIBADD = pixops/libpixops.la $(builtin_objs) $(GDK_PIXBUF_DEP_LIBS) libgdk_pixbuf_1_3_la_LIBADD = pixops/libpixops.la $(builtin_objs) $(gdk_pixbuf_win32res_lo) $(GDK_PIXBUF_DEP_LIBS)
libgdk_pixbuf_1_3_la_DEPENDENCIES = pixops/libpixops.la $(builtin_objs) $(gdk_pixbuf_def) libgdk_pixbuf_1_3_la_DEPENDENCIES = pixops/libpixops.la $(builtin_objs) $(gdk_pixbuf_def)
gdk_pixbuf_headers = \ gdk_pixbuf_headers = \
@ -359,6 +364,7 @@ EXTRA_DIST = \
makefile.mingw.in \ makefile.mingw.in \
makefile.msc \ makefile.msc \
gdk_pixbuf.def \ gdk_pixbuf.def \
gdk_pixbuf.rc \
gdk-pixbuf-marshal.c \ gdk-pixbuf-marshal.c \
gdk-pixbuf-marshal.list \ gdk-pixbuf-marshal.list \
pixbufloader_ico.def \ pixbufloader_ico.def \

4
gdk-pixbuf/gtk-pixbuf.rc.in → gdk-pixbuf/gdk_pixbuf.rc.in
View File

@ -16,9 +16,9 @@ VS_VERSION_INFO VERSIONINFO
VALUE "CompanyName", "The GTK developer community" VALUE "CompanyName", "The GTK developer community"
VALUE "FileDescription", "GIMP Toolkit" VALUE "FileDescription", "GIMP Toolkit"
VALUE "FileVersion", "@GTK_VERSION@.BUILDNUMBER" VALUE "FileVersion", "@GTK_VERSION@.BUILDNUMBER"
VALUE "InternalName", "libgdk-pixbuf-@GTK_MAJOR_VERSION@.@GTK_MINOR_VERSION@-@LT_CURRENT_MINUS_AGE@" VALUE "InternalName", "libgdk_pixbuf-@GTK_MAJOR_VERSION@.@GTK_MINOR_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-2002."
VALUE "OriginalFilename", "libgdk-pixbuf-@GTK_MAJOR_VERSION@.@GTK_MINOR_VERSION@-@LT_CURRENT_MINUS_AGE@.dll" VALUE "OriginalFilename", "libgdk_pixbuf-@GTK_MAJOR_VERSION@.@GTK_MINOR_VERSION@-@LT_CURRENT_MINUS_AGE@.dll"
VALUE "ProductName", "GTK+" VALUE "ProductName", "GTK+"
VALUE "ProductVersion", "@GTK_VERSION@" VALUE "ProductVersion", "@GTK_VERSION@"
END END

8
gdk-pixbuf/makefile.msc
View File

@ -89,14 +89,14 @@ all : \
gdk-pixbuf-csource.exe \ gdk-pixbuf-csource.exe \
test-gdk-pixbuf.exe test-gdk-pixbuf.exe
gtk-pixbuf.res : gtk-pixbuf.rc $(PACKAGE).res : $(PACKAGE).rc
rc -DBUILDNUMBER=0 -r -fo gtk-pixbuf.res gtk-pixbuf.rc rc -DBUILDNUMBER=0 -r -fo $(PACKAGE).res $(PACKAGE).rc
$(PACKAGE)-$(PKG_VER)s.lib : $(OBJECTS) $(PACKAGE)-$(PKG_VER)s.lib : $(OBJECTS)
lib /out:$(PACKAGE)-$(PKG_VER)s.lib $(OBJECTS) pixops\pixops.lib lib /out:$(PACKAGE)-$(PKG_VER)s.lib $(OBJECTS) pixops\pixops.lib
$(PACKAGE)-$(PKG_VER).dll : $(OBJECTS) $(PACKAGE).def gtk-pixbuf.res $(PACKAGE)-$(PKG_VER).dll : $(OBJECTS) $(PACKAGE).def $(PACKAGE).res
$(CC) $(CFLAGS) -LD -Fe$(PACKAGE)-$(PKG_VER).dll $(OBJECTS) $(PKG_LINK) user32.lib advapi32.lib wsock32.lib gtk-pixbuf.res $(LDFLAGS) /def:$(PACKAGE).def $(CC) $(CFLAGS) -LD -Fe$(PACKAGE)-$(PKG_VER).dll $(OBJECTS) $(PKG_LINK) user32.lib advapi32.lib wsock32.lib $(PACKAGE).res $(LDFLAGS) /def:$(PACKAGE).def
make-inline-pixbuf.exe : make-inline-pixbuf.c make-inline-pixbuf.exe : make-inline-pixbuf.c
$(CC) $(PKG_CFLAGS) -Femake-inline-pixbuf.exe make-inline-pixbuf.c $(PKG_LINK) $(PACKAGE)-$(PKG_VER).lib $(CC) $(PKG_CFLAGS) -Femake-inline-pixbuf.exe make-inline-pixbuf.c $(PKG_LINK) $(PACKAGE)-$(PKG_VER).lib