尹诚 / Mapbox-iOS-SDK · Commits

Go to a project

Authored by Justin R. Miller
Commit 293602acc82adfeea529d2157e339454f0abff65 1 parent cff44eb9

refs alpstein/route-me#85: remove Proj4 build process & statically link

Inline Side-by-side
Showing 2 changed files with 10 additions and 52 deletions
@@ -46,7 +46,6 @@ @@ -46,7 +46,6 @@
46 23A0AAEB0EB90AA6003A4521 /* RMFoundation.h in Headers */ = {isa = PBXBuildFile; fileRef = 23A0AAEA0EB90AA6003A4521 /* RMFoundation.h */; }; 46 23A0AAEB0EB90AA6003A4521 /* RMFoundation.h in Headers */ = {isa = PBXBuildFile; fileRef = 23A0AAEA0EB90AA6003A4521 /* RMFoundation.h */; };
47 25757F4F1291C8640083D504 /* RMCircle.h in Headers */ = {isa = PBXBuildFile; fileRef = 25757F4D1291C8640083D504 /* RMCircle.h */; }; 47 25757F4F1291C8640083D504 /* RMCircle.h in Headers */ = {isa = PBXBuildFile; fileRef = 25757F4D1291C8640083D504 /* RMCircle.h */; };
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 - 3849889C0F6F758100496293 /* libProj4.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 38D818500F6F67B90034598B /* libProj4.a */; };  
50 96492C400FA8AD3400EBA6D2 /* RMGlobalConstants.h in Headers */ = {isa = PBXBuildFile; fileRef = 96492C3F0FA8AD3400EBA6D2 /* RMGlobalConstants.h */; }; 49 96492C400FA8AD3400EBA6D2 /* RMGlobalConstants.h in Headers */ = {isa = PBXBuildFile; fileRef = 96492C3F0FA8AD3400EBA6D2 /* RMGlobalConstants.h */; };
51 B1EB26C610B5D8E6009F8658 /* RMNotifications.h in Headers */ = {isa = PBXBuildFile; fileRef = B1EB26C510B5D8E6009F8658 /* RMNotifications.h */; }; 50 B1EB26C610B5D8E6009F8658 /* RMNotifications.h in Headers */ = {isa = PBXBuildFile; fileRef = B1EB26C510B5D8E6009F8658 /* RMNotifications.h */; };
52 B8474BA40EB40094006A0BC1 /* RMDatabaseCache.h in Headers */ = {isa = PBXBuildFile; fileRef = B8474B980EB40094006A0BC1 /* RMDatabaseCache.h */; }; 51 B8474BA40EB40094006A0BC1 /* RMDatabaseCache.h in Headers */ = {isa = PBXBuildFile; fileRef = B8474B980EB40094006A0BC1 /* RMDatabaseCache.h */; };
@@ -129,6 +128,7 @@ @@ -129,6 +128,7 @@
129 DD8CDB4B14E0507100B73EB9 /* RMMapQuestOSMSource.m in Sources */ = {isa = PBXBuildFile; fileRef = DD8CDB4914E0507100B73EB9 /* RMMapQuestOSMSource.m */; }; 128 DD8CDB4B14E0507100B73EB9 /* RMMapQuestOSMSource.m in Sources */ = {isa = PBXBuildFile; fileRef = DD8CDB4914E0507100B73EB9 /* RMMapQuestOSMSource.m */; };
130 DD8FD7541559E4A40044D96F /* RMUserLocation.h in Headers */ = {isa = PBXBuildFile; fileRef = DD8FD7521559E4A40044D96F /* RMUserLocation.h */; }; 129 DD8FD7541559E4A40044D96F /* RMUserLocation.h in Headers */ = {isa = PBXBuildFile; fileRef = DD8FD7521559E4A40044D96F /* RMUserLocation.h */; };
131 DD8FD7551559E4A40044D96F /* RMUserLocation.m in Sources */ = {isa = PBXBuildFile; fileRef = DD8FD7531559E4A40044D96F /* RMUserLocation.m */; }; 130 DD8FD7551559E4A40044D96F /* RMUserLocation.m in Sources */ = {isa = PBXBuildFile; fileRef = DD8FD7531559E4A40044D96F /* RMUserLocation.m */; };
  131 + DD97C11616489678007C4652 /* libProj4.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DD97C11516489678007C4652 /* libProj4.a */; };
132 DD98B6FA14D76B930092882F /* RMMapBoxSource.h in Headers */ = {isa = PBXBuildFile; fileRef = DD98B6F814D76B930092882F /* RMMapBoxSource.h */; }; 132 DD98B6FA14D76B930092882F /* RMMapBoxSource.h in Headers */ = {isa = PBXBuildFile; fileRef = DD98B6F814D76B930092882F /* RMMapBoxSource.h */; };
133 DD98B6FB14D76B930092882F /* RMMapBoxSource.m in Sources */ = {isa = PBXBuildFile; fileRef = DD98B6F914D76B930092882F /* RMMapBoxSource.m */; }; 133 DD98B6FB14D76B930092882F /* RMMapBoxSource.m in Sources */ = {isa = PBXBuildFile; fileRef = DD98B6F914D76B930092882F /* RMMapBoxSource.m */; };
134 DDA6B8BD155CAB67003DB5D8 /* RMUserTrackingBarButtonItem.h in Headers */ = {isa = PBXBuildFile; fileRef = DDA6B8BB155CAB67003DB5D8 /* RMUserTrackingBarButtonItem.h */; }; 134 DDA6B8BD155CAB67003DB5D8 /* RMUserTrackingBarButtonItem.h in Headers */ = {isa = PBXBuildFile; fileRef = DDA6B8BB155CAB67003DB5D8 /* RMUserTrackingBarButtonItem.h */; };
@@ -138,20 +138,6 @@ @@ -138,20 +138,6 @@
138 /* End PBXBuildFile section */ 138 /* End PBXBuildFile section */
139 139
140 /* Begin PBXContainerItemProxy section */ 140 /* Begin PBXContainerItemProxy section */
141 - 38D8184F0F6F67B90034598B /* PBXContainerItemProxy */ = {  
142 - isa = PBXContainerItemProxy;  
143 - containerPortal = B83E654A0E80E7A8001663B6 /* Proj4.xcodeproj */;  
144 - proxyType = 2;  
145 - remoteGlobalIDString = D2AAC07E0554694100DB518D;  
146 - remoteInfo = Proj4;  
147 - };  
148 - B8C974150E8A19B2007D16AD /* PBXContainerItemProxy */ = {  
149 - isa = PBXContainerItemProxy;  
150 - containerPortal = B83E654A0E80E7A8001663B6 /* Proj4.xcodeproj */;  
151 - proxyType = 1;  
152 - remoteGlobalIDString = D2AAC07D0554694100DB518D;  
153 - remoteInfo = Proj4;  
154 - };  
155 DD6A838F1644A2810097F31F /* PBXContainerItemProxy */ = { 141 DD6A838F1644A2810097F31F /* PBXContainerItemProxy */ = {
156 isa = PBXContainerItemProxy; 142 isa = PBXContainerItemProxy;
157 containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */; 143 containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */;
@@ -227,7 +213,6 @@ @@ -227,7 +213,6 @@
227 B83E64EC0E80E73F001663B6 /* RMTileSource.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; path = RMTileSource.h; sourceTree = "<group>"; }; 213 B83E64EC0E80E73F001663B6 /* RMTileSource.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; path = RMTileSource.h; sourceTree = "<group>"; };
228 B83E64ED0E80E73F001663B6 /* RMOpenStreetMapSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RMOpenStreetMapSource.h; sourceTree = "<group>"; }; 214 B83E64ED0E80E73F001663B6 /* RMOpenStreetMapSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RMOpenStreetMapSource.h; sourceTree = "<group>"; };
229 B83E64EE0E80E73F001663B6 /* RMOpenStreetMapSource.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RMOpenStreetMapSource.m; sourceTree = "<group>"; }; 215 B83E64EE0E80E73F001663B6 /* RMOpenStreetMapSource.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RMOpenStreetMapSource.m; sourceTree = "<group>"; };
230 - B83E654A0E80E7A8001663B6 /* Proj4.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Proj4.xcodeproj; path = ../Proj4/Proj4.xcodeproj; sourceTree = SOURCE_ROOT; };  
231 B83E65590E80E7EB001663B6 /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = System/Library/Frameworks/CoreFoundation.framework; sourceTree = SDKROOT; }; 216 B83E65590E80E7EB001663B6 /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = System/Library/Frameworks/CoreFoundation.framework; sourceTree = SDKROOT; };
232 B83E65630E80E81C001663B6 /* CoreLocation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreLocation.framework; path = System/Library/Frameworks/CoreLocation.framework; sourceTree = SDKROOT; }; 217 B83E65630E80E81C001663B6 /* CoreLocation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreLocation.framework; path = System/Library/Frameworks/CoreLocation.framework; sourceTree = SDKROOT; };
233 B83E65680E80E830001663B6 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; }; 218 B83E65680E80E830001663B6 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
@@ -280,6 +265,7 @@ @@ -280,6 +265,7 @@
280 DD8FD7661559EE120044D96F /* TrackingDot@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "TrackingDot@2x.png"; path = "Resources/TrackingDot@2x.png"; sourceTree = "<group>"; }; 265 DD8FD7661559EE120044D96F /* TrackingDot@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "TrackingDot@2x.png"; path = "Resources/TrackingDot@2x.png"; sourceTree = "<group>"; };
281 DD8FD7691559EE120044D96F /* TrackingDotHalo@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "TrackingDotHalo@2x.png"; path = "Resources/TrackingDotHalo@2x.png"; sourceTree = "<group>"; }; 266 DD8FD7691559EE120044D96F /* TrackingDotHalo@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "TrackingDotHalo@2x.png"; path = "Resources/TrackingDotHalo@2x.png"; sourceTree = "<group>"; };
282 DD8FD76C1559EE120044D96F /* TrackingDotHalo.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = TrackingDotHalo.png; path = Resources/TrackingDotHalo.png; sourceTree = "<group>"; }; 267 DD8FD76C1559EE120044D96F /* TrackingDotHalo.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = TrackingDotHalo.png; path = Resources/TrackingDotHalo.png; sourceTree = "<group>"; };
  268 + DD97C11516489678007C4652 /* libProj4.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libProj4.a; path = ../Proj4/libProj4.a; sourceTree = "<group>"; };
283 DD98B6F814D76B930092882F /* RMMapBoxSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RMMapBoxSource.h; sourceTree = "<group>"; }; 269 DD98B6F814D76B930092882F /* RMMapBoxSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RMMapBoxSource.h; sourceTree = "<group>"; };
284 DD98B6F914D76B930092882F /* RMMapBoxSource.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RMMapBoxSource.m; sourceTree = "<group>"; }; 270 DD98B6F914D76B930092882F /* RMMapBoxSource.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RMMapBoxSource.m; sourceTree = "<group>"; };
285 DDA6B8BB155CAB67003DB5D8 /* RMUserTrackingBarButtonItem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RMUserTrackingBarButtonItem.h; sourceTree = "<group>"; }; 271 DDA6B8BB155CAB67003DB5D8 /* RMUserTrackingBarButtonItem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RMUserTrackingBarButtonItem.h; sourceTree = "<group>"; };
@@ -305,8 +291,8 @@ @@ -305,8 +291,8 @@
305 B8C974530E8A19B2007D16AD /* UIKit.framework in Frameworks */, 291 B8C974530E8A19B2007D16AD /* UIKit.framework in Frameworks */,
306 B8C974540E8A19B2007D16AD /* QuartzCore.framework in Frameworks */, 292 B8C974540E8A19B2007D16AD /* QuartzCore.framework in Frameworks */,
307 B8474BC10EB4019A006A0BC1 /* libsqlite3.dylib in Frameworks */, 293 B8474BC10EB4019A006A0BC1 /* libsqlite3.dylib in Frameworks */,
308 - 3849889C0F6F758100496293 /* libProj4.a in Frameworks */,  
309 DD41961F16263E400049E6BA /* libGRMustache5-iOS.a in Frameworks */, 294 DD41961F16263E400049E6BA /* libGRMustache5-iOS.a in Frameworks */,
  295 + DD97C11616489678007C4652 /* libProj4.a in Frameworks */,
310 ); 296 );
311 runOnlyForDeploymentPostprocessing = 0; 297 runOnlyForDeploymentPostprocessing = 0;
312 }; 298 };
@@ -378,26 +364,18 @@ @@ -378,26 +364,18 @@
378 29B97323FDCFA39411CA2CEA /* Frameworks */ = { 364 29B97323FDCFA39411CA2CEA /* Frameworks */ = {
379 isa = PBXGroup; 365 isa = PBXGroup;
380 children = ( 366 children = (
381 - B83E654A0E80E7A8001663B6 /* Proj4.xcodeproj */,  
382 - B8474BC00EB4019A006A0BC1 /* libsqlite3.dylib */,  
383 B83E65590E80E7EB001663B6 /* CoreFoundation.framework */, 367 B83E65590E80E7EB001663B6 /* CoreFoundation.framework */,
  368 + 288765A40DF7441C002DB57D /* CoreGraphics.framework */,
384 B83E65630E80E81C001663B6 /* CoreLocation.framework */, 369 B83E65630E80E81C001663B6 /* CoreLocation.framework */,
  370 + 1D30AB110D05D00D00671497 /* Foundation.framework */,
385 B83E65680E80E830001663B6 /* QuartzCore.framework */, 371 B83E65680E80E830001663B6 /* QuartzCore.framework */,
386 1DF5F4DF0D08C38300B7A737 /* UIKit.framework */, 372 1DF5F4DF0D08C38300B7A737 /* UIKit.framework */,
387 - 1D30AB110D05D00D00671497 /* Foundation.framework */,  
388 - 288765A40DF7441C002DB57D /* CoreGraphics.framework */, 373 + DD97C11516489678007C4652 /* libProj4.a */,
  374 + B8474BC00EB4019A006A0BC1 /* libsqlite3.dylib */,
389 ); 375 );
390 name = Frameworks; 376 name = Frameworks;
391 sourceTree = "<group>"; 377 sourceTree = "<group>";
392 }; 378 };
393 - 38D8184C0F6F67B90034598B /* Products */ = {  
394 - isa = PBXGroup;  
395 - children = (  
396 - 38D818500F6F67B90034598B /* libProj4.a */,  
397 - );  
398 - name = Products;  
399 - sourceTree = "<group>";  
400 - };  
401 B83E64CE0E80E73F001663B6 /* Tile Layer & Overlay */ = { 379 B83E64CE0E80E73F001663B6 /* Tile Layer & Overlay */ = {
402 isa = PBXGroup; 380 isa = PBXGroup;
403 children = ( 381 children = (
@@ -685,7 +663,6 @@ @@ -685,7 +663,6 @@
685 ); 663 );
686 dependencies = ( 664 dependencies = (
687 DD6A83901644A2810097F31F /* PBXTargetDependency */, 665 DD6A83901644A2810097F31F /* PBXTargetDependency */,
688 - B8C974140E8A19B2007D16AD /* PBXTargetDependency */,  
689 ); 666 );
690 name = MapView; 667 name = MapView;
691 productName = MapView; 668 productName = MapView;
@@ -697,7 +674,6 @@ @@ -697,7 +674,6 @@
697 buildConfigurationList = DD6A837E1644A20C0097F31F /* Build configuration list for PBXNativeTarget "Resources" */; 674 buildConfigurationList = DD6A837E1644A20C0097F31F /* Build configuration list for PBXNativeTarget "Resources" */;
698 buildPhases = ( 675 buildPhases = (
699 DD6A83711644A20C0097F31F /* Sources */, 676 DD6A83711644A20C0097F31F /* Sources */,
700 - DD6A83721644A20C0097F31F /* Frameworks */,  
701 DD6A83731644A20C0097F31F /* Resources */, 677 DD6A83731644A20C0097F31F /* Resources */,
702 ); 678 );
703 buildRules = ( 679 buildRules = (
@@ -730,12 +706,6 @@ @@ -730,12 +706,6 @@
730 ); 706 );
731 mainGroup = 29B97314FDCFA39411CA2CEA /* CustomTemplate */; 707 mainGroup = 29B97314FDCFA39411CA2CEA /* CustomTemplate */;
732 projectDirPath = ""; 708 projectDirPath = "";
733 - projectReferences = (  
734 - {  
735 - ProductGroup = 38D8184C0F6F67B90034598B /* Products */;  
736 - ProjectRef = B83E654A0E80E7A8001663B6 /* Proj4.xcodeproj */;  
737 - },  
738 - );  
739 projectRoot = ""; 709 projectRoot = "";
740 targets = ( 710 targets = (
741 B8C974130E8A19B2007D16AD /* MapView */, 711 B8C974130E8A19B2007D16AD /* MapView */,
@@ -744,16 +714,6 @@ @@ -744,16 +714,6 @@
744 }; 714 };
745 /* End PBXProject section */ 715 /* End PBXProject section */
746 716
747 -/* Begin PBXReferenceProxy section */  
748 - 38D818500F6F67B90034598B /* libProj4.a */ = {  
749 - isa = PBXReferenceProxy;  
750 - fileType = archive.ar;  
751 - path = libProj4.a;  
752 - remoteRef = 38D8184F0F6F67B90034598B /* PBXContainerItemProxy */;  
753 - sourceTree = BUILT_PRODUCTS_DIR;  
754 - };  
755 -/* End PBXReferenceProxy section */  
756 -  
757 /* Begin PBXResourcesBuildPhase section */ 717 /* Begin PBXResourcesBuildPhase section */
758 DD6A83731644A20C0097F31F /* Resources */ = { 718 DD6A83731644A20C0097F31F /* Resources */ = {
759 isa = PBXResourcesBuildPhase; 719 isa = PBXResourcesBuildPhase;
@@ -845,11 +805,6 @@ @@ -845,11 +805,6 @@
845 /* End PBXSourcesBuildPhase section */ 805 /* End PBXSourcesBuildPhase section */
846 806
847 /* Begin PBXTargetDependency section */ 807 /* Begin PBXTargetDependency section */
848 - B8C974140E8A19B2007D16AD /* PBXTargetDependency */ = {  
849 - isa = PBXTargetDependency;  
850 - name = Proj4;  
851 - targetProxy = B8C974150E8A19B2007D16AD /* PBXContainerItemProxy */;  
852 - };  
853 DD6A83901644A2810097F31F /* PBXTargetDependency */ = { 808 DD6A83901644A2810097F31F /* PBXTargetDependency */ = {
854 isa = PBXTargetDependency; 809 isa = PBXTargetDependency;
855 target = DD6A83741644A20C0097F31F /* Resources */; 810 target = DD6A83741644A20C0097F31F /* Resources */;
@@ -872,6 +827,7 @@ @@ -872,6 +827,7 @@
872 LIBRARY_SEARCH_PATHS = ( 827 LIBRARY_SEARCH_PATHS = (
873 "$(inherited)", 828 "$(inherited)",
874 "\"$(SRCROOT)/Map/GRMustache/lib\"", 829 "\"$(SRCROOT)/Map/GRMustache/lib\"",
  830 + "\"$(SRCROOT)/../Proj4\"",
875 ); 831 );
876 OTHER_LDFLAGS = "-ObjC"; 832 OTHER_LDFLAGS = "-ObjC";
877 PRODUCT_NAME = MapBox; 833 PRODUCT_NAME = MapBox;
@@ -892,6 +848,7 @@ @@ -892,6 +848,7 @@
892 LIBRARY_SEARCH_PATHS = ( 848 LIBRARY_SEARCH_PATHS = (
893 "$(inherited)", 849 "$(inherited)",
894 "\"$(SRCROOT)/Map/GRMustache/lib\"", 850 "\"$(SRCROOT)/Map/GRMustache/lib\"",
  851 + "\"$(SRCROOT)/../Proj4\"",
895 ); 852 );
896 OTHER_LDFLAGS = "-ObjC"; 853 OTHER_LDFLAGS = "-ObjC";
897 PRODUCT_NAME = MapBox; 854 PRODUCT_NAME = MapBox;
@@ -1033,6 +990,7 @@ @@ -1033,6 +990,7 @@
1033 DD6A83801644A20C0097F31F /* Release */, 990 DD6A83801644A20C0097F31F /* Release */,
1034 ); 991 );
1035 defaultConfigurationIsVisible = 0; 992 defaultConfigurationIsVisible = 0;
  993 + defaultConfigurationName = Release;
1036 }; 994 };
1037 /* End XCConfigurationList section */ 995 /* End XCConfigurationList section */
1038 }; 996 };
No preview for this file type