[quartz] Delete the typedef of GdkDevicePrivate

[~andy/gtk] / gdk-pixbuf / makefile.msc

diff --git a/gdk-pixbuf/makefile.msc b/gdk-pixbuf/makefile.msc
index cf13aaeb1cfa2de1de67c0b4a3ea77ae6825cf19..7f6486afa1e7c6230de4ca03560670f419028d4a 100644 (file)
--- a/gdk-pixbuf/makefile.msc
+++ b/gdk-pixbuf/makefile.msc
@@ -11,30 +11,59 @@ PERL = perl
 
 GDK_PIXBUF_VER = 2.0
 
+# -DINCLUDE_gdiplus _replaces_ -DINCLUDE_bmp -DINCLUDE_gif -DINCLUDE_ico -DINCLUDE_jpeg  -DINCLUDE_tiff
+# but not yet -DINCLUDE_png 
+##USEGDIP=1
 # to get _working_ include modules we need respective defines ...
-BUILT_IN_FORMATS = -DINCLUDE_png -DINCLUDE_bmp -DINCLUDE_gif \
-       -DINCLUDE_ico -DINCLUDE_jpeg -DINCLUDE_xpm -DINCLUDE_wbmp \
+#   
+BUILT_IN_FORMATS = \
+!IFDEF USEGDIP
+       -DINCLUDE_gdiplus \
+!ELSE
+       -DINCLUDE_bmp -DINCLUDE_gif -DINCLUDE_ico -DINCLUDE_jpeg -DINCLUDE_tiff \
+!ENDIF
+       -DINCLUDE_png \
+       -DINCLUDE_xpm -DINCLUDE_wbmp \
        -DINCLUDE_pnm -DINCLUDE_ras
 
-# -DINCLUDE_tiff
-
-
-
 PKG_CFLAGS = -FImsvc_recommended_pragmas.h \
+!IFNDEF USEGDIP
+       $(JPEG_CFLAGS) $(TIFF_CFLAGS) \
+!ENDIF
        -I. -I.. $(GLIB_CFLAGS) \
        $(BUILT_IN_FORMATS) \
-       $(JPEG_CFLAGS) $(PNG_CFLAGS) $(TIFF_CFLAGS) $(INTL_CFLAGS) \
+       $(PNG_CFLAGS) $(INTL_CFLAGS) \
        $(G_DEBUGGING) \
        -DGDK_PIXBUF_ENABLE_BACKEND \
+       -DGTK_PREFIX=\"/just/some/non/existing/path/\" \
        -UUSE_GMODULE # use built-in
 #      -DUSE_GMODULE -DPIXBUF_LIBDIR=\".\"
 
-
 PKG_LINK = $(GLIB_LIBS) \
-#      $(TIFF_LIBS) \
-       $(JPEG_LIBS) $(PNG_LIBS) $(INTL_LIBS) \
+!IFNDEF USEGDIP
+       $(TIFF_LIBS) $(JPEG_LIBS) \
+!ENDIF
+       $(PNG_LIBS) $(INTL_LIBS) \
        pixops\pixops.lib \
  
+OBJECTS_NON_NATIVE = \
+       io-bmp.obj \
+       io-gif.obj \
+       io-ico.obj \
+       io-tiff.obj \
+       io-jpeg.obj \
+
+OBJECTS_NATIVE = \
+       io-gdip-animation.obj \
+       io-gdip-bmp.obj \
+       io-gdip-emf.obj \
+       io-gdip-gif.obj \
+       io-gdip-ico.obj \
+       io-gdip-jpeg.obj \
+       io-gdip-tiff.obj \
+       io-gdip-utils.obj \
+       io-gdip-wmf.obj
+
 OBJECTS = \
        gdk-pixbuf-enum-types.obj \
        gdk-pixbuf-animation.obj \
@@ -42,20 +71,22 @@ OBJECTS = \
        gdk-pixbuf-io.obj \
        gdk-pixbuf-loader.obj \
        gdk-pixbuf-scale.obj \
+       gdk-pixbuf-scaled-anim.obj \
        gdk-pixbuf-util.obj \
        gdk-pixbuf.obj \
+       gdk-pixbuf-simple-anim.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-xpm.obj \
-       io-jpeg.obj \
+!IFDEF USEGDIP
+       $(OBJECTS_NATIVE)
+!ELSE
+       $(OBJECTS_NON_NATIVE)
+!ENDIF
 
 gdk_pixbuf_headers =   \
        gdk-pixbuf.h    \
@@ -72,10 +103,14 @@ gdk-pixbuf-marshal.c: gdk-pixbuf-marshal.h gdk-pixbuf-marshal.list
 gdk-pixbuf-alias.h: gdk-pixbuf.symbols
        perl makegdkpixbufalias.pl < gdk-pixbuf.symbols > gdk-pixbuf-alias.h
 
-gdk_pixbuf.def: gdk-pixbuf.symbols 
+gdk_pixbuf.def: gdk-pixbuf.symbols makefile.msc
        echo EXPORTS > gdk_pixbuf.def
-       cl /EP -DINCLUDE_VARIABLES -DG_OS_WIN32 gdk-pixbuf.symbols >> gdk_pixbuf.def
+       cl /EP -DINCLUDE_VARIABLES -DG_OS_WIN32 -DALL_FILES \
+       -DG_GNUC_MALLOC= -DG_GNUC_CONST= -DG_GNUC_NULL_TERMINATED= -DG_GNUC_NORETURN= -DG_GNUC_PRINTF=;G_GNUC_PRINTF \
+       gdk-pixbuf.symbols >> gdk_pixbuf.def
 
+gdk-pixbuf-aliasdef.c: gdk-pixbuf.symbols
+        perl makegdkpixbufalias.pl -def < gdk-pixbuf.symbols > gdk-pixbuf-aliasdef.c
 
 ## common stuff
 
@@ -92,6 +127,7 @@ sub-pixops :
 all : \
        $(PRJ_TOP)\config.h \
        gdk-pixbuf-alias.h \
+       gdk-pixbuf-aliasdef.c \
        gdk-pixbuf-marshal.h \
        gdk-pixbuf-marshal.c \
        sub-pixops \
@@ -108,7 +144,7 @@ $(PACKAGE)-$(PKG_VER)s.lib : $(OBJECTS)
        lib /out:$(PACKAGE)-$(PKG_VER)s.lib $(OBJECTS) pixops\pixops.lib
 
 lib$(PACKAGE)-$(PKG_VER)-0.dll : $(OBJECTS) $(PACKAGE).def $(PACKAGE).res
-       $(CC) $(CFLAGS) -LD -Fe$@ $(OBJECTS) $(PKG_LINK) user32.lib advapi32.lib wsock32.lib $(PACKAGE).res \
+       $(CC) $(CFLAGS) -LD -Fe$@ $(OBJECTS) $(PKG_LINK) user32.lib advapi32.lib ole32.lib wsock32.lib $(PACKAGE).res \
        $(LDFLAGS) /implib:$(PACKAGE)-$(PKG_VER).lib /def:$(PACKAGE).def
 
 make-inline-pixbuf.exe : make-inline-pixbuf.c