From c8aa92edd9ab911327e0cbb2e33502af1c9d215e Mon Sep 17 00:00:00 2001 From: Ilya Grechuhin Date: Thu, 21 Sep 2017 14:13:55 +0300 Subject: [xcode-9] [ios] Switched to new build system. --- .../drape_frontend.xcodeproj/project.pbxproj | 4 --- .../xcshareddata/WorkspaceSettings.xcsettings | 8 +++++ .../xcshareddata/omim.xcscmblueprint | 37 ++++++++++++++++++++++ 3 files changed, 45 insertions(+), 4 deletions(-) create mode 100644 xcode/omim.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings create mode 100644 xcode/omim.xcworkspace/xcshareddata/omim.xcscmblueprint (limited to 'xcode') diff --git a/xcode/drape_frontend/drape_frontend.xcodeproj/project.pbxproj b/xcode/drape_frontend/drape_frontend.xcodeproj/project.pbxproj index 6ffea2b66a..33849faa93 100644 --- a/xcode/drape_frontend/drape_frontend.xcodeproj/project.pbxproj +++ b/xcode/drape_frontend/drape_frontend.xcodeproj/project.pbxproj @@ -19,7 +19,6 @@ 34C624C41DABDB0400510300 /* traffic_generator.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 34C624C01DABDB0400510300 /* traffic_generator.hpp */; }; 34C624C51DABDB0400510300 /* traffic_renderer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 34C624C11DABDB0400510300 /* traffic_renderer.cpp */; }; 34C624C61DABDB0400510300 /* traffic_renderer.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 34C624C21DABDB0400510300 /* traffic_renderer.hpp */; }; - 3D489BC51D3D21FC0052AA38 /* libdrape.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3D489BC41D3D21FC0052AA38 /* libdrape.a */; }; 451A2A821EE8464E003E05A4 /* circles_pack_shape.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 451A2A801EE8464E003E05A4 /* circles_pack_shape.cpp */; }; 451A2A831EE8464E003E05A4 /* circles_pack_shape.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 451A2A811EE8464E003E05A4 /* circles_pack_shape.hpp */; }; 452C9ED41CEDCF3200A55E57 /* animation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 452C9EC21CEDCF3200A55E57 /* animation.cpp */; }; @@ -217,7 +216,6 @@ 34C624C01DABDB0400510300 /* traffic_generator.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = traffic_generator.hpp; sourceTree = ""; }; 34C624C11DABDB0400510300 /* traffic_renderer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = traffic_renderer.cpp; sourceTree = ""; }; 34C624C21DABDB0400510300 /* traffic_renderer.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = traffic_renderer.hpp; sourceTree = ""; }; - 3D489BC41D3D21FC0052AA38 /* libdrape.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libdrape.a; path = "../../../omim-xcode-build/Debug/libdrape.a"; sourceTree = ""; }; 451A2A7E1EE8463F003E05A4 /* circle_point.fsh.glsl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = circle_point.fsh.glsl; path = shaders/circle_point.fsh.glsl; sourceTree = ""; }; 451A2A7F1EE8463F003E05A4 /* circle_point.vsh.glsl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = circle_point.vsh.glsl; path = shaders/circle_point.vsh.glsl; sourceTree = ""; }; 451A2A801EE8464E003E05A4 /* circles_pack_shape.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = circles_pack_shape.cpp; sourceTree = ""; }; @@ -471,7 +469,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 3D489BC51D3D21FC0052AA38 /* libdrape.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -552,7 +549,6 @@ 670947311BDF9B82005014C0 = { isa = PBXGroup; children = ( - 3D489BC41D3D21FC0052AA38 /* libdrape.a */, 34AF87CB1DBE508400E5E7DC /* common-debug.xcconfig */, 34AF87CC1DBE508400E5E7DC /* common-release.xcconfig */, 670947411BDF9B99005014C0 /* drape_frontend */, diff --git a/xcode/omim.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/xcode/omim.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings new file mode 100644 index 0000000000..3ddf867a10 --- /dev/null +++ b/xcode/omim.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings @@ -0,0 +1,8 @@ + + + + + BuildSystemType + Latest + + diff --git a/xcode/omim.xcworkspace/xcshareddata/omim.xcscmblueprint b/xcode/omim.xcworkspace/xcshareddata/omim.xcscmblueprint new file mode 100644 index 0000000000..0ffda4fa39 --- /dev/null +++ b/xcode/omim.xcworkspace/xcshareddata/omim.xcscmblueprint @@ -0,0 +1,37 @@ +{ + "DVTSourceControlWorkspaceBlueprintPrimaryRemoteRepositoryKey" : "B26DB2F6C5B4675C4BB11143C1085C05FBADA703", + "DVTSourceControlWorkspaceBlueprintWorkingCopyRepositoryLocationsKey" : { + + }, + "DVTSourceControlWorkspaceBlueprintWorkingCopyStatesKey" : { + "DBA6F8B12B84878540F44342C4772AC004D85ABD" : 9223372036854775807, + "B26DB2F6C5B4675C4BB11143C1085C05FBADA703" : 9223372036854775807, + "831A82967244E288C124F36CE35B6FD37374E6F8" : 9223372036854775807 + }, + "DVTSourceControlWorkspaceBlueprintIdentifierKey" : "4D9481CD-9A83-4BD5-9098-7CC956604DCF", + "DVTSourceControlWorkspaceBlueprintWorkingCopyPathsKey" : { + "DBA6F8B12B84878540F44342C4772AC004D85ABD" : "omim\/3party\/protobuf\/protobuf\/", + "B26DB2F6C5B4675C4BB11143C1085C05FBADA703" : "omim\/", + "831A82967244E288C124F36CE35B6FD37374E6F8" : "omim\/3party\/Alohalytics\/" + }, + "DVTSourceControlWorkspaceBlueprintNameKey" : "omim", + "DVTSourceControlWorkspaceBlueprintVersion" : 204, + "DVTSourceControlWorkspaceBlueprintRelativePathToProjectKey" : "xcode\/omim.xcworkspace", + "DVTSourceControlWorkspaceBlueprintRemoteRepositoriesKey" : [ + { + "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "git:\/\/github.com\/mapsme\/Alohalytics.git", + "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git", + "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "831A82967244E288C124F36CE35B6FD37374E6F8" + }, + { + "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/mapsme\/omim.git", + "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git", + "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "B26DB2F6C5B4675C4BB11143C1085C05FBADA703" + }, + { + "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "git:\/\/github.com\/mapsme\/protobuf.git", + "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git", + "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "DBA6F8B12B84878540F44342C4772AC004D85ABD" + } + ] +} \ No newline at end of file -- cgit v1.2.3