尹诚 / Mapbox-iOS-SDK · Commits

Go to a project

Authored by Denis Zamataev
Commit 6de97eb1878a1df5cd4cb56ec31c6f52b1754b14 1 parent d700aa02

valid archs fix, libsqlite3 fix

Inline Side-by-side
Showing 3 changed files with 18 additions and 14 deletions
@@ -46,11 +46,11 @@ @@ -46,11 +46,11 @@
46 23A0AAEB0EB90AA6003A4521 /* RMFoundation.h in Headers */ = {isa = PBXBuildFile; fileRef = 23A0AAEA0EB90AA6003A4521 /* RMFoundation.h */; settings = {ATTRIBUTES = (Private, ); }; }; 46 23A0AAEB0EB90AA6003A4521 /* RMFoundation.h in Headers */ = {isa = PBXBuildFile; fileRef = 23A0AAEA0EB90AA6003A4521 /* RMFoundation.h */; settings = {ATTRIBUTES = (Private, ); }; };
47 25757F4F1291C8640083D504 /* RMCircle.h in Headers */ = {isa = PBXBuildFile; fileRef = 25757F4D1291C8640083D504 /* RMCircle.h */; settings = {ATTRIBUTES = (Public, ); }; }; 47 25757F4F1291C8640083D504 /* RMCircle.h in Headers */ = {isa = PBXBuildFile; fileRef = 25757F4D1291C8640083D504 /* RMCircle.h */; settings = {ATTRIBUTES = (Public, ); }; };
48 25757F501291C8640083D504 /* RMCircle.m in Sources */ = {isa = PBXBuildFile; fileRef = 25757F4E1291C8640083D504 /* RMCircle.m */; }; 48 25757F501291C8640083D504 /* RMCircle.m in Sources */ = {isa = PBXBuildFile; fileRef = 25757F4E1291C8640083D504 /* RMCircle.m */; };
  49 + 92D07B1B1D7F092700E34C57 /* libsqlite3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 92D07B1A1D7F092700E34C57 /* libsqlite3.dylib */; };
49 96492C400FA8AD3400EBA6D2 /* RMGlobalConstants.h in Headers */ = {isa = PBXBuildFile; fileRef = 96492C3F0FA8AD3400EBA6D2 /* RMGlobalConstants.h */; settings = {ATTRIBUTES = (Private, ); }; }; 50 96492C400FA8AD3400EBA6D2 /* RMGlobalConstants.h in Headers */ = {isa = PBXBuildFile; fileRef = 96492C3F0FA8AD3400EBA6D2 /* RMGlobalConstants.h */; settings = {ATTRIBUTES = (Private, ); }; };
50 B1EB26C610B5D8E6009F8658 /* RMNotifications.h in Headers */ = {isa = PBXBuildFile; fileRef = B1EB26C510B5D8E6009F8658 /* RMNotifications.h */; settings = {ATTRIBUTES = (Private, ); }; }; 51 B1EB26C610B5D8E6009F8658 /* RMNotifications.h in Headers */ = {isa = PBXBuildFile; fileRef = B1EB26C510B5D8E6009F8658 /* RMNotifications.h */; settings = {ATTRIBUTES = (Private, ); }; };
51 B8474BA40EB40094006A0BC1 /* RMDatabaseCache.h in Headers */ = {isa = PBXBuildFile; fileRef = B8474B980EB40094006A0BC1 /* RMDatabaseCache.h */; settings = {ATTRIBUTES = (Public, ); }; }; 52 B8474BA40EB40094006A0BC1 /* RMDatabaseCache.h in Headers */ = {isa = PBXBuildFile; fileRef = B8474B980EB40094006A0BC1 /* RMDatabaseCache.h */; settings = {ATTRIBUTES = (Public, ); }; };
52 B8474BA50EB40094006A0BC1 /* RMDatabaseCache.m in Sources */ = {isa = PBXBuildFile; fileRef = B8474B990EB40094006A0BC1 /* RMDatabaseCache.m */; }; 53 B8474BA50EB40094006A0BC1 /* RMDatabaseCache.m in Sources */ = {isa = PBXBuildFile; fileRef = B8474B990EB40094006A0BC1 /* RMDatabaseCache.m */; };
53 - B8474BC10EB4019A006A0BC1 /* libsqlite3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = B8474BC00EB4019A006A0BC1 /* libsqlite3.dylib */; };  
54 B8800FF20EC3A239003E9CDD /* RMMapViewDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 12F2031E0EBB65E9003D7B6B /* RMMapViewDelegate.h */; settings = {ATTRIBUTES = (Public, ); }; }; 54 B8800FF20EC3A239003E9CDD /* RMMapViewDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 12F2031E0EBB65E9003D7B6B /* RMMapViewDelegate.h */; settings = {ATTRIBUTES = (Public, ); }; };
55 B8800FF30EC3A23D003E9CDD /* RMConfiguration.h in Headers */ = {isa = PBXBuildFile; fileRef = 1266929F0EB75C0A00E002D5 /* RMConfiguration.h */; settings = {ATTRIBUTES = (Public, ); }; }; 55 B8800FF30EC3A23D003E9CDD /* RMConfiguration.h in Headers */ = {isa = PBXBuildFile; fileRef = 1266929F0EB75C0A00E002D5 /* RMConfiguration.h */; settings = {ATTRIBUTES = (Public, ); }; };
56 B8C974220E8A19B2007D16AD /* RMProjection.h in Headers */ = {isa = PBXBuildFile; fileRef = B83E64E30E80E73F001663B6 /* RMProjection.h */; settings = {ATTRIBUTES = (Private, ); }; }; 56 B8C974220E8A19B2007D16AD /* RMProjection.h in Headers */ = {isa = PBXBuildFile; fileRef = B83E64E30E80E73F001663B6 /* RMProjection.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -233,6 +233,8 @@ @@ -233,6 +233,8 @@
233 25757F4E1291C8640083D504 /* RMCircle.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RMCircle.m; sourceTree = "<group>"; }; 233 25757F4E1291C8640083D504 /* RMCircle.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RMCircle.m; sourceTree = "<group>"; };
234 288765A40DF7441C002DB57D /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; }; 234 288765A40DF7441C002DB57D /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
235 32CA4F630368D1EE00C91783 /* MapView_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MapView_Prefix.pch; sourceTree = SOURCE_ROOT; }; 235 32CA4F630368D1EE00C91783 /* MapView_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MapView_Prefix.pch; sourceTree = SOURCE_ROOT; };
  236 + 92D07B181D7F089D00E34C57 /* libsqlite3.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libsqlite3.tbd; path = usr/lib/libsqlite3.tbd; sourceTree = SDKROOT; };
  237 + 92D07B1A1D7F092700E34C57 /* libsqlite3.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libsqlite3.dylib; path = ../../../../../usr/lib/libsqlite3.dylib; sourceTree = "<group>"; };
236 96492C3F0FA8AD3400EBA6D2 /* RMGlobalConstants.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RMGlobalConstants.h; sourceTree = "<group>"; }; 238 96492C3F0FA8AD3400EBA6D2 /* RMGlobalConstants.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RMGlobalConstants.h; sourceTree = "<group>"; };
237 B1EB26C510B5D8E6009F8658 /* RMNotifications.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RMNotifications.h; sourceTree = "<group>"; }; 239 B1EB26C510B5D8E6009F8658 /* RMNotifications.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RMNotifications.h; sourceTree = "<group>"; };
238 B83E64B60E80E73F001663B6 /* RMPixel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RMPixel.h; sourceTree = "<group>"; }; 240 B83E64B60E80E73F001663B6 /* RMPixel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RMPixel.h; sourceTree = "<group>"; };
@@ -365,12 +367,12 @@ @@ -365,12 +367,12 @@
365 isa = PBXFrameworksBuildPhase; 367 isa = PBXFrameworksBuildPhase;
366 buildActionMask = 2147483647; 368 buildActionMask = 2147483647;
367 files = ( 369 files = (
  370 + 92D07B1B1D7F092700E34C57 /* libsqlite3.dylib in Frameworks */,
368 B8C974500E8A19B2007D16AD /* CoreFoundation.framework in Frameworks */, 371 B8C974500E8A19B2007D16AD /* CoreFoundation.framework in Frameworks */,
369 B8C974510E8A19B2007D16AD /* CoreGraphics.framework in Frameworks */, 372 B8C974510E8A19B2007D16AD /* CoreGraphics.framework in Frameworks */,
370 B8C974520E8A19B2007D16AD /* CoreLocation.framework in Frameworks */, 373 B8C974520E8A19B2007D16AD /* CoreLocation.framework in Frameworks */,
371 B8C974530E8A19B2007D16AD /* UIKit.framework in Frameworks */, 374 B8C974530E8A19B2007D16AD /* UIKit.framework in Frameworks */,
372 B8C974540E8A19B2007D16AD /* QuartzCore.framework in Frameworks */, 375 B8C974540E8A19B2007D16AD /* QuartzCore.framework in Frameworks */,
373 - B8474BC10EB4019A006A0BC1 /* libsqlite3.dylib in Frameworks */,  
374 DDEDBBD01A81864800646DBB /* libGRMustache7-iOS.a in Frameworks */, 376 DDEDBBD01A81864800646DBB /* libGRMustache7-iOS.a in Frameworks */,
375 DD97C11616489678007C4652 /* libProj4.a in Frameworks */, 377 DD97C11616489678007C4652 /* libProj4.a in Frameworks */,
376 ); 378 );
@@ -446,6 +448,8 @@ @@ -446,6 +448,8 @@
446 29B97323FDCFA39411CA2CEA /* Frameworks */ = { 448 29B97323FDCFA39411CA2CEA /* Frameworks */ = {
447 isa = PBXGroup; 449 isa = PBXGroup;
448 children = ( 450 children = (
  451 + 92D07B1A1D7F092700E34C57 /* libsqlite3.dylib */,
  452 + 92D07B181D7F089D00E34C57 /* libsqlite3.tbd */,
449 B83E65590E80E7EB001663B6 /* CoreFoundation.framework */, 453 B83E65590E80E7EB001663B6 /* CoreFoundation.framework */,
450 288765A40DF7441C002DB57D /* CoreGraphics.framework */, 454 288765A40DF7441C002DB57D /* CoreGraphics.framework */,
451 B83E65630E80E81C001663B6 /* CoreLocation.framework */, 455 B83E65630E80E81C001663B6 /* CoreLocation.framework */,
@@ -1085,7 +1089,7 @@ @@ -1085,7 +1089,7 @@
1085 GCC_WARN_UNUSED_FUNCTION = YES; 1089 GCC_WARN_UNUSED_FUNCTION = YES;
1086 GCC_WARN_UNUSED_VARIABLE = YES; 1090 GCC_WARN_UNUSED_VARIABLE = YES;
1087 IPHONEOS_DEPLOYMENT_TARGET = 8.0; 1091 IPHONEOS_DEPLOYMENT_TARGET = 8.0;
1088 - ONLY_ACTIVE_ARCH = YES; 1092 + ONLY_ACTIVE_ARCH = NO;
1089 OTHER_LDFLAGS = ""; 1093 OTHER_LDFLAGS = "";
1090 RUN_CLANG_STATIC_ANALYZER = NO; 1094 RUN_CLANG_STATIC_ANALYZER = NO;
1091 SDKROOT = iphoneos; 1095 SDKROOT = iphoneos;
@@ -1093,6 +1097,7 @@ @@ -1093,6 +1097,7 @@
1093 SKIP_INSTALL = YES; 1097 SKIP_INSTALL = YES;
1094 STRIP_INSTALLED_PRODUCT = NO; 1098 STRIP_INSTALLED_PRODUCT = NO;
1095 VALIDATE_PRODUCT = YES; 1099 VALIDATE_PRODUCT = YES;
  1100 + VALID_ARCHS = "arm64 armv7 armv7s i386 x86_64";
1096 }; 1101 };
1097 name = Debug; 1102 name = Debug;
1098 }; 1103 };
@@ -1132,6 +1137,7 @@ @@ -1132,6 +1137,7 @@
1132 SEPARATE_STRIP = YES; 1137 SEPARATE_STRIP = YES;
1133 SKIP_INSTALL = YES; 1138 SKIP_INSTALL = YES;
1134 VALIDATE_PRODUCT = YES; 1139 VALIDATE_PRODUCT = YES;
  1140 + VALID_ARCHS = "arm64 armv7 armv7s i386 x86_64";
1135 }; 1141 };
1136 name = Release; 1142 name = Release;
1137 }; 1143 };
@@ -803,6 +803,7 @@ @@ -803,6 +803,7 @@
803 isa = XCBuildConfiguration; 803 isa = XCBuildConfiguration;
804 buildSettings = { 804 buildSettings = {
805 ALWAYS_SEARCH_USER_PATHS = NO; 805 ALWAYS_SEARCH_USER_PATHS = NO;
  806 + ARCHS = "$(ARCHS_STANDARD)";
806 COPY_PHASE_STRIP = NO; 807 COPY_PHASE_STRIP = NO;
807 GCC_DYNAMIC_NO_PIC = NO; 808 GCC_DYNAMIC_NO_PIC = NO;
808 GCC_MODEL_TUNING = G5; 809 GCC_MODEL_TUNING = G5;
@@ -814,6 +815,7 @@ @@ -814,6 +815,7 @@
814 GCC_WARN_UNUSED_VARIABLE = NO; 815 GCC_WARN_UNUSED_VARIABLE = NO;
815 IPHONEOS_DEPLOYMENT_TARGET = 5.0; 816 IPHONEOS_DEPLOYMENT_TARGET = 5.0;
816 PRODUCT_NAME = Proj4; 817 PRODUCT_NAME = Proj4;
  818 + VALID_ARCHS = "arm64 armv7 armv7s x86_64 i386";
817 }; 819 };
818 name = Debug; 820 name = Debug;
819 }; 821 };
@@ -821,6 +823,7 @@ @@ -821,6 +823,7 @@
821 isa = XCBuildConfiguration; 823 isa = XCBuildConfiguration;
822 buildSettings = { 824 buildSettings = {
823 ALWAYS_SEARCH_USER_PATHS = NO; 825 ALWAYS_SEARCH_USER_PATHS = NO;
  826 + ARCHS = "$(ARCHS_STANDARD)";
824 DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; 827 DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
825 GCC_MODEL_TUNING = G5; 828 GCC_MODEL_TUNING = G5;
826 GCC_PRECOMPILE_PREFIX_HEADER = YES; 829 GCC_PRECOMPILE_PREFIX_HEADER = YES;
@@ -831,17 +834,14 @@ @@ -831,17 +834,14 @@
831 IPHONEOS_DEPLOYMENT_TARGET = 5.0; 834 IPHONEOS_DEPLOYMENT_TARGET = 5.0;
832 PRODUCT_NAME = Proj4; 835 PRODUCT_NAME = Proj4;
833 STRIP_INSTALLED_PRODUCT = YES; 836 STRIP_INSTALLED_PRODUCT = YES;
  837 + VALID_ARCHS = "arm64 armv7 armv7s x86_64 i386";
834 }; 838 };
835 name = Release; 839 name = Release;
836 }; 840 };
837 1DEB922308733DC00010E9CD /* Debug */ = { 841 1DEB922308733DC00010E9CD /* Debug */ = {
838 isa = XCBuildConfiguration; 842 isa = XCBuildConfiguration;
839 buildSettings = { 843 buildSettings = {
840 - ARCHS = (  
841 - "$(ARCHS_STANDARD)",  
842 - i386,  
843 - x86_64,  
844 - ); 844 + ARCHS = "$(ARCHS_STANDARD)";
845 CODE_SIGN_IDENTITY = "Don't Code Sign"; 845 CODE_SIGN_IDENTITY = "Don't Code Sign";
846 COPY_PHASE_STRIP = NO; 846 COPY_PHASE_STRIP = NO;
847 DEPLOYMENT_POSTPROCESSING = YES; 847 DEPLOYMENT_POSTPROCESSING = YES;
@@ -856,23 +856,20 @@ @@ -856,23 +856,20 @@
856 GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = NO; 856 GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = NO;
857 GCC_WARN_UNUSED_VARIABLE = YES; 857 GCC_WARN_UNUSED_VARIABLE = YES;
858 IPHONEOS_DEPLOYMENT_TARGET = 4.0; 858 IPHONEOS_DEPLOYMENT_TARGET = 4.0;
859 - ONLY_ACTIVE_ARCH = YES; 859 + ONLY_ACTIVE_ARCH = NO;
860 SDKROOT = iphoneos; 860 SDKROOT = iphoneos;
861 SEPARATE_STRIP = YES; 861 SEPARATE_STRIP = YES;
862 SKIP_INSTALL = YES; 862 SKIP_INSTALL = YES;
863 STRIP_INSTALLED_PRODUCT = YES; 863 STRIP_INSTALLED_PRODUCT = YES;
864 VALIDATE_PRODUCT = YES; 864 VALIDATE_PRODUCT = YES;
  865 + VALID_ARCHS = "arm64 armv7 armv7s x86_64 i386";
865 }; 866 };
866 name = Debug; 867 name = Debug;
867 }; 868 };
868 1DEB922408733DC00010E9CD /* Release */ = { 869 1DEB922408733DC00010E9CD /* Release */ = {
869 isa = XCBuildConfiguration; 870 isa = XCBuildConfiguration;
870 buildSettings = { 871 buildSettings = {
871 - ARCHS = (  
872 - "$(ARCHS_STANDARD)",  
873 - i386,  
874 - x86_64,  
875 - ); 872 + ARCHS = "$(ARCHS_STANDARD)";
876 COPY_PHASE_STRIP = NO; 873 COPY_PHASE_STRIP = NO;
877 DEPLOYMENT_POSTPROCESSING = YES; 874 DEPLOYMENT_POSTPROCESSING = YES;
878 GCC_C_LANGUAGE_STANDARD = c99; 875 GCC_C_LANGUAGE_STANDARD = c99;
@@ -889,6 +886,7 @@ @@ -889,6 +886,7 @@
889 SKIP_INSTALL = YES; 886 SKIP_INSTALL = YES;
890 STRIP_INSTALLED_PRODUCT = YES; 887 STRIP_INSTALLED_PRODUCT = YES;
891 VALIDATE_PRODUCT = YES; 888 VALIDATE_PRODUCT = YES;
  889 + VALID_ARCHS = "arm64 armv7 armv7s x86_64 i386";
892 }; 890 };
893 name = Release; 891 name = Release;
894 }; 892 };
No preview for this file type