尹诚 / Mapbox-iOS-SDK · Commits

Go to a project

Authored by Thomas Rasch
Commit 2aedb2410853bad6f1060bd67b4cf510e8bb0a7b 2 parents af79622e 80463981

Merge branch 'master' of https://github.com/route-me/route-me

Inline Side-by-side
Showing 2 changed files with 12 additions and 7 deletions
... ... @@ -141,7 +141,7 @@
B8C9741D0E8A19B2007D16AD /* RMCoreAnimationRenderer.h in Headers */ = {isa = PBXBuildFile; fileRef = B83E64BD0E80E73F001663B6 /* RMCoreAnimationRenderer.h */; };
B8C974220E8A19B2007D16AD /* RMProjection.h in Headers */ = {isa = PBXBuildFile; fileRef = B83E64E30E80E73F001663B6 /* RMProjection.h */; };
B8C974230E8A19B2007D16AD /* RMTileCache.h in Headers */ = {isa = PBXBuildFile; fileRef = B83E64D00E80E73F001663B6 /* RMTileCache.h */; };
B8C974250E8A19B2007D16AD /* RMOpenStreetMapSource.h in Headers */ = {isa = PBXBuildFile; fileRef = B83E64ED0E80E73F001663B6 /* RMOpenStreetMapSource.h */; settings = {ATTRIBUTES = (Public, ); }; };
B8C974250E8A19B2007D16AD /* RMOpenStreetMapSource.h in Headers */ = {isa = PBXBuildFile; fileRef = B83E64ED0E80E73F001663B6 /* RMOpenStreetMapSource.h */; settings = {ATTRIBUTES = (); }; };
B8C974260E8A19B2007D16AD /* RMTile.h in Headers */ = {isa = PBXBuildFile; fileRef = B83E64D60E80E73F001663B6 /* RMTile.h */; };
B8C974270E8A19B2007D16AD /* RMPixel.h in Headers */ = {isa = PBXBuildFile; fileRef = B83E64B60E80E73F001663B6 /* RMPixel.h */; };
B8C974290E8A19B2007D16AD /* RMFileTileImage.h in Headers */ = {isa = PBXBuildFile; fileRef = B83E64DE0E80E73F001663B6 /* RMFileTileImage.h */; };
... ... @@ -793,11 +793,11 @@
buildActionMask = 2147483647;
files = (
B8C974170E8A19B2007D16AD /* RMMercatorToScreenProjection.h in Headers */,
B8C974250E8A19B2007D16AD /* RMOpenStreetMapSource.h in Headers */,
B8C974190E8A19B2007D16AD /* RMMapRenderer.h in Headers */,
B8C9741D0E8A19B2007D16AD /* RMCoreAnimationRenderer.h in Headers */,
B8C974220E8A19B2007D16AD /* RMProjection.h in Headers */,
B8C974230E8A19B2007D16AD /* RMTileCache.h in Headers */,
B8C974250E8A19B2007D16AD /* RMOpenStreetMapSource.h in Headers */,
B8C974260E8A19B2007D16AD /* RMTile.h in Headers */,
B8C974270E8A19B2007D16AD /* RMPixel.h in Headers */,
B8C974290E8A19B2007D16AD /* RMFileTileImage.h in Headers */,
... ... @@ -1296,6 +1296,7 @@
PREBINDING = NO;
RUN_CLANG_STATIC_ANALYZER = YES;
SDKROOT = iphoneos;
SKIP_INSTALL = YES;
};
name = Debug;
};
... ... @@ -1314,6 +1315,7 @@
OTHER_LDFLAGS = "";
PREBINDING = NO;
SDKROOT = iphoneos;
SKIP_INSTALL = YES;
};
name = Release;
};
... ...
... ... @@ -150,7 +150,7 @@
B870568D0E67C32200CC2ED1 /* PJ_wink1.c in Sources */ = {isa = PBXBuildFile; fileRef = B87055ED0E67C32200CC2ED1 /* PJ_wink1.c */; };
B870568E0E67C32200CC2ED1 /* PJ_wink2.c in Sources */ = {isa = PBXBuildFile; fileRef = B87055EE0E67C32200CC2ED1 /* PJ_wink2.c */; };
B870568F0E67C32200CC2ED1 /* pj_zpoly1.c in Sources */ = {isa = PBXBuildFile; fileRef = B87055EF0E67C32200CC2ED1 /* pj_zpoly1.c */; };
B87056910E67C32200CC2ED1 /* proj_api.h in Headers */ = {isa = PBXBuildFile; fileRef = B87055F20E67C32200CC2ED1 /* proj_api.h */; settings = {ATTRIBUTES = (Public, ); }; };
B87056910E67C32200CC2ED1 /* proj_api.h in Headers */ = {isa = PBXBuildFile; fileRef = B87055F20E67C32200CC2ED1 /* proj_api.h */; settings = {ATTRIBUTES = (); }; };
B87056920E67C32200CC2ED1 /* proj_config.h in Headers */ = {isa = PBXBuildFile; fileRef = B87055F30E67C32200CC2ED1 /* proj_config.h */; settings = {ATTRIBUTES = (); }; };
B87056930E67C32200CC2ED1 /* proj_mdist.c in Sources */ = {isa = PBXBuildFile; fileRef = B87055F50E67C32200CC2ED1 /* proj_mdist.c */; };
B87056940E67C32200CC2ED1 /* proj_rouss.c in Sources */ = {isa = PBXBuildFile; fileRef = B87055F60E67C32200CC2ED1 /* proj_rouss.c */; };
... ... @@ -574,12 +574,12 @@
buildActionMask = 2147483647;
files = (
B87056020E67C32200CC2ED1 /* emess.h in Headers */,
B87056910E67C32200CC2ED1 /* proj_api.h in Headers */,
B87056050E67C32200CC2ED1 /* geocent.h in Headers */,
B870560A0E67C32200CC2ED1 /* geodesic.h in Headers */,
B87056130E67C32200CC2ED1 /* nad_list.h in Headers */,
B87056140E67C32200CC2ED1 /* org_proj4_Projections.h in Headers */,
B87056520E67C32200CC2ED1 /* pj_list.h in Headers */,
B87056910E67C32200CC2ED1 /* proj_api.h in Headers */,
B87056920E67C32200CC2ED1 /* proj_config.h in Headers */,
B87056950E67C32200CC2ED1 /* projects.h in Headers */,
);
... ... @@ -612,7 +612,11 @@
isa = PBXProject;
buildConfigurationList = 1DEB922208733DC00010E9CD /* Build configuration list for PBXProject "Proj4" */;
compatibilityVersion = "Xcode 3.1";
developmentRegion = English;
hasScannedForEncodings = 1;
knownRegions = (
en,
);
mainGroup = 0867D691FE84028FC02AAC07 /* Proj4 */;
productRefGroup = 034768DFFF38A50411DB9C8B /* Products */;
projectDirPath = "";
... ... @@ -789,7 +793,6 @@
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = Proj4_Prefix.pch;
GCC_WARN_UNUSED_VARIABLE = NO;
INSTALL_PATH = /usr/local/lib;
PRODUCT_NAME = Proj4;
};
name = Debug;
... ... @@ -803,7 +806,6 @@
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = Proj4_Prefix.pch;
GCC_WARN_UNUSED_VARIABLE = NO;
INSTALL_PATH = /usr/local/lib;
PRODUCT_NAME = Proj4;
};
name = Release;
... ... @@ -812,7 +814,6 @@
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = "$(ARCHS_STANDARD_32_BIT)";
CODE_SIGN_IDENTITY = "Don't Code Sign";
GCC_C_LANGUAGE_STANDARD = c99;
GCC_FAST_MATH = YES;
GCC_OPTIMIZATION_LEVEL = 0;
... ... @@ -822,6 +823,7 @@
IPHONEOS_DEPLOYMENT_TARGET = 3.0;
PREBINDING = NO;
SDKROOT = iphoneos;
SKIP_INSTALL = YES;
};
name = Debug;
};
... ... @@ -837,6 +839,7 @@
IPHONEOS_DEPLOYMENT_TARGET = 3.0;
PREBINDING = NO;
SDKROOT = iphoneos;
SKIP_INSTALL = YES;
};
name = Release;
};
... ...