summaryrefslogtreecommitdiff
path: root/Makerules
diff options
context:
space:
mode:
authorTor Andersson <tor.andersson@artifex.com>2011-10-21 02:13:08 +0200
committerTor Andersson <tor.andersson@artifex.com>2011-11-01 23:46:56 +0100
commit93a08378e62b5d9ca3ea1b54ce8f5be2995201f1 (patch)
treec26c400021cc2afbb2298171a35794f1a82e07ab /Makerules
parentb06b5688658c92140491546c25fb60d0ae22e146 (diff)
downloadmupdf-93a08378e62b5d9ca3ea1b54ce8f5be2995201f1.tar.xz
Tweak build scripts for iOS viewer.
Diffstat (limited to 'Makerules')
-rw-r--r--Makerules18
1 files changed, 6 insertions, 12 deletions
diff --git a/Makerules b/Makerules
index 43ba78e5..a4ce91b3 100644
--- a/Makerules
+++ b/Makerules
@@ -85,21 +85,15 @@ CROSSCOMPILE=yes
NOX11=yes
endif
-ifeq "$(OS)" "iphonesimulator"
-CC = $(PLATFORM_DEVELOPER_BIN_DIR)/gcc
-AR = $(PLATFORM_DEVELOPER_BIN_DIR)/ar
-CFLAGS += -arch i386 -isysroot $(SDKROOT)
-LDFLAGS += -arch i386 -isysroot $(SDKROOT)
-RANLIB_CMD = $(PLATFORM_DEVELOPER_BIN_DIR)/ranlib $@
-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)" "iphoneos"
+ifeq "$(OS)" "ios"
+# sadly, llvm generates invalid arm code when compiling freetype,
+# so no clang or llvm-gcc for us :(
CC = $(PLATFORM_DEVELOPER_BIN_DIR)/gcc
AR = $(PLATFORM_DEVELOPER_BIN_DIR)/ar
-CFLAGS += -arch armv7 -isysroot $(SDKROOT)
-LDFLAGS += -arch armv7 -isysroot $(SDKROOT)
RANLIB_CMD = $(PLATFORM_DEVELOPER_BIN_DIR)/ranlib $@
CROSSCOMPILE=yes
NOX11=yes