gpesquero/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

Merge pull request #4537 from igrechuhin/xc-scheme

Browse source 
[ios] Fixed xc scheme build.
This commit is contained in:
Vlad Mihaylenko 2016-10-20 11:49:48 +04:00 • committed by GitHub
commit 9f515cd000
4 changed files with 21 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
xcode/editor/editor.xcodeproj/project.pbxproj
View file

@ -175,7 +175,7 @@
isa = PBXProject;
attributes = {
LastUpgradeCheck = 0710;
ORGANIZATIONNAME = "Ilya Grechuhin";
ORGANIZATIONNAME = maps.me;
TargetAttributes = {
3411386A1C15AD97002E3B3E = {
CreatedOnToolsVersion = 7.1.1;

32
xcode/omim.xcworkspace/contents.xcworkspacedata generated
View file

@ -2,16 +2,16 @@
<Workspace
version = "1.0">
<FileRef
location = "group:defaults.xcconfig">
location = "container:defaults.xcconfig">
</FileRef>
<Group
location = "container:"
name = "3party">
<FileRef
location = "group:agg/agg.xcodeproj">
location = "container:agg/agg.xcodeproj">
</FileRef>
<FileRef
location = "group:lodepng/lodepng.xcodeproj">
location = "container:lodepng/lodepng.xcodeproj">
</FileRef>
<FileRef
location = "container:gflags/gflags.xcodeproj">
@ -41,28 +41,28 @@
location = "container:alohalitics/alohalitics.xcodeproj">
</FileRef>
<FileRef
location = "group:protobuf/protobuf.xcodeproj">
location = "container:protobuf/protobuf.xcodeproj">
</FileRef>
<FileRef
location = "container:expat/expat.xcodeproj">
</FileRef>
<FileRef
location = "group:minizip/minizip.xcodeproj">
location = "container:minizip/minizip.xcodeproj">
</FileRef>
<FileRef
location = "group:tess2/tess2.xcodeproj">
location = "container:tess2/tess2.xcodeproj">
</FileRef>
<FileRef
location = "group:sdf_image/sdf_image.xcodeproj">
location = "container:sdf_image/sdf_image.xcodeproj">
</FileRef>
<FileRef
location = "group:stb_image/stb_image.xcodeproj">
location = "container:stb_image/stb_image.xcodeproj">
</FileRef>
<FileRef
location = "group:pugixml/pugixml.xcodeproj">
location = "container:pugixml/pugixml.xcodeproj">
</FileRef>
<FileRef
location = "group:oauthcpp/oauthcpp.xcodeproj">
location = "container:oauthcpp/oauthcpp.xcodeproj">
</FileRef>
</Group>
<FileRef
@ -78,7 +78,7 @@
location = "container:drape/drape.xcodeproj">
</FileRef>
<FileRef
location = "group:drape_frontend/drape_frontend.xcodeproj">
location = "container:drape_frontend/drape_frontend.xcodeproj">
</FileRef>
<FileRef
location = "container:geometry/geometry.xcodeproj">
@ -105,7 +105,7 @@
location = "container:storage/storage.xcodeproj">
</FileRef>
<FileRef
location = "group:tracking/tracking.xcodeproj">
location = "container:tracking/tracking.xcodeproj">
</FileRef>
<FileRef
location = "container:generator_tool/generator_tool.xcodeproj">
@ -117,16 +117,16 @@
location = "container:"
name = "iOS">
<FileRef
location = "group:../iphone/Maps/Maps.xcodeproj">
location = "container:../iphone/Maps/Maps.xcodeproj">
</FileRef>
</Group>
<FileRef
location = "group:mapshot/mapshot.xcodeproj">
location = "container:mapshot/mapshot.xcodeproj">
</FileRef>
<FileRef
location = "group:partners_api/partners_api.xcodeproj">
location = "container:partners_api/partners_api.xcodeproj">
</FileRef>
<FileRef
location = "group:editor/editor.xcodeproj">
location = "container:editor/editor.xcodeproj">
</FileRef>
</Workspace>

1
xcode/partners_api/partners_api.xcodeproj/project.pbxproj
View file

@ -202,6 +202,7 @@
isa = PBXProject;
attributes = {
LastUpgradeCheck = 0800;
ORGANIZATIONNAME = maps.me;
TargetAttributes = {
F6B536331DA5209F0067EEA5 = {
CreatedOnToolsVersion = 8.0;

8
xcode/tracking/tracking.xcodeproj/project.pbxproj
View file

@ -11,7 +11,6 @@
675E88651DB7AC9000F8EBDA /* connection.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675E88611DB7AC9000F8EBDA /* connection.hpp */; };
675E88661DB7AC9000F8EBDA /* reporter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 675E88621DB7AC9000F8EBDA /* reporter.cpp */; };
675E88671DB7AC9000F8EBDA /* reporter.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675E88631DB7AC9000F8EBDA /* reporter.hpp */; };
675E88881DB7AD2D00F8EBDA /* testingmain.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 675E88861DB7AD2600F8EBDA /* testingmain.cpp */; };
675E88891DB7AD3100F8EBDA /* reporter_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 675E88841DB7AD1000F8EBDA /* reporter_test.cpp */; };
675E88921DB7B03400F8EBDA /* libbase.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 675E888E1DB7B03400F8EBDA /* libbase.a */; };
675E88931DB7B03400F8EBDA /* libcoding.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 675E888F1DB7B03400F8EBDA /* libcoding.a */; };
@ -31,7 +30,6 @@
675E88631DB7AC9000F8EBDA /* reporter.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = reporter.hpp; sourceTree = "<group>"; };
675E886C1DB7ACD900F8EBDA /* tracking_tests.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = tracking_tests.app; sourceTree = BUILT_PRODUCTS_DIR; };
675E88841DB7AD1000F8EBDA /* reporter_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = reporter_test.cpp; sourceTree = "<group>"; };
675E88861DB7AD2600F8EBDA /* testingmain.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = testingmain.cpp; path = /Users/darkserj/mapsme/omim/storage/storage_tests/../../testing/testingmain.cpp; sourceTree = "<absolute>"; };
675E888E1DB7B03400F8EBDA /* libbase.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libbase.a; path = "/Users/darkserj/mapsme/omim/xcode/base/../../../omim-xcode-build/Debug/libbase.a"; sourceTree = "<absolute>"; };
675E888F1DB7B03400F8EBDA /* libcoding.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libcoding.a; path = "/Users/darkserj/mapsme/omim/xcode/coding/../../../omim-xcode-build/Debug/libcoding.a"; sourceTree = "<absolute>"; };
675E88901DB7B03400F8EBDA /* libgeometry.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libgeometry.a; path = "/Users/darkserj/mapsme/omim/xcode/geometry/../../../omim-xcode-build/Debug/libgeometry.a"; sourceTree = "<absolute>"; };
@ -100,7 +98,6 @@
675E88831DB7ACEA00F8EBDA /* tracking_tests */ = {
isa = PBXGroup;
children = (
675E88861DB7AD2600F8EBDA /* testingmain.cpp */,
675E88841DB7AD1000F8EBDA /* reporter_test.cpp */,
);
name = tracking_tests;
@ -176,7 +173,7 @@
isa = PBXProject;
attributes = {
LastUpgradeCheck = 0800;
ORGANIZATIONNAME = Mail.Ru;
ORGANIZATIONNAME = maps.me;
TargetAttributes = {
675E884F1DB7AC0300F8EBDA = {
CreatedOnToolsVersion = 8.0;
@ -232,7 +229,6 @@
buildActionMask = 2147483647;
files = (
675E88891DB7AD3100F8EBDA /* reporter_test.cpp in Sources */,
675E88881DB7AD2D00F8EBDA /* testingmain.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@ -400,6 +396,7 @@
675E885D1DB7AC0300F8EBDA /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
675E88801DB7ACD900F8EBDA /* Build configuration list for PBXNativeTarget "tracking_tests" */ = {
isa = XCConfigurationList;
@ -408,6 +405,7 @@
675E88821DB7ACD900F8EBDA /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
/* End XCConfigurationList section */
};