diff options
| author | Robin Watts <robin.watts@artifex.com> | 2011-11-14 18:22:13 +0000 |
|---|---|---|
| committer | Robin Watts <robin.watts@artifex.com> | 2011-11-15 15:20:54 +0000 |
| commit | 9c0a49060475b2dea1e4c2668bebd1d566113a7b (patch) | |
| tree | 49e45a691cf105f4266d5c6b7242a4a3256c1200 /Makerules | |
| parent | 60c0544742931da63db623ad7a79ba3758704cc1 (diff) | |
| parent | fd6def85f22b598d4c278e76138ab7dccbb84c36 (diff) | |
| download | mupdf-9c0a49060475b2dea1e4c2668bebd1d566113a7b.tar.xz | |
Merge branch 'master' into context
Mostly redoing the xps_context to xps_document change and adding
contexts to newly written code.
Conflicts:
apps/pdfapp.c
apps/pdfapp.h
apps/x11_main.c
apps/xpsdraw.c
draw/draw_device.c
draw/draw_scale.c
fitz/base_object.c
fitz/fitz.h
pdf/mupdf.h
pdf/pdf_interpret.c
pdf/pdf_outline.c
pdf/pdf_page.c
xps/muxps.h
xps/xps_doc.c
xps/xps_xml.c
Diffstat (limited to 'Makerules')
| -rw-r--r-- | Makerules | 14 |
1 files changed, 14 insertions, 0 deletions
@@ -36,6 +36,7 @@ ifeq "$(OS)" "Darwin" SYS_FREETYPE_INC := -I/usr/X11R6/include/freetype2 CFLAGS += -I/usr/X11R6/include LDFLAGS += -L/usr/X11R6/lib +RANLIB_CMD = ranlib $@ X11_LIBS := -lX11 -lXext ifeq "$(arch)" "amd64" CFLAGS += -m64 @@ -58,6 +59,7 @@ endif # cygwin) # 2) do a non cross compile build (e.g. windows in MSVC) first. # 3) download the generated files from mupdf.com. + ifeq "$(OS)" "beagle-cross" CC = arm-none-linux-gnueabi-gcc LD = arm-none-linux-gnueabi-gcc @@ -84,3 +86,15 @@ CFLAGS += -O3 -mcpu=arm1136jf-s -mfpu=vfp -mfloat-abi=softfp -ffast-math -fsingl CROSSCOMPILE=yes NOX11=yes endif + +# Most variables when building for iOS are set up in ios/build_libs.sh, +# which is called from the Xcode project as a "Run Script" build step. +# The following section works for both device and simulator builds. + +ifeq "$(OS)" "ios" +CC = $(PLATFORM_DEVELOPER_BIN_DIR)/clang +AR = $(PLATFORM_DEVELOPER_BIN_DIR)/ar +RANLIB_CMD = $(PLATFORM_DEVELOPER_BIN_DIR)/ranlib $@ +CROSSCOMPILE=yes +NOX11=yes +endif |