diff options
author | Tor Lillqvist <tml@iki.fi> | 2003-01-05 02:24:15 +0000 |
---|---|---|
committer | Tor Lillqvist <tml@src.gnome.org> | 2003-01-05 02:24:15 +0000 |
commit | 0973b993f299090f9b3ba48af156a67df54c4085 (patch) | |
tree | 4401e66b0701993ae4ac7400390462e9b4a4e96b /gdk-pixbuf/pixops | |
parent | 315edfcce4be7cb07cc1e3644117c6b001819b3a (diff) | |
download | gtk+-0973b993f299090f9b3ba48af156a67df54c4085.tar.gz |
Use correct DLL and import library names, with GTK_API_VERSION in name,
2003-01-05 Tor Lillqvist <tml@iki.fi>
* gtk-zip.sh.in: Use correct DLL and import library names, with
GTK_API_VERSION in name, not GTK_MAJOR_VERSION.GTK_MINOR_VERSION.
(DEVZIP): Add gdk-pixbuf-query-loaders.exe.
* configure.in: Improve check for dimm.h.
* configure.in: Set SOEXT to 'so' on Unix, 'dll' on Win32. Used in
gdk-pixbuf/Makefile.am.
* gdk-pixbuf/makefile.mingw.in
* gdk-pixbuf/pixops/makefile.mingw.in
* gdk/makefile.mingw.in
* gdk/win32/makefile.mingw.in
* gtk/makefile.mingw.in: Remove. Not maintained anyway.
* gdk-pixbuf/Makefile.am
* gdk-pixbuf/pixops/Makefile.am
* gdk/Makefile.am
* gdk/win32/Makefile.am
* gtk/Makefile.am
* configure.in: Remove makefile.mingw{,.in} from here, too.
* README.win32: Updates. Don't mention the now removed
makefile.mingw files.
* gdk/gdk.def
* gtk/gtk.def: Add a couple of missing entries.
* gdk/gdkkeynames.c: Include <string.h> for strcmp() and memcpy().
* gdk/win32/gdkevents-win32.c: Move dimm.h header clash workaround
earlier.
* gdk/win32/rc/Makefile.am: Add hack to help
build/win32/lt-compile-resource decide which kind of libtool
object file to produce.
Diffstat (limited to 'gdk-pixbuf/pixops')
-rw-r--r-- | gdk-pixbuf/pixops/Makefile.am | 2 | ||||
-rw-r--r-- | gdk-pixbuf/pixops/makefile.mingw.in | 40 |
2 files changed, 0 insertions, 42 deletions
diff --git a/gdk-pixbuf/pixops/Makefile.am b/gdk-pixbuf/pixops/Makefile.am index 67c20444cd..16bc8d4b7b 100644 --- a/gdk-pixbuf/pixops/Makefile.am +++ b/gdk-pixbuf/pixops/Makefile.am @@ -29,6 +29,4 @@ libpixops_la_SOURCES = \ EXTRA_DIST = \ DETAILS \ - makefile.mingw \ - makefile.mingw.in \ makefile.msc diff --git a/gdk-pixbuf/pixops/makefile.mingw.in b/gdk-pixbuf/pixops/makefile.mingw.in deleted file mode 100644 index 42e8fae48a..0000000000 --- a/gdk-pixbuf/pixops/makefile.mingw.in +++ /dev/null @@ -1,40 +0,0 @@ -## Makefile for building libpixops.a with gcc on Win32 -## Use: make -f makefile.mingw - -TOP = ../../.. - -include $(TOP)/build/win32/make.mingw - -# Possibly override GTK+ version from build/win32/module.defs -GTK_VER = @GTK_MAJOR_VERSION@.@GTK_MINOR_VERSION@ - -OPTIMIZE = -g - -INCLUDES = -I .. -I ../.. -DEPCFLAGS = $(GLIB_CFLAGS) $(PNG_CFLAGS) $(ZLIB_CFLAGS) $(JPEG_CLFAGS) $(TIFF_CFLAGS) - -all : \ - ../../config.h \ - libpixops.a \ - timescale.exe - -libpixops_OBJECTS = \ - pixops.o \ - have_mmx.o \ - scale_line_22_33_mmx.o \ - composite_line_22_4a4_mmx.o \ - composite_line_color_22_4a4_mmx.o - -../../config.h : ../../config.h.win32 - cp $< $@ - -libpixops.a : $(libpixops_OBJECTS) - ar rv $@ $? - -timescale.exe : timescale.o libpixops.a - $(CC) $(CFLAGS) -o $@ timescale.o libpixops.a $(GLIB_LIBS) - -makefile.mingw: makefile.mingw.in - sed -e 's,@GTK_MAJOR[_]VERSION@,@GTK_MAJOR_VERSION@,' \ - -e 's,@GTK_MINOR[_]VERSION@,@GTK_MINOR_VERSION@,' <$< >$@ - |