diff options
| author | Tor Lillqvist <tml@iki.fi> | 2011-07-01 02:23:55 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2011-07-01 02:24:04 +0300 |
| commit | b2320b1e49ee98dcc269fa2cc23655b805e6500e (patch) | |
| tree | 9b65794985f051b7bc0bdc30f3da48dfddd21d15 /cairo/cairo | |
| parent | ed0f6feebd0726931a8de289fa5f1720374297e0 (diff) | |
Enable building the "quartz" font backend without the "quartz" surface, for iOS
The quartz surface code won't build for iOS, but the font code
will. So let's try to use it. Maybe later make the surface build, too,
it might be trivial.
Diffstat (limited to 'cairo/cairo')
| -rw-r--r-- | cairo/cairo/makefile.mk | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/cairo/cairo/makefile.mk b/cairo/cairo/makefile.mk index 5cae5f05ff49..70dfdb069a95 100644 --- a/cairo/cairo/makefile.mk +++ b/cairo/cairo/makefile.mk @@ -143,21 +143,21 @@ cairo_CFLAGS+=-march=i486 CONFIGURE_DIR= -.IF "$(OS)"=="ANDROID" -# No pkg-config in the Android NDK +.IF "$(OS)"=="IOS" || "$(OS)"=="ANDROID" +# No pkg-config on MacOSX (for iOS) or 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 +CONFIGURE_FLAGS=--disable-shared --disable-xlib --disable-quartz --enable-quartz-font=yes .ELSE CONFIGURE_FLAGS=--disable-static --enable-xlib .ENDIF -.IF "$(OS)"=="ANDROID" -CONFIGURE_FLAGS+=--disable-ft +.IF "$(OS)"=="IOS" || "$(OS)"=="ANDROID" +CONFIGURE_FLAGS+=--disable-ft PKG_CONFIG=./dummy_pkg_config .ELSE CONFIGURE_FLAGS+=--enable-ft .ENDIF @@ -222,7 +222,7 @@ OUT2LIB+=src$/release$/*.lib OUT2BIN+=src$/release$/*.dll .ENDIF .ELIF "$(OS)"=="IOS" || "$(OS)"=="ANDROID" -OUT2LIB+=src$/.libs$/libcairo-1.a +OUT2LIB+=src$/.libs$/libcairo*.a .ELSE OUT2LIB+=src$/.libs$/libcairo.so* .ENDIF |