diff options
| author | Tor Lillqvist <tml@iki.fi> | 2011-06-10 00:07:14 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2011-06-10 00:07:14 +0300 |
| commit | 95b0fe9f51462b2ee158bf50b83ccc849422f690 (patch) | |
| tree | d75619d31a611f12ed66deb42b5811f333f37fcd /cairo/cairo | |
| parent | 3fafb2f3ead5fb533730ce5607e4421cfd85e28a (diff) | |
Fix configury for Android, but won't build
Diffstat (limited to 'cairo/cairo')
| -rw-r--r-- | cairo/cairo/makefile.mk | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/cairo/cairo/makefile.mk b/cairo/cairo/makefile.mk index 754ceba71f13..4059504e35bc 100644 --- a/cairo/cairo/makefile.mk +++ b/cairo/cairo/makefile.mk @@ -147,16 +147,32 @@ cairo_CFLAGS+=-march=i486 .ENDIF CONFIGURE_DIR= + +.IF "$(OS)"=="ANDROID" +# No pkg-config in the Android NDK +CONFIGURE_ACTION=cp $(SRC_ROOT)$/$(PRJNAME)$/cairo$/dummy_pkg_config . && .$/configure +.ELSE CONFIGURE_ACTION=.$/configure +.ENDIF + .IF "$(OS)"=="IOS" CONFIGURE_FLAGS=--disable-shared .ELSE CONFIGURE_FLAGS=--disable-static --enable-xlib .ENDIF -CONFIGURE_FLAGS+=--enable-ft --disable-svg --enable-gtk-doc=no --enable-test-surfaces=no ZLIB3RDLIB=$(ZLIB3RDLIB) COMPRESS=$(cairo_COMPRESS) + +.IF "$(OS)"=="ANDROID" +CONFIGURE_FLAGS+=--disable-ft +.ELSE +CONFIGURE_FLAGS+=--enable-ft +.ENDIF + +CONFIGURE_FLAGS+=--disable-svg --enable-gtk-doc=no --enable-test-surfaces=no ZLIB3RDLIB=$(ZLIB3RDLIB) COMPRESS=$(cairo_COMPRESS) + .IF "$(CROSS_COMPILING)"=="YES" CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) .ENDIF + BUILD_ACTION=$(GNUMAKE) BUILD_FLAGS+= -j$(EXTMAXPROCESS) BUILD_DIR=$(CONFIGURE_DIR) @@ -212,7 +228,7 @@ OUT2BIN+=src$/.libs$/*.dll OUT2LIB+=src$/release$/*.lib OUT2BIN+=src$/release$/*.dll .ENDIF -.ELIF "$(OS)"=="IOS" +.ELIF "$(OS)"=="IOS" || "$(OS)"=="ANDROID" OUT2LIB+=src$/.libs$/libcairo-1.a .ELSE OUT2LIB+=src$/.libs$/libcairo.so* |