From 19a0eff677d6e046fe4af169b1bed32414a7dfe3 Mon Sep 17 00:00:00 2001 From: Tor Andersson Date: Tue, 25 Jun 2013 12:54:15 +0200 Subject: Update ios project for reshuffle. --- platform/ios/About.xps | Bin 76673 -> 0 bytes platform/ios/Default.png | Bin 0 -> 6540 bytes platform/ios/Default@2x.png | Bin 0 -> 16107 bytes platform/ios/Info.plist | 94 ++++--- platform/ios/MuPDF.xcodeproj/project.pbxproj | 353 +++++++++++++-------------- platform/ios/build_libs.sh | 10 +- platform/ios/main.m | 52 ++-- 7 files changed, 254 insertions(+), 255 deletions(-) delete mode 100644 platform/ios/About.xps create mode 100644 platform/ios/Default.png create mode 100644 platform/ios/Default@2x.png (limited to 'platform/ios') diff --git a/platform/ios/About.xps b/platform/ios/About.xps deleted file mode 100644 index 3fcec260..00000000 Binary files a/platform/ios/About.xps and /dev/null differ diff --git a/platform/ios/Default.png b/platform/ios/Default.png new file mode 100644 index 00000000..4c8ca6f6 Binary files /dev/null and b/platform/ios/Default.png differ diff --git a/platform/ios/Default@2x.png b/platform/ios/Default@2x.png new file mode 100644 index 00000000..35b84cff Binary files /dev/null and b/platform/ios/Default@2x.png differ diff --git a/platform/ios/Info.plist b/platform/ios/Info.plist index 0595910d..e21b5dc5 100644 --- a/platform/ios/Info.plist +++ b/platform/ios/Info.plist @@ -6,10 +6,63 @@ en CFBundleDisplayName ${PRODUCT_NAME} + CFBundleDocumentTypes + + + CFBundleTypeName + PDF + LSHandlerRank + Alternate + LSItemContentTypes + + com.adobe.pdf + + + + CFBundleTypeName + XPS + LSHandlerRank + Alternate + LSItemContentTypes + + com.microsoft.xps + + + + CFBundleTypeName + CBZ + LSHandlerRank + Alternate + LSItemContentTypes + + public.zip-archive + + + CFBundleExecutable ${EXECUTABLE_NAME} CFBundleIconFiles - + + Icon.png + Icon@2x.png + Icon-72.png + Icon-72@2x.png + + CFBundleIcons + + CFBundlePrimaryIcon + + CFBundleIconFiles + + Icon.png + Icon@2x.png + Icon-72.png + Icon-72@2x.png + + UIPrerenderedIcon + + + CFBundleIdentifier com.artifex.mupdf CFBundleInfoDictionaryVersion @@ -19,11 +72,11 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.2 + 1.3 CFBundleSignature ???? CFBundleVersion - 1.2 + 1.3 LSRequiresIPhoneOS UIFileSharingEnabled @@ -38,8 +91,8 @@ UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft - UIInterfaceOrientationLandscapeRight UIInterfaceOrientationPortraitUpsideDown + UIInterfaceOrientationLandscapeRight UISupportedInterfaceOrientations~ipad @@ -48,39 +101,6 @@ UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight - CFBundleDocumentTypes - - - CFBundleTypeName - PDF - LSItemContentTypes - - com.adobe.pdf - - LSHandlerRank - Alternate - - - LSItemContentTypes - - com.microsoft.xps - - CFBundleTypeName - XPS - LSHandlerRank - Alternate - - - CFBundleTypeName - CBZ - LSItemContentTypes - - public.zip-archive - - LSHandlerRank - Alternate - - UTImportedTypeDeclarations diff --git a/platform/ios/MuPDF.xcodeproj/project.pbxproj b/platform/ios/MuPDF.xcodeproj/project.pbxproj index 2e33f3c3..fa2df18b 100644 --- a/platform/ios/MuPDF.xcodeproj/project.pbxproj +++ b/platform/ios/MuPDF.xcodeproj/project.pbxproj @@ -7,189 +7,199 @@ objects = { /* Begin PBXBuildFile section */ - 9668C8D91476A30200D7BA52 /* About.xps in Resources */ = {isa = PBXBuildFile; fileRef = 9668C8D81476A30200D7BA52 /* About.xps */; }; - 968F2E9C14539C880085264E /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 968F2E9B14539C880085264E /* UIKit.framework */; }; - 968F2E9E14539C880085264E /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 968F2E9D14539C880085264E /* Foundation.framework */; }; - 968F2EA014539C880085264E /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 968F2E9F14539C880085264E /* CoreGraphics.framework */; }; - 968F2EB014539CDA0085264E /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 968F2E9014539BEB0085264E /* main.m */; }; - 96A4739B147C1C3A003D757D /* libLibraries.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 968461E214642DB00012AE09 /* libLibraries.a */; }; - 96B6AF8315D16A7E00EAAF7B /* x_alt_blue.png in Resources */ = {isa = PBXBuildFile; fileRef = 96B6AF8115D16A7E00EAAF7B /* x_alt_blue.png */; }; - 96B6AF8415D16A7E00EAAF7B /* x_alt_blue@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 96B6AF8215D16A7E00EAAF7B /* x_alt_blue@2x.png */; }; - 96BD2B38145AC485001CEBC3 /* Icon-72.png in Resources */ = {isa = PBXBuildFile; fileRef = 96BD2B35145AC485001CEBC3 /* Icon-72.png */; }; - 96BD2B39145AC485001CEBC3 /* Icon.png in Resources */ = {isa = PBXBuildFile; fileRef = 96BD2B36145AC485001CEBC3 /* Icon.png */; }; - 96EC0F931672AAC60007F804 /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 96EC0F921672AAC60007F804 /* Default-568h@2x.png */; }; - 96F2341514603FBA004A8A22 /* Icon@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 96F2341414603FBA004A8A22 /* Icon@2x.png */; }; + 968E1E411779A54F0050CEA3 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 968E1E401779A54F0050CEA3 /* UIKit.framework */; }; + 968E1E431779A54F0050CEA3 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 968E1E421779A54F0050CEA3 /* Foundation.framework */; }; + 968E1E451779A54F0050CEA3 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 968E1E441779A54F0050CEA3 /* CoreGraphics.framework */; }; + 968E1E531779A54F0050CEA3 /* Default.png in Resources */ = {isa = PBXBuildFile; fileRef = 968E1E521779A54F0050CEA3 /* Default.png */; }; + 968E1E551779A54F0050CEA3 /* Default@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 968E1E541779A54F0050CEA3 /* Default@2x.png */; }; + 968E1E571779A54F0050CEA3 /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 968E1E561779A54F0050CEA3 /* Default-568h@2x.png */; }; + 96C8ED011779A88E00A30AF4 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 96C8ED001779A88E00A30AF4 /* main.m */; }; + 96C8ED181779A9AE00A30AF4 /* libfreetype.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 96C8ED111779A9AE00A30AF4 /* libfreetype.a */; }; + 96C8ED191779A9AE00A30AF4 /* libjbig2dec.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 96C8ED121779A9AE00A30AF4 /* libjbig2dec.a */; }; + 96C8ED1A1779A9AF00A30AF4 /* libjpeg.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 96C8ED131779A9AE00A30AF4 /* libjpeg.a */; }; + 96C8ED1B1779A9AF00A30AF4 /* libmupdf-js-none.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 96C8ED141779A9AE00A30AF4 /* libmupdf-js-none.a */; }; + 96C8ED1C1779A9AF00A30AF4 /* libmupdf.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 96C8ED151779A9AE00A30AF4 /* libmupdf.a */; }; + 96C8ED1D1779A9AF00A30AF4 /* libopenjpeg.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 96C8ED161779A9AE00A30AF4 /* libopenjpeg.a */; }; + 96C8ED1E1779A9AF00A30AF4 /* libz.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 96C8ED171779A9AE00A30AF4 /* libz.a */; }; + 96E1CDEE1779A60700FCF717 /* Icon-72.png in Resources */ = {isa = PBXBuildFile; fileRef = 96E1CDE71779A60700FCF717 /* Icon-72.png */; }; + 96E1CDEF1779A60700FCF717 /* Icon-72@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 96E1CDE81779A60700FCF717 /* Icon-72@2x.png */; }; + 96E1CDF01779A60700FCF717 /* Icon.png in Resources */ = {isa = PBXBuildFile; fileRef = 96E1CDE91779A60700FCF717 /* Icon.png */; }; + 96E1CDF11779A60700FCF717 /* Icon@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 96E1CDEA1779A60700FCF717 /* Icon@2x.png */; }; + 96E1CDF21779A60700FCF717 /* iTunesArtwork.png in Resources */ = {isa = PBXBuildFile; fileRef = 96E1CDEB1779A60700FCF717 /* iTunesArtwork.png */; }; + 96E1CDF31779A60700FCF717 /* x_alt_blue.png in Resources */ = {isa = PBXBuildFile; fileRef = 96E1CDEC1779A60700FCF717 /* x_alt_blue.png */; }; + 96E1CDF41779A60700FCF717 /* x_alt_blue@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 96E1CDED1779A60700FCF717 /* x_alt_blue@2x.png */; }; /* End PBXBuildFile section */ -/* Begin PBXContainerItemProxy section */ - 968461EE14642E3A0012AE09 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 96A3B27614539BAD00D0A895 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 968461E114642DB00012AE09; - remoteInfo = Libraries; - }; -/* End PBXContainerItemProxy section */ - /* Begin PBXFileReference section */ - 9668C8D81476A30200D7BA52 /* About.xps */ = {isa = PBXFileReference; lastKnownFileType = file; path = About.xps; sourceTree = ""; }; - 968461E214642DB00012AE09 /* libLibraries.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libLibraries.a; sourceTree = BUILT_PRODUCTS_DIR; }; - 968F2E8E14539BEB0085264E /* build_libs.sh */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = build_libs.sh; sourceTree = ""; }; - 968F2E8F14539BEB0085264E /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 968F2E9014539BEB0085264E /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; - 968F2E9714539C880085264E /* MuPDF.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = MuPDF.app; sourceTree = BUILT_PRODUCTS_DIR; }; - 968F2E9B14539C880085264E /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = Library/Frameworks/UIKit.framework; sourceTree = DEVELOPER_DIR; }; - 968F2E9D14539C880085264E /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = Library/Frameworks/Foundation.framework; sourceTree = DEVELOPER_DIR; }; - 968F2E9F14539C880085264E /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = Library/Frameworks/CoreGraphics.framework; sourceTree = DEVELOPER_DIR; }; - 96B6AF8115D16A7E00EAAF7B /* x_alt_blue.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = x_alt_blue.png; sourceTree = ""; }; - 96B6AF8215D16A7E00EAAF7B /* x_alt_blue@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "x_alt_blue@2x.png"; sourceTree = ""; }; - 96BD2B35145AC485001CEBC3 /* Icon-72.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-72.png"; sourceTree = ""; }; - 96BD2B36145AC485001CEBC3 /* Icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Icon.png; sourceTree = ""; }; - 96EC0F921672AAC60007F804 /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h@2x.png"; sourceTree = ""; }; - 96F2341414603FBA004A8A22 /* Icon@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon@2x.png"; sourceTree = ""; }; + 968E1E3D1779A54F0050CEA3 /* MuPDF.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = MuPDF.app; sourceTree = BUILT_PRODUCTS_DIR; }; + 968E1E401779A54F0050CEA3 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; }; + 968E1E421779A54F0050CEA3 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; + 968E1E441779A54F0050CEA3 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; }; + 968E1E481779A54F0050CEA3 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = Info.plist; sourceTree = ""; }; + 968E1E521779A54F0050CEA3 /* Default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Default.png; sourceTree = ""; }; + 968E1E541779A54F0050CEA3 /* Default@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default@2x.png"; sourceTree = ""; }; + 968E1E561779A54F0050CEA3 /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h@2x.png"; sourceTree = ""; }; + 96C8ED001779A88E00A30AF4 /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; + 96C8ED111779A9AE00A30AF4 /* libfreetype.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libfreetype.a; sourceTree = BUILT_PRODUCTS_DIR; }; + 96C8ED121779A9AE00A30AF4 /* libjbig2dec.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libjbig2dec.a; sourceTree = BUILT_PRODUCTS_DIR; }; + 96C8ED131779A9AE00A30AF4 /* libjpeg.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libjpeg.a; sourceTree = BUILT_PRODUCTS_DIR; }; + 96C8ED141779A9AE00A30AF4 /* libmupdf-js-none.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libmupdf-js-none.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + 96C8ED151779A9AE00A30AF4 /* libmupdf.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libmupdf.a; sourceTree = BUILT_PRODUCTS_DIR; }; + 96C8ED161779A9AE00A30AF4 /* libopenjpeg.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libopenjpeg.a; sourceTree = BUILT_PRODUCTS_DIR; }; + 96C8ED171779A9AE00A30AF4 /* libz.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libz.a; sourceTree = BUILT_PRODUCTS_DIR; }; + 96E1CDE71779A60700FCF717 /* Icon-72.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-72.png"; sourceTree = ""; }; + 96E1CDE81779A60700FCF717 /* Icon-72@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-72@2x.png"; sourceTree = ""; }; + 96E1CDE91779A60700FCF717 /* Icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Icon.png; sourceTree = ""; }; + 96E1CDEA1779A60700FCF717 /* Icon@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon@2x.png"; sourceTree = ""; }; + 96E1CDEB1779A60700FCF717 /* iTunesArtwork.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = iTunesArtwork.png; sourceTree = ""; }; + 96E1CDEC1779A60700FCF717 /* x_alt_blue.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = x_alt_blue.png; sourceTree = ""; }; + 96E1CDED1779A60700FCF717 /* x_alt_blue@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "x_alt_blue@2x.png"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ - 968F2E9414539C880085264E /* Frameworks */ = { + 968E1E3A1779A54F0050CEA3 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 968F2E9C14539C880085264E /* UIKit.framework in Frameworks */, - 968F2E9E14539C880085264E /* Foundation.framework in Frameworks */, - 968F2EA014539C880085264E /* CoreGraphics.framework in Frameworks */, - 96A4739B147C1C3A003D757D /* libLibraries.a in Frameworks */, + 968E1E411779A54F0050CEA3 /* UIKit.framework in Frameworks */, + 968E1E431779A54F0050CEA3 /* Foundation.framework in Frameworks */, + 968E1E451779A54F0050CEA3 /* CoreGraphics.framework in Frameworks */, + 96C8ED1C1779A9AF00A30AF4 /* libmupdf.a in Frameworks */, + 96C8ED1B1779A9AF00A30AF4 /* libmupdf-js-none.a in Frameworks */, + 96C8ED181779A9AE00A30AF4 /* libfreetype.a in Frameworks */, + 96C8ED191779A9AE00A30AF4 /* libjbig2dec.a in Frameworks */, + 96C8ED1A1779A9AF00A30AF4 /* libjpeg.a in Frameworks */, + 96C8ED1D1779A9AF00A30AF4 /* libopenjpeg.a in Frameworks */, + 96C8ED1E1779A9AF00A30AF4 /* libz.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 968F2E9214539BF10085264E /* Sources */ = { + 968E1E341779A54F0050CEA3 = { isa = PBXGroup; children = ( - 9668C8D81476A30200D7BA52 /* About.xps */, - 96BD2B36145AC485001CEBC3 /* Icon.png */, - 96F2341414603FBA004A8A22 /* Icon@2x.png */, - 96BD2B35145AC485001CEBC3 /* Icon-72.png */, - 96B6AF8115D16A7E00EAAF7B /* x_alt_blue.png */, - 96B6AF8215D16A7E00EAAF7B /* x_alt_blue@2x.png */, - 968F2E8F14539BEB0085264E /* Info.plist */, - 968F2E8E14539BEB0085264E /* build_libs.sh */, - 968F2E9014539BEB0085264E /* main.m */, + 968E1E461779A54F0050CEA3 /* Files */, + 968E1E3F1779A54F0050CEA3 /* Frameworks */, + 968E1E3E1779A54F0050CEA3 /* Products */, ); - name = Sources; sourceTree = ""; }; - 968F2E9814539C880085264E /* Products */ = { + 968E1E3E1779A54F0050CEA3 /* Products */ = { isa = PBXGroup; children = ( - 968F2E9714539C880085264E /* MuPDF.app */, - 968461E214642DB00012AE09 /* libLibraries.a */, + 968E1E3D1779A54F0050CEA3 /* MuPDF.app */, + 96C8ED151779A9AE00A30AF4 /* libmupdf.a */, + 96C8ED141779A9AE00A30AF4 /* libmupdf-js-none.a */, + 96C8ED111779A9AE00A30AF4 /* libfreetype.a */, + 96C8ED121779A9AE00A30AF4 /* libjbig2dec.a */, + 96C8ED131779A9AE00A30AF4 /* libjpeg.a */, + 96C8ED161779A9AE00A30AF4 /* libopenjpeg.a */, + 96C8ED171779A9AE00A30AF4 /* libz.a */, ); name = Products; sourceTree = ""; }; - 968F2E9A14539C880085264E /* Frameworks */ = { + 968E1E3F1779A54F0050CEA3 /* Frameworks */ = { isa = PBXGroup; children = ( - 968F2E9B14539C880085264E /* UIKit.framework */, - 968F2E9D14539C880085264E /* Foundation.framework */, - 968F2E9F14539C880085264E /* CoreGraphics.framework */, + 968E1E401779A54F0050CEA3 /* UIKit.framework */, + 968E1E421779A54F0050CEA3 /* Foundation.framework */, + 968E1E441779A54F0050CEA3 /* CoreGraphics.framework */, ); name = Frameworks; sourceTree = ""; }; - 96A3B27414539BAD00D0A895 = { + 968E1E461779A54F0050CEA3 /* Files */ = { isa = PBXGroup; children = ( - 96EC0F921672AAC60007F804 /* Default-568h@2x.png */, - 968F2E9214539BF10085264E /* Sources */, - 968F2E9A14539C880085264E /* Frameworks */, - 968F2E9814539C880085264E /* Products */, + 96E1CDE71779A60700FCF717 /* Icon-72.png */, + 96E1CDE81779A60700FCF717 /* Icon-72@2x.png */, + 96E1CDE91779A60700FCF717 /* Icon.png */, + 96E1CDEA1779A60700FCF717 /* Icon@2x.png */, + 96E1CDEB1779A60700FCF717 /* iTunesArtwork.png */, + 96E1CDEC1779A60700FCF717 /* x_alt_blue.png */, + 96C8ED001779A88E00A30AF4 /* main.m */, + 96E1CDED1779A60700FCF717 /* x_alt_blue@2x.png */, + 968E1E481779A54F0050CEA3 /* Info.plist */, + 968E1E521779A54F0050CEA3 /* Default.png */, + 968E1E541779A54F0050CEA3 /* Default@2x.png */, + 968E1E561779A54F0050CEA3 /* Default-568h@2x.png */, ); - sourceTree = ""; + name = Files; + sourceTree = SOURCE_ROOT; }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ - 968461E114642DB00012AE09 /* Libraries */ = { - isa = PBXNativeTarget; - buildConfigurationList = 968461EA14642DB00012AE09 /* Build configuration list for PBXNativeTarget "Libraries" */; - buildPhases = ( - 968461ED14642DE50012AE09 /* ShellScript */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = Libraries; - productName = Libraries; - productReference = 968461E214642DB00012AE09 /* libLibraries.a */; - productType = "com.apple.product-type.library.static"; - }; - 968F2E9614539C880085264E /* MuPDF */ = { + 968E1E3C1779A54F0050CEA3 /* MuPDF */ = { isa = PBXNativeTarget; - buildConfigurationList = 968F2EAD14539C880085264E /* Build configuration list for PBXNativeTarget "MuPDF" */; + buildConfigurationList = 968E1E5A1779A54F0050CEA3 /* Build configuration list for PBXNativeTarget "MuPDF" */; buildPhases = ( - 968F2E9314539C880085264E /* Sources */, - 968F2E9414539C880085264E /* Frameworks */, - 968F2E9514539C880085264E /* Resources */, + 9614D56A1779A81D00F1879E /* ShellScript */, + 968E1E391779A54F0050CEA3 /* Sources */, + 968E1E3A1779A54F0050CEA3 /* Frameworks */, + 968E1E3B1779A54F0050CEA3 /* Resources */, ); buildRules = ( ); dependencies = ( - 968461EF14642E3A0012AE09 /* PBXTargetDependency */, ); name = MuPDF; productName = MuPDF; - productReference = 968F2E9714539C880085264E /* MuPDF.app */; + productReference = 968E1E3D1779A54F0050CEA3 /* MuPDF.app */; productType = "com.apple.product-type.application"; }; /* End PBXNativeTarget section */ /* Begin PBXProject section */ - 96A3B27614539BAD00D0A895 /* Project object */ = { + 968E1E351779A54F0050CEA3 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0420; + CLASSPREFIX = Mu; + LastUpgradeCheck = 0460; + ORGANIZATIONNAME = "Artifex Software, Inc"; }; - buildConfigurationList = 96A3B27914539BAD00D0A895 /* Build configuration list for PBXProject "MuPDF" */; + buildConfigurationList = 968E1E381779A54F0050CEA3 /* Build configuration list for PBXProject "MuPDF" */; compatibilityVersion = "Xcode 3.2"; developmentRegion = English; hasScannedForEncodings = 0; knownRegions = ( en, ); - mainGroup = 96A3B27414539BAD00D0A895; - productRefGroup = 968F2E9814539C880085264E /* Products */; + mainGroup = 968E1E341779A54F0050CEA3; + productRefGroup = 968E1E3E1779A54F0050CEA3 /* Products */; projectDirPath = ""; projectRoot = ""; targets = ( - 968F2E9614539C880085264E /* MuPDF */, - 968461E114642DB00012AE09 /* Libraries */, + 968E1E3C1779A54F0050CEA3 /* MuPDF */, ); }; /* End PBXProject section */ /* Begin PBXResourcesBuildPhase section */ - 968F2E9514539C880085264E /* Resources */ = { + 968E1E3B1779A54F0050CEA3 /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - 96BD2B38145AC485001CEBC3 /* Icon-72.png in Resources */, - 96BD2B39145AC485001CEBC3 /* Icon.png in Resources */, - 96F2341514603FBA004A8A22 /* Icon@2x.png in Resources */, - 9668C8D91476A30200D7BA52 /* About.xps in Resources */, - 96B6AF8315D16A7E00EAAF7B /* x_alt_blue.png in Resources */, - 96B6AF8415D16A7E00EAAF7B /* x_alt_blue@2x.png in Resources */, - 96EC0F931672AAC60007F804 /* Default-568h@2x.png in Resources */, + 968E1E531779A54F0050CEA3 /* Default.png in Resources */, + 968E1E551779A54F0050CEA3 /* Default@2x.png in Resources */, + 968E1E571779A54F0050CEA3 /* Default-568h@2x.png in Resources */, + 96E1CDEE1779A60700FCF717 /* Icon-72.png in Resources */, + 96E1CDEF1779A60700FCF717 /* Icon-72@2x.png in Resources */, + 96E1CDF01779A60700FCF717 /* Icon.png in Resources */, + 96E1CDF11779A60700FCF717 /* Icon@2x.png in Resources */, + 96E1CDF21779A60700FCF717 /* iTunesArtwork.png in Resources */, + 96E1CDF31779A60700FCF717 /* x_alt_blue.png in Resources */, + 96E1CDF41779A60700FCF717 /* x_alt_blue@2x.png in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 968461ED14642DE50012AE09 /* ShellScript */ = { + 9614D56A1779A81D00F1879E /* ShellScript */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -197,66 +207,45 @@ inputPaths = ( ); outputPaths = ( - "$(DERIVED_FILE_DIR)/libLibraries.a", + "$(DERIVED_FILE_DIR)/libmupdf.a", + "$(DERIVED_FILE_DIR)/libmupdf-js-none.a", + "$(DERIVED_FILE_DIR)/libfreetype.a", + "$(DERIVED_FILE_DIR)/libjbig2dec.a", + "$(DERIVED_FILE_DIR)/libjpeg.a", + "$(DERIVED_FILE_DIR)/libopenjpeg.a", + "$(DERIVED_FILE_DIR)/libz.a", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; shellScript = "bash build_libs.sh"; - showEnvVarsInLog = 0; }; /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ - 968F2E9314539C880085264E /* Sources */ = { + 968E1E391779A54F0050CEA3 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 968F2EB014539CDA0085264E /* main.m in Sources */, + 96C8ED011779A88E00A30AF4 /* main.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXSourcesBuildPhase section */ -/* Begin PBXTargetDependency section */ - 968461EF14642E3A0012AE09 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 968461E114642DB00012AE09 /* Libraries */; - targetProxy = 968461EE14642E3A0012AE09 /* PBXContainerItemProxy */; - }; -/* End PBXTargetDependency section */ - /* Begin XCBuildConfiguration section */ - 968461EB14642DB00012AE09 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ARCHS = armv7; - PRODUCT_NAME = Libraries; - SDKROOT = iphoneos; - SKIP_INSTALL = YES; - }; - name = Debug; - }; - 968461EC14642DB00012AE09 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ARCHS = armv7; - PRODUCT_NAME = Libraries; - SDKROOT = iphoneos; - SKIP_INSTALL = YES; - }; - name = Release; - }; - 968F2EAE14539C880085264E /* Debug */ = { + 968E1E581779A54F0050CEA3 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = armv7; - CODE_SIGN_IDENTITY = "iPhone Developer"; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COPY_PHASE_STRIP = NO; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "\"$(DEVELOPER_FRAMEWORKS_DIR)\"", - ); GCC_C_LANGUAGE_STANDARD = gnu99; GCC_DYNAMIC_NO_PIC = NO; GCC_OPTIMIZATION_LEVEL = 0; @@ -265,93 +254,89 @@ "$(inherited)", ); GCC_SYMBOLS_PRIVATE_EXTERN = NO; - GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_VARIABLE = YES; - HEADER_SEARCH_PATHS = "../**"; - INFOPLIST_FILE = Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 5.0; - LIBRARY_SEARCH_PATHS = "$(inherited)"; - PRODUCT_NAME = "$(TARGET_NAME)"; - PROVISIONING_PROFILE = ""; + IPHONEOS_DEPLOYMENT_TARGET = 6.1; + ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; - WRAPPER_EXTENSION = app; }; name = Debug; }; - 968F2EAF14539C880085264E /* Release */ = { + 968E1E591779A54F0050CEA3 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = armv7; - CODE_SIGN_IDENTITY = "iPhone Developer"; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COPY_PHASE_STRIP = YES; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "\"$(DEVELOPER_FRAMEWORKS_DIR)\"", - ); GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_VARIABLE = YES; - HEADER_SEARCH_PATHS = "../**"; - INFOPLIST_FILE = Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 5.0; - LIBRARY_SEARCH_PATHS = "$(inherited)"; + IPHONEOS_DEPLOYMENT_TARGET = 6.1; OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1"; - PRODUCT_NAME = "$(TARGET_NAME)"; - PROVISIONING_PROFILE = ""; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; VALIDATE_PRODUCT = YES; - WRAPPER_EXTENSION = app; }; name = Release; }; - 96A3B27B14539BAD00D0A895 /* Debug */ = { + 968E1E5B1779A54F0050CEA3 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + INFOPLIST_FILE = "$(SRCROOT)/Info.plist"; + IPHONEOS_DEPLOYMENT_TARGET = 5.0; + LIBRARY_SEARCH_PATHS = "$(inherited)"; + PRODUCT_NAME = "$(TARGET_NAME)"; + TARGETED_DEVICE_FAMILY = "1,2"; + USER_HEADER_SEARCH_PATHS = ../../include; + WRAPPER_EXTENSION = app; }; name = Debug; }; - 96A3B27C14539BAD00D0A895 /* Release */ = { + 968E1E5C1779A54F0050CEA3 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + INFOPLIST_FILE = "$(SRCROOT)/Info.plist"; + IPHONEOS_DEPLOYMENT_TARGET = 5.0; + LIBRARY_SEARCH_PATHS = "$(inherited)"; + PRODUCT_NAME = "$(TARGET_NAME)"; + TARGETED_DEVICE_FAMILY = "1,2"; + USER_HEADER_SEARCH_PATHS = ../../include; + WRAPPER_EXTENSION = app; }; name = Release; }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - 968461EA14642DB00012AE09 /* Build configuration list for PBXNativeTarget "Libraries" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 968461EB14642DB00012AE09 /* Debug */, - 968461EC14642DB00012AE09 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 968F2EAD14539C880085264E /* Build configuration list for PBXNativeTarget "MuPDF" */ = { + 968E1E381779A54F0050CEA3 /* Build configuration list for PBXProject "MuPDF" */ = { isa = XCConfigurationList; buildConfigurations = ( - 968F2EAE14539C880085264E /* Debug */, - 968F2EAF14539C880085264E /* Release */, + 968E1E581779A54F0050CEA3 /* Debug */, + 968E1E591779A54F0050CEA3 /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 96A3B27914539BAD00D0A895 /* Build configuration list for PBXProject "MuPDF" */ = { + 968E1E5A1779A54F0050CEA3 /* Build configuration list for PBXNativeTarget "MuPDF" */ = { isa = XCConfigurationList; buildConfigurations = ( - 96A3B27B14539BAD00D0A895 /* Debug */, - 96A3B27C14539BAD00D0A895 /* Release */, + 968E1E5B1779A54F0050CEA3 /* Debug */, + 968E1E5C1779A54F0050CEA3 /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; /* End XCConfigurationList section */ }; - rootObject = 96A3B27614539BAD00D0A895 /* Project object */; + rootObject = 968E1E351779A54F0050CEA3 /* Project object */; } diff --git a/platform/ios/build_libs.sh b/platform/ios/build_libs.sh index 9f06ab0b..915145d9 100644 --- a/platform/ios/build_libs.sh +++ b/platform/ios/build_libs.sh @@ -23,15 +23,15 @@ esac export CFLAGS="$ARCHFLAGS -isysroot $SDKROOT" export LDFLAGS="$ARCHFLAGS -isysroot $SDKROOT" -export OUT=build/$build-$OS-$ARCHS + +OUT=build/$build-$OS-$ARCHS echo Building libraries for $ARCHS. -make -C .. libs || exit 1 +make -C ../.. OUT=$OUT third libs || exit 1 echo Assembling final library in $TARGET_BUILD_DIR/. mkdir -p "$TARGET_BUILD_DIR" -rm -f $TARGET_BUILD_DIR/libLibraries.a -ar cr $TARGET_BUILD_DIR/libLibraries.a ../$OUT/*.o -ranlib $TARGET_BUILD_DIR/libLibraries.a +cp -f ../../$OUT/lib*.a $TARGET_BUILD_DIR +ranlib $TARGET_BUILD_DIR/lib*.a echo Done. diff --git a/platform/ios/main.m b/platform/ios/main.m index 5668d415..79910b51 100644 --- a/platform/ios/main.m +++ b/platform/ios/main.m @@ -4,7 +4,7 @@ #undef MIN #undef MAX -#include "fitz/fitz.h" +#include "mupdf/fitz.h" #define GAP 20 #define INDICATOR_Y -44-24 @@ -251,7 +251,7 @@ static UIImage *renderPage(fz_document *doc, fz_page *page, CGSize screenSize) fz_scale(&ctm, scale.width, scale.height); bbox = (fz_irect){0, 0, pageSize.width * scale.width, pageSize.height * scale.height}; - pix = fz_new_pixmap_with_bbox(ctx, fz_device_rgb, &bbox); + pix = fz_new_pixmap_with_bbox(ctx, fz_device_rgb(ctx), &bbox); fz_clear_pixmap_with_value(ctx, pix, 255); dev = fz_new_draw_device(ctx, pix); @@ -286,7 +286,7 @@ static UIImage *renderTile(fz_document *doc, fz_page *page, CGSize screenSize, C bbox.x1 = tileRect.origin.x + tileRect.size.width; bbox.y1 = tileRect.origin.y + tileRect.size.height; - pix = fz_new_pixmap_with_bbox(ctx, fz_device_rgb, &bbox); + pix = fz_new_pixmap_with_bbox(ctx, fz_device_rgb(ctx), &bbox); fz_clear_pixmap_with_value(ctx, pix, 255); dev = fz_new_draw_device(ctx, pix); @@ -362,7 +362,7 @@ static UIImage *renderTile(fz_document *doc, fz_page *page, CGSize screenSize, C - (NSInteger) tableView: (UITableView*)tableView numberOfRowsInSection: (NSInteger)section { - return [files count] + 1; + return [files count]; } - (void) actionSheet:(UIActionSheet *)actionSheet clickedButtonAtIndex:(NSInteger)buttonIndex @@ -408,27 +408,15 @@ static UIImage *renderTile(fz_document *doc, fz_page *page, CGSize screenSize, C if (!cell) cell = [[[UITableViewCell alloc] initWithStyle: UITableViewCellStyleDefault reuseIdentifier: cellid] autorelease]; int row = [indexPath row]; - if (row == 0) { - [[cell textLabel] setText: @"About MuPDF"]; - [[cell textLabel] setFont: [UIFont systemFontOfSize: 20]]; - } else { - [[cell textLabel] setText: [files objectAtIndex: row - 1]]; - [[cell textLabel] setFont: [UIFont systemFontOfSize: 20]]; - } + [[cell textLabel] setText: [files objectAtIndex: row]]; + [[cell textLabel] setFont: [UIFont systemFontOfSize: 20]]; - if (row > 0) - { - UIButton *deleteButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [deleteButton setImage: [UIImage imageNamed: @"x_alt_blue.png"] forState: UIControlStateNormal]; - [deleteButton setFrame: CGRectMake(0, 0, 35, 35)]; - [deleteButton addTarget: self action: @selector(onTapDelete:) forControlEvents: UIControlEventTouchUpInside]; - [deleteButton setTag: row]; - [cell setAccessoryView: deleteButton]; - } - else - { - [cell setAccessoryView: nil]; - } + UIButton *deleteButton = [UIButton buttonWithType:UIButtonTypeCustom]; + [deleteButton setImage: [UIImage imageNamed: @"x_alt_blue.png"] forState: UIControlStateNormal]; + [deleteButton setFrame: CGRectMake(0, 0, 35, 35)]; + [deleteButton addTarget: self action: @selector(onTapDelete:) forControlEvents: UIControlEventTouchUpInside]; + [deleteButton setTag: row]; + [cell setAccessoryView: deleteButton]; return cell; } @@ -436,10 +424,7 @@ static UIImage *renderTile(fz_document *doc, fz_page *page, CGSize screenSize, C - (void) tableView: (UITableView*)tableView didSelectRowAtIndexPath: (NSIndexPath*)indexPath { int row = [indexPath row]; - if (row == 0) - [self openDocument: @"../MuPDF.app/About.xps"]; - else - [self openDocument: [files objectAtIndex: row - 1]]; + [self openDocument: [files objectAtIndex: row]]; } - (void) openDocument: (NSString*)nsfilename @@ -1655,7 +1640,16 @@ static UIImage *renderTile(fz_document *doc, fz_page *page, CGSize screenSize, C int main(int argc, char *argv[]) { NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - int retVal = UIApplicationMain(argc, argv, nil, @"MuAppDelegate"); + int retVal; + + @try { + retVal = UIApplicationMain(argc, argv, nil, @"MuAppDelegate"); + } + @catch (NSException* exception) { + NSLog(@"Uncaught exception %@", exception); + NSLog(@"Stack trace: %@", [exception callStackSymbols]); + } + [pool release]; return retVal; } -- cgit v1.2.3