diff options
| author | Tor Lillqvist <tml@iki.fi> | 2011-05-30 01:15:48 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2011-05-30 01:15:48 +0300 |
| commit | 9fc04f1763980a0238ec934c09c90d419c6d064a (patch) | |
| tree | 1c772cbe3ad435f37b265c81eee36a26ddd1abd6 /cairo | |
| parent | b2c1dd30f3db212c6bbd48394fca04668e0cde93 (diff) | |
Cross-compiling and iOS support
Diffstat (limited to 'cairo')
| -rw-r--r-- | cairo/cairo/makefile.mk | 12 | ||||
| -rw-r--r-- | cairo/pixman/makefile.mk | 11 |
2 files changed, 21 insertions, 2 deletions
diff --git a/cairo/cairo/makefile.mk b/cairo/cairo/makefile.mk index d6d17390db66..a077ec98af05 100644 --- a/cairo/cairo/makefile.mk +++ b/cairo/cairo/makefile.mk @@ -145,7 +145,15 @@ cairo_CFLAGS+=-march=i486 CONFIGURE_DIR= CONFIGURE_ACTION=.$/configure -CONFIGURE_FLAGS=--enable-xlib --enable-ft --disable-svg --enable-gtk-doc=no --enable-test-surfaces=no --enable-static=no ZLIB3RDLIB=$(ZLIB3RDLIB) COMPRESS=$(cairo_COMPRESS) +.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 "$(CROSS_COMPILING)"!="" +CONFIGURE_FLAGS+= --build="$(BUILD_PLATFORM)" --host="$(HOST_PLATFORM)" +.ENDIF BUILD_ACTION=$(GNUMAKE) BUILD_FLAGS+= -j$(EXTMAXPROCESS) BUILD_DIR=$(CONFIGURE_DIR) @@ -201,6 +209,8 @@ OUT2BIN+=src$/.libs$/*.dll OUT2LIB+=src$/release$/*.lib OUT2BIN+=src$/release$/*.dll .ENDIF +.ELIF "$(OS)"=="IOS" +OUT2LIB+=src$/.libs$/libcairo-1.a .ELSE OUT2LIB+=src$/.libs$/libcairo.so* .ENDIF diff --git a/cairo/pixman/makefile.mk b/cairo/pixman/makefile.mk index 6d2504b6fbb8..1f61bfa897a6 100644 --- a/cairo/pixman/makefile.mk +++ b/cairo/pixman/makefile.mk @@ -120,8 +120,15 @@ pixman_CFLAGS+=-fPIC CONFIGURE_DIR= CONFIGURE_ACTION=.$/configure -CONFIGURE_FLAGS=--enable-static=no --enable-shared=yes +.IF "$(OS)"=="IOS" +CONFIGURE_FLAGS=--disable-shared +.ELSE +CONFIGURE_FLAGS=--disable-static +.ENDIF CONFIGURE_FLAGS+=CFLAGS="$(pixman_CFLAGS)" +.IF "$(CROSS_COMPILING)"!="" +CONFIGURE_FLAGS+= --build="$(BUILD_PLATFORM)" --host="$(HOST_PLATFORM)" +.ENDIF BUILD_ACTION=$(GNUMAKE) BUILD_FLAGS+= -j$(EXTMAXPROCESS) BUILD_DIR=$(CONFIGURE_DIR) @@ -142,6 +149,8 @@ OUT2LIB+=pixman$/.libs$/*.a .ELSE OUT2LIB+=pixman$/release$/*.lib .ENDIF +.ELIF "$(OS)"=="IOS" +OUT2LIB+=pixman$/.libs$/libpixman-1.a .ELSE OUT2LIB+=pixman$/.libs$/libpixman-1.so* .ENDIF |