diff options
-rw-r--r-- | ios/MuPDF.xcodeproj/project.pbxproj | 8 | ||||
-rw-r--r-- | ios/build_libs.sh | 8 |
2 files changed, 10 insertions, 6 deletions
diff --git a/ios/MuPDF.xcodeproj/project.pbxproj b/ios/MuPDF.xcodeproj/project.pbxproj index 5430f38a..2e33f3c3 100644 --- a/ios/MuPDF.xcodeproj/project.pbxproj +++ b/ios/MuPDF.xcodeproj/project.pbxproj @@ -229,7 +229,7 @@ 968461EB14642DB00012AE09 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_BIT)"; + ARCHS = armv7; PRODUCT_NAME = Libraries; SDKROOT = iphoneos; SKIP_INSTALL = YES; @@ -239,7 +239,7 @@ 968461EC14642DB00012AE09 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_BIT)"; + ARCHS = armv7; PRODUCT_NAME = Libraries; SDKROOT = iphoneos; SKIP_INSTALL = YES; @@ -250,7 +250,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_32_BIT)"; + ARCHS = armv7; CODE_SIGN_IDENTITY = "iPhone Developer"; COPY_PHASE_STRIP = NO; FRAMEWORK_SEARCH_PATHS = ( @@ -284,7 +284,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_32_BIT)"; + ARCHS = armv7; CODE_SIGN_IDENTITY = "iPhone Developer"; COPY_PHASE_STRIP = YES; FRAMEWORK_SEARCH_PATHS = ( diff --git a/ios/build_libs.sh b/ios/build_libs.sh index 836601d1..9f06ab0b 100644 --- a/ios/build_libs.sh +++ b/ios/build_libs.sh @@ -5,7 +5,11 @@ # Also see "iOS" section in Makerules. echo Generating cmap and font files -make -C .. generate || exit 1 +echo "Apple broke Xcode external targets yet again, and I can't be bothered to fix it." +echo "Run the 'make generate' command manually from now on!" +echo "If you see an error while running GEN, you've forgotten." + +# make -C .. verbose=yes generate || exit 1 export OS=ios export build=$(echo $CONFIGURATION | tr A-Z a-z) @@ -14,7 +18,7 @@ case $ARCHS in armv6) ARCHFLAGS="-arch armv6 -mno-thumb" ;; armv7) ARCHFLAGS="-arch armv7 -mthumb" ;; i386) ARCHFLAGS="-arch i386" ;; - *) echo "Unknown architecture!"; exit 1 ;; + *) echo "Unknown architecture:" $ARCHS; exit 1 ;; esac export CFLAGS="$ARCHFLAGS -isysroot $SDKROOT" |