diff --git a/MapView/MapView.xcodeproj/project.pbxproj b/MapView/MapView.xcodeproj/project.pbxproj index d0a42e68..858d58c2 100755 --- a/MapView/MapView.xcodeproj/project.pbxproj +++ b/MapView/MapView.xcodeproj/project.pbxproj @@ -1004,8 +1004,10 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + ARCHS = "$(ARCHS_STANDARD)"; CLANG_ENABLE_OBJC_ARC = YES; COPY_PHASE_STRIP = NO; + ENABLE_BITCODE = NO; GCC_DYNAMIC_NO_PIC = NO; GCC_OPTIMIZATION_LEVEL = 0; GCC_PRECOMPILE_PREFIX_HEADER = YES; @@ -1016,14 +1018,18 @@ "\"$(SRCROOT)/Map/GRMustache/include\"", "\"$(SRCROOT)/Map/FMDB/src/fmdb\"", ); + IPHONEOS_DEPLOYMENT_TARGET = 10.3; LIBRARY_SEARCH_PATHS = ( "$(inherited)", "\"$(SRCROOT)/Map/GRMustache/lib\"", "\"$(SRCROOT)/../Proj4\"", ); + ONLY_ACTIVE_ARCH = NO; OTHER_LDFLAGS = "-ObjC"; PRODUCT_NAME = Mapbox; RUN_CLANG_STATIC_ANALYZER = NO; + TARGETED_DEVICE_FAMILY = "1,2"; + VALID_ARCHS = "armv7s $(ARCHS_STANDARD)"; }; name = Debug; }; @@ -1031,9 +1037,11 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + ARCHS = "$(ARCHS_STANDARD)"; CLANG_ENABLE_OBJC_ARC = YES; COPY_PHASE_STRIP = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_BITCODE = NO; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = MapView_Prefix.pch; GCC_PREPROCESSOR_DEFINITIONS = "NS_BLOCK_ASSERTIONS=1"; @@ -1042,13 +1050,17 @@ "\"$(SRCROOT)/Map/GRMustache/include\"", "\"$(SRCROOT)/Map/FMDB/src/fmdb\"", ); + IPHONEOS_DEPLOYMENT_TARGET = 10.3; LIBRARY_SEARCH_PATHS = ( "$(inherited)", "\"$(SRCROOT)/Map/GRMustache/lib\"", "\"$(SRCROOT)/../Proj4\"", ); + ONLY_ACTIVE_ARCH = NO; OTHER_LDFLAGS = "-ObjC"; PRODUCT_NAME = Mapbox; + TARGETED_DEVICE_FAMILY = "1,2"; + VALID_ARCHS = "armv7s $(ARCHS_STANDARD)"; ZERO_LINK = NO; }; name = Release; @@ -1056,7 +1068,7 @@ C01FCF4F08A954540054247B /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)"; + ARCHS = "$(ARCHS_STANDARD)"; CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; CLANG_WARN_EMPTY_BODY = YES; @@ -1080,21 +1092,23 @@ GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; IPHONEOS_DEPLOYMENT_TARGET = 5.0; - ONLY_ACTIVE_ARCH = YES; + ONLY_ACTIVE_ARCH = NO; OTHER_LDFLAGS = ""; RUN_CLANG_STATIC_ANALYZER = NO; SDKROOT = iphoneos; SEPARATE_STRIP = YES; SKIP_INSTALL = YES; STRIP_INSTALLED_PRODUCT = NO; + TARGETED_DEVICE_FAMILY = "1,2"; VALIDATE_PRODUCT = YES; + VALID_ARCHS = "$(ARCHS_STANDARD) armv7s"; }; name = Debug; }; C01FCF5008A954540054247B /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)"; + ARCHS = "$(ARCHS_STANDARD)"; CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; CLANG_WARN_EMPTY_BODY = YES; @@ -1122,7 +1136,9 @@ SDKROOT = iphoneos; SEPARATE_STRIP = YES; SKIP_INSTALL = YES; + TARGETED_DEVICE_FAMILY = "1,2"; VALIDATE_PRODUCT = YES; + VALID_ARCHS = "$(ARCHS_STANDARD) armv7s"; }; name = Release; }; diff --git a/README.markdown b/README.markdown index c316e0e3..93716520 100644 --- a/README.markdown +++ b/README.markdown @@ -1,3 +1,11 @@ +THE SILENT HISTORY + +To make a fat library for debug and release. + +Build the library for a debug target and a device in turn, then combine the two libraries. + +`lipo -create lib_arm.a lib_i386.a -output lib_universal.a` + **This project is deprecated in favor of the [Mapbox iOS SDK](https://www.mapbox.com/ios-sdk/)** See [the old readme](README-old.markdown) for the old project details.