diff options
| author | ka <kai.ahrens@oracle.com> | 2011-03-24 07:52:29 +0100 |
|---|---|---|
| committer | ka <kai.ahrens@oracle.com> | 2011-03-24 07:52:29 +0100 |
| commit | c7ba800014c42b22c24c8bc676c5d04fa0c5d07b (patch) | |
| tree | 4066b41fec7f992ba22e0240dac3e67c2066a609 /gdk-pixbuf/makefile.mk | |
| parent | 7d2a0ad5c3c5a5f94cbfcf19e50d93bfc8fba68b (diff) | |
| parent | 50a751cc366e49f2b52d9f7783049c12536024ac (diff) | |
rsvglibs: added additional external lib gdk-pixbuf/minor build changes for external projects
Diffstat (limited to 'gdk-pixbuf/makefile.mk')
| -rwxr-xr-x[-rw-r--r--] | gdk-pixbuf/makefile.mk | 47 |
1 files changed, 31 insertions, 16 deletions
diff --git a/gdk-pixbuf/makefile.mk b/gdk-pixbuf/makefile.mk index 8e42c7787861..2e4f3d607104 100644..100755 --- a/gdk-pixbuf/makefile.mk +++ b/gdk-pixbuf/makefile.mk @@ -46,9 +46,10 @@ GDKPIXBUFVERSION=2.23.0 TARFILE_NAME=$(PRJNAME)-$(GDKPIXBUFVERSION) TARFILE_MD5=a7d6c5f2fe2d481149ed3ba807b5c043 + +.IF "$(OS)"=="MACOSX" PATCH_FILES=gdk-pixbuf-2.23.0.patch - CONFIGURE_DIR= CONFIGURE_ACTION=$(AUGMENT_LIBRARY_PATH) \ BASE_DEPENDENCIES_CFLAGS="-I$(SOLARINCDIR)$/external -I$(SOLARINCDIR)$/external/glib-2.0" \ @@ -57,22 +58,11 @@ CONFIGURE_ACTION=$(AUGMENT_LIBRARY_PATH) \ --prefix=$(SRC_ROOT)$/$(PRJNAME)$/$(MISC) \ CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS) -I$(SOLARINCDIR)$/external -I$(SOLARINCDIR)$/external$/glib-2.0 -I$(SOLARINCDIR)$/external$/libpng -I$(SOLARINCDIR)$/external$/libjpeg" \ LDFLAGS="-L$(SOLARLIBDIR) -lgobject-2.0 -lgio-2.0 -lgthread-2.0 -lgmodule-2.0 -lglib-2.0 -lintl" \ - --disable-glibtest \ - --without-libtiff - -## FIXME: libtiff + --disable-glibtest --without-libtiff -.IF "$(OS)" == "MACOSX" -CONFIGURE_FLAGS=CPPFLAGS="$(EXTRA_CDEFS) -I$(SOLARINCDIR)$/external$/libjpeg" -.ELSE -CONFIGURE_FLAGS=CPPFLAGS="-I$(SOLARINCDIR)$/external$/libjpeg" -.ENDIF - -BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) \ - $(GNUMAKE) +BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) $(GNUMAKE) BUILD_DIR=$(CONFIGURE_DIR) - -.IF "$(OS)"=="MACOSX" + EXTRPATH=LOADER OUT2LIB+=gdk-pixbuf$/.libs/libgdk_pixbuf-2.0.0.dylib @@ -89,8 +79,34 @@ OUT2INC+=gdk-pixbuf$/gdk-pixdata.h OUT2INC+=gdk-pixbuf$/gdk-pixbuf-enum-types.h OUT2INC+=gdk-pixbuf$/gdk-pixbuf-loader.h OUT2INC+=gdk-pixbuf$/gdk-pixbuf-transform.h + .ELIF "$(OS)"=="WNT" + +PATCH_FILES=gdk-pixbuf-2.23.0-win32.patch +ADDITIONAL_FILES=config.h.win32 glib-mkenums.pl msvc_recommended_pragmas.h +CONFIGURE_DIR= +CONFIGURE_ACTION= +BUILD_DIR=./gdk-pixbuf +BUILD_ACTION=nmake -f makefile.msc + +OUT2LIB+=gdk-pixbuf$/gdk_pixbuf-2.0.lib + +OUT2BIN+=gdk-pixbuf$/libgdk_pixbuf-2.0-0.dll + +OUT2INC+=gdk-pixbuf$/gdk-pixbuf-animation.h +OUT2INC+=gdk-pixbuf$/gdk-pixbuf-features.h +OUT2INC+=gdk-pixbuf$/gdk-pixbuf-marshal.h +OUT2INC+=gdk-pixbuf$/gdk-pixbuf.h +OUT2INC+=gdk-pixbuf$/gdk-pixbuf-core.h +OUT2INC+=gdk-pixbuf$/gdk-pixbuf-io.h +OUT2INC+=gdk-pixbuf$/gdk-pixbuf-simple-anim.h +OUT2INC+=gdk-pixbuf$/gdk-pixdata.h +OUT2INC+=gdk-pixbuf$/gdk-pixbuf-enum-types.h +OUT2INC+=gdk-pixbuf$/gdk-pixbuf-loader.h +OUT2INC+=gdk-pixbuf$/gdk-pixbuf-transform.h + .ELSE + .ENDIF # --- Targets ------------------------------------------------------ @@ -98,4 +114,3 @@ OUT2INC+=gdk-pixbuf$/gdk-pixbuf-transform.h .INCLUDE : set_ext.mk .INCLUDE : target.mk .INCLUDE : tg_ext.mk - |