From 7a374cdb97d00e45bbd74bbe8908691f1d341f64 Mon Sep 17 00:00:00 2001 From: Ilya Grechuhin Date: Fri, 11 Mar 2016 18:05:03 +0300 Subject: [PATCH] [ios] Fixed xc scheme build. --- .../drape_frontend.xcodeproj/project.pbxproj | 8 -------- xcode/geometry/geometry.xcodeproj/project.pbxproj | 8 ++++++++ xcode/jansson/jansson.xcodeproj/project.pbxproj | 4 ++++ 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/xcode/drape_frontend/drape_frontend.xcodeproj/project.pbxproj b/xcode/drape_frontend/drape_frontend.xcodeproj/project.pbxproj index 7f743b576d..044f2b19db 100644 --- a/xcode/drape_frontend/drape_frontend.xcodeproj/project.pbxproj +++ b/xcode/drape_frontend/drape_frontend.xcodeproj/project.pbxproj @@ -21,8 +21,6 @@ 670947981BDF9BE1005014C0 /* map_data_provider.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670947491BDF9BE0005014C0 /* map_data_provider.cpp */; }; 670947991BDF9BE1005014C0 /* map_data_provider.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 6709474A1BDF9BE0005014C0 /* map_data_provider.hpp */; }; 6709479A1BDF9BE1005014C0 /* map_shape.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 6709474B1BDF9BE0005014C0 /* map_shape.hpp */; }; - 6709479B1BDF9BE1005014C0 /* memory_feature_index.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6709474C1BDF9BE0005014C0 /* memory_feature_index.cpp */; }; - 6709479C1BDF9BE1005014C0 /* memory_feature_index.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 6709474D1BDF9BE0005014C0 /* memory_feature_index.hpp */; }; 6709479D1BDF9BE1005014C0 /* message_acceptor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6709474E1BDF9BE0005014C0 /* message_acceptor.cpp */; }; 6709479E1BDF9BE1005014C0 /* message_acceptor.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 6709474F1BDF9BE0005014C0 /* message_acceptor.hpp */; }; 6709479F1BDF9BE1005014C0 /* message_queue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670947501BDF9BE0005014C0 /* message_queue.cpp */; }; @@ -200,8 +198,6 @@ 670947491BDF9BE0005014C0 /* map_data_provider.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = map_data_provider.cpp; sourceTree = ""; }; 6709474A1BDF9BE0005014C0 /* map_data_provider.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = map_data_provider.hpp; sourceTree = ""; }; 6709474B1BDF9BE0005014C0 /* map_shape.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = map_shape.hpp; sourceTree = ""; }; - 6709474C1BDF9BE0005014C0 /* memory_feature_index.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = memory_feature_index.cpp; sourceTree = ""; }; - 6709474D1BDF9BE0005014C0 /* memory_feature_index.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = memory_feature_index.hpp; sourceTree = ""; }; 6709474E1BDF9BE0005014C0 /* message_acceptor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = message_acceptor.cpp; sourceTree = ""; }; 6709474F1BDF9BE0005014C0 /* message_acceptor.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = message_acceptor.hpp; sourceTree = ""; }; 670947501BDF9BE0005014C0 /* message_queue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = message_queue.cpp; sourceTree = ""; }; @@ -446,8 +442,6 @@ 670947491BDF9BE0005014C0 /* map_data_provider.cpp */, 6709474A1BDF9BE0005014C0 /* map_data_provider.hpp */, 6709474B1BDF9BE0005014C0 /* map_shape.hpp */, - 6709474C1BDF9BE0005014C0 /* memory_feature_index.cpp */, - 6709474D1BDF9BE0005014C0 /* memory_feature_index.hpp */, 6709474E1BDF9BE0005014C0 /* message_acceptor.cpp */, 6709474F1BDF9BE0005014C0 /* message_acceptor.hpp */, 670947501BDF9BE0005014C0 /* message_queue.cpp */, @@ -649,7 +643,6 @@ 677A2DE61C0DD55D00635A00 /* requested_tiles.hpp in Headers */, 670947C11BDF9BE1005014C0 /* shape_view_params.hpp in Headers */, 670948461BDF9C48005014C0 /* gui_text.hpp in Headers */, - 6709479C1BDF9BE1005014C0 /* memory_feature_index.hpp in Headers */, 670947E51BDF9BEC005014C0 /* engine_context.hpp in Headers */, 6743D3701C3A9F090095054B /* framebuffer.hpp in Headers */, F6B283141C1B04680081957A /* gps_track_shape.hpp in Headers */, @@ -835,7 +828,6 @@ 670948021BDF9BF5005014C0 /* drape_engine.cpp in Sources */, 56D545661C74A44900E3719C /* overlay_batcher.cpp in Sources */, 6709481C1BDF9C39005014C0 /* opacity_animation.cpp in Sources */, - 6709479B1BDF9BE1005014C0 /* memory_feature_index.cpp in Sources */, 670947E61BDF9BEC005014C0 /* frontend_renderer.cpp in Sources */, 670947D41BDF9BE1005014C0 /* tile_utils.cpp in Sources */, F6B283111C1B04680081957A /* gps_track_renderer.cpp in Sources */, diff --git a/xcode/geometry/geometry.xcodeproj/project.pbxproj b/xcode/geometry/geometry.xcodeproj/project.pbxproj index ed711807b0..2cd5c04014 100644 --- a/xcode/geometry/geometry.xcodeproj/project.pbxproj +++ b/xcode/geometry/geometry.xcodeproj/project.pbxproj @@ -7,6 +7,8 @@ objects = { /* Begin PBXBuildFile section */ + 345C55F51C93140A00B6783F /* clipping.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 345C55F31C93140A00B6783F /* clipping.cpp */; }; + 345C55F61C93140A00B6783F /* clipping.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 345C55F41C93140A00B6783F /* clipping.hpp */; }; 347F33701C454205009758CC /* triangle2d.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 347F336E1C454205009758CC /* triangle2d.cpp */; }; 347F33711C454205009758CC /* triangle2d.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 347F336F1C454205009758CC /* triangle2d.hpp */; }; 56D5456A1C74A46D00E3719C /* algorithm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56D545681C74A46D00E3719C /* algorithm.cpp */; }; @@ -95,6 +97,8 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ + 345C55F31C93140A00B6783F /* clipping.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = clipping.cpp; sourceTree = ""; }; + 345C55F41C93140A00B6783F /* clipping.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = clipping.hpp; sourceTree = ""; }; 347F336E1C454205009758CC /* triangle2d.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = triangle2d.cpp; sourceTree = ""; }; 347F336F1C454205009758CC /* triangle2d.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = triangle2d.hpp; sourceTree = ""; }; 56D545681C74A46D00E3719C /* algorithm.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = algorithm.cpp; sourceTree = ""; }; @@ -262,6 +266,8 @@ 675344931A3F684600A0A8C3 /* geometry */ = { isa = PBXGroup; children = ( + 345C55F31C93140A00B6783F /* clipping.cpp */, + 345C55F41C93140A00B6783F /* clipping.hpp */, 56D545681C74A46D00E3719C /* algorithm.cpp */, 56D545691C74A46D00E3719C /* algorithm.hpp */, 56EB1ECE1C6B6DF30022D831 /* segment2d.cpp */, @@ -331,6 +337,7 @@ 675344D21A3F687400A0A8C3 /* screenbase.hpp in Headers */, E92D8BD51C15AFAA00A98D17 /* mercator.hpp in Headers */, 56D5456B1C74A46D00E3719C /* algorithm.hpp in Headers */, + 345C55F61C93140A00B6783F /* clipping.hpp in Headers */, 675344BF1A3F687400A0A8C3 /* avg_vector.hpp in Headers */, 675344D31A3F687400A0A8C3 /* simplification.hpp in Headers */, 675344CC1A3F687400A0A8C3 /* rect_intersect.hpp in Headers */, @@ -480,6 +487,7 @@ 675344C61A3F687400A0A8C3 /* packer.cpp in Sources */, 675344DE1A3F68F900A0A8C3 /* binary_operators.cpp in Sources */, 56EB1ED01C6B6DF30022D831 /* segment2d.cpp in Sources */, + 345C55F51C93140A00B6783F /* clipping.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/xcode/jansson/jansson.xcodeproj/project.pbxproj b/xcode/jansson/jansson.xcodeproj/project.pbxproj index 2b33c85ae5..c392af83cc 100644 --- a/xcode/jansson/jansson.xcodeproj/project.pbxproj +++ b/xcode/jansson/jansson.xcodeproj/project.pbxproj @@ -7,6 +7,7 @@ objects = { /* Begin PBXBuildFile section */ + 345C55F81C93143B00B6783F /* myjansson.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 345C55F71C93143B00B6783F /* myjansson.cpp */; }; 6753445F1A3F666300A0A8C3 /* jansson_handle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6753445B1A3F666300A0A8C3 /* jansson_handle.cpp */; }; 675344601A3F666300A0A8C3 /* jansson_handle.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 6753445C1A3F666300A0A8C3 /* jansson_handle.hpp */; }; 675344611A3F666300A0A8C3 /* myjansson.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 6753445D1A3F666300A0A8C3 /* myjansson.hpp */; }; @@ -29,6 +30,7 @@ /* End PBXBuildFile section */ /* Begin PBXFileReference section */ + 345C55F71C93143B00B6783F /* myjansson.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = myjansson.cpp; sourceTree = ""; }; 670D05B01B0E09E40013A7AC /* defaults.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = defaults.xcconfig; path = ../defaults.xcconfig; sourceTree = ""; }; 6753444D1A3F664300A0A8C3 /* libjansson.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libjansson.a; sourceTree = BUILT_PRODUCTS_DIR; }; 6753445B1A3F666300A0A8C3 /* jansson_handle.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = jansson_handle.cpp; sourceTree = ""; }; @@ -110,6 +112,7 @@ 6753445B1A3F666300A0A8C3 /* jansson_handle.cpp */, 6753445C1A3F666300A0A8C3 /* jansson_handle.hpp */, 6753445D1A3F666300A0A8C3 /* myjansson.hpp */, + 345C55F71C93143B00B6783F /* myjansson.cpp */, ); name = jansson; path = ../../3party/jansson; @@ -193,6 +196,7 @@ 675344801A3F676C00A0A8C3 /* strconv.c in Sources */, 6753447D1A3F676C00A0A8C3 /* pack_unpack.c in Sources */, 675344761A3F676C00A0A8C3 /* hashtable.c in Sources */, + 345C55F81C93143B00B6783F /* myjansson.cpp in Sources */, 675344751A3F676C00A0A8C3 /* error.c in Sources */, 6753445F1A3F666300A0A8C3 /* jansson_handle.cpp in Sources */, 675344831A3F676C00A0A8C3 /* value.c in Sources */,