diff options
| author | Hans Breuer <hans@breuer.org> | 2001-07-20 17:34:08 +0000 |
|---|---|---|
| committer | Hans Breuer <hans@src.gnome.org> | 2001-07-20 17:34:08 +0000 |
| commit | 9d1e828d08de78793e1f1ef68535b4d62b13e691 (patch) | |
| tree | b6e4573abbd77aa3061f5787a5b983a5b21fbe3b /gdk-pixbuf/makefile.msc | |
| parent | c0fcc8c6acd5a1a85e80fcd4be9851f2e2faf760 (diff) | |
| download | gdk-pixbuf-9d1e828d08de78793e1f1ef68535b4d62b13e691.tar.gz | |
don't 'g_tohl (*istream++)', but move pointer increment out of the macro,
2001-07-20 Hans Breuer <hans@breuer.org>
* gdk-pixdata.c : don't 'g_tohl (*istream++)', but move
pointer increment out of the macro, because at least one
compiler (msvc 5.0) gets confused otherwise (applies the
wrong increment).
* gdk_pixbuf.def : updated exports
* makefile.msc : reflect gdk-pixbuf-csource changes
Diffstat (limited to 'gdk-pixbuf/makefile.msc')
| -rw-r--r-- | gdk-pixbuf/makefile.msc | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/gdk-pixbuf/makefile.msc b/gdk-pixbuf/makefile.msc index 2685e45f2..ca11da023 100644 --- a/gdk-pixbuf/makefile.msc +++ b/gdk-pixbuf/makefile.msc @@ -18,8 +18,9 @@ PKG_CFLAGS = -I. -I.. $(GLIB_CFLAGS) \ PKG_LINK = $(GLIB_LIBS) \ - $(JPEG_LIBS) $(PNG_LIBS) $(TIFF_LIBS) $(INTL_LIBS) \ - pixops\pixops.lib +# $(TIFF_LIBS) \ + $(JPEG_LIBS) $(PNG_LIBS) $(INTL_LIBS) \ + pixops\pixops.lib \ OBJECTS = \ gdk-pixbuf-animation.obj \ @@ -29,14 +30,16 @@ OBJECTS = \ gdk-pixbuf-scale.obj \ gdk-pixbuf-util.obj \ gdk-pixbuf.obj \ + gdk-pixdata.obj \ io-bmp.obj \ io-wbmp.obj \ io-gif.obj \ + io-gif-animation.obj \ io-ico.obj \ io-png.obj \ io-pnm.obj \ io-ras.obj \ - io-tiff.obj \ +# io-tiff.obj \ io-xpm.obj \ io-jpeg.obj \ @@ -49,7 +52,7 @@ gdk-pixbuf-marshal.c: gdk-pixbuf-marshal.list ## common stuff # cl -? describes the options -CC = cl -G5 -GF $(OPTIMIZE) -W3 -nologo +CC = cl -G5 -GF $(OPTIMIZE) $(CRUNTIME) -W3 -nologo # No general LDFLAGS needed LDFLAGS = /link $(LINKDEBUG) @@ -63,7 +66,8 @@ all : \ gdk-pixbuf-marshal.c \ gdk-pixbuf-marshal.h \ $(PACKAGE)-$(PKG_VER).dll \ - make-inline-pixbuf.exe \ +# make-inline-pixbuf.exe \ + gdk-pixbuf-csource.exe \ test-gdk-pixbuf.exe $(PACKAGE).lib : $(OBJECTS) @@ -75,6 +79,9 @@ $(PACKAGE)-$(PKG_VER).dll : $(OBJECTS) $(PACKAGE).def 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 +gdk-pixbuf-csource.exe : gdk-pixbuf-csource.c + $(CC) $(PKG_CFLAGS) -Fegdk-pixbuf-csource.exe gdk-pixbuf-csource.c $(PKG_LINK) $(PACKAGE)-$(PKG_VER).lib + test-gdk-pixbuf.exe : test-gdk-pixbuf.c $(CC) $(PKG_CFLAGS) -Fetest-gdk-pixbuf.exe test-gdk-pixbuf.c $(PKG_LINK) $(PACKAGE)-$(PKG_VER).lib |