diff --git a/xcode/drape/drape.xcodeproj/project.pbxproj b/xcode/drape/drape.xcodeproj/project.pbxproj index 4ee6d480a9..e8bc00669d 100644 --- a/xcode/drape/drape.xcodeproj/project.pbxproj +++ b/xcode/drape/drape.xcodeproj/project.pbxproj @@ -97,6 +97,8 @@ 6729A5B31A69213A007D5872 /* vertex_decl.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 6729A5601A69213A007D5872 /* vertex_decl.hpp */; }; 6729A5B41A69213A007D5872 /* vertex_array_buffer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6729A5611A69213A007D5872 /* vertex_array_buffer.cpp */; }; 6729A5B51A69213A007D5872 /* vertex_array_buffer.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 6729A5621A69213A007D5872 /* vertex_array_buffer.hpp */; }; + 675D21991BFB876E00717E4F /* projection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 675D21971BFB876E00717E4F /* projection.cpp */; }; + 675D219A1BFB876E00717E4F /* projection.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675D21981BFB876E00717E4F /* projection.hpp */; }; /* End PBXBuildFile section */ /* Begin PBXBuildRule section */ @@ -219,6 +221,8 @@ 6729A5601A69213A007D5872 /* vertex_decl.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = vertex_decl.hpp; sourceTree = ""; }; 6729A5611A69213A007D5872 /* vertex_array_buffer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = vertex_array_buffer.cpp; sourceTree = ""; }; 6729A5621A69213A007D5872 /* vertex_array_buffer.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = vertex_array_buffer.hpp; sourceTree = ""; }; + 675D21971BFB876E00717E4F /* projection.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = projection.cpp; sourceTree = ""; }; + 675D21981BFB876E00717E4F /* projection.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = projection.hpp; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -378,6 +382,8 @@ 6729A55C1A69213A007D5872 /* utils */ = { isa = PBXGroup; children = ( + 675D21971BFB876E00717E4F /* projection.cpp */, + 675D21981BFB876E00717E4F /* projection.hpp */, 6729A55F1A69213A007D5872 /* vertex_decl.cpp */, 6729A5601A69213A007D5872 /* vertex_decl.hpp */, ); @@ -408,6 +414,7 @@ 6729A5681A69213A007D5872 /* batcher_helpers.hpp in Headers */, 6729A5931A69213A007D5872 /* oglcontextfactory.hpp in Headers */, 6729A56A1A69213A007D5872 /* batcher.hpp in Headers */, + 675D219A1BFB876E00717E4F /* projection.hpp in Headers */, 670947291BDF9A4F005014C0 /* hw_texture_ios.hpp in Headers */, 670947281BDF9A4F005014C0 /* glyph_manager.hpp in Headers */, 6729A5991A69213A007D5872 /* pointers.hpp in Headers */, @@ -516,6 +523,7 @@ 6729A5981A69213A007D5872 /* pointers.cpp in Sources */, 6729A5881A69213A007D5872 /* gpu_program_manager.cpp in Sources */, 6729A5A41A69213A007D5872 /* symbols_texture.cpp in Sources */, + 675D21991BFB876E00717E4F /* projection.cpp in Sources */, 6729A56D1A69213A007D5872 /* buffer_base.cpp in Sources */, 6729A5A01A69213A007D5872 /* shader.cpp in Sources */, 6709472F1BDF9A4F005014C0 /* shader_def.cpp in Sources */, diff --git a/xcode/drape_frontend/drape_frontend.xcodeproj/project.pbxproj b/xcode/drape_frontend/drape_frontend.xcodeproj/project.pbxproj index 5be5407845..40e4038541 100644 --- a/xcode/drape_frontend/drape_frontend.xcodeproj/project.pbxproj +++ b/xcode/drape_frontend/drape_frontend.xcodeproj/project.pbxproj @@ -152,9 +152,16 @@ 6709487B1BDF9C7F005014C0 /* path_info.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 670948651BDF9C7F005014C0 /* path_info.hpp */; }; 6709487C1BDF9C7F005014C0 /* pen_info.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 670948661BDF9C7F005014C0 /* pen_info.hpp */; }; 6709487D1BDF9C7F005014C0 /* point.h in Headers */ = {isa = PBXBuildFile; fileRef = 670948671BDF9C7F005014C0 /* point.h */; }; + 675D21661BFB785900717E4F /* ruler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670948331BDF9C48005014C0 /* ruler.cpp */; }; + 675D218C1BFB871D00717E4F /* proto_to_styles.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 675D21851BFB871D00717E4F /* proto_to_styles.cpp */; }; + 675D218D1BFB871D00717E4F /* proto_to_styles.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675D21861BFB871D00717E4F /* proto_to_styles.hpp */; }; + 675D218E1BFB871D00717E4F /* rect.h in Headers */ = {isa = PBXBuildFile; fileRef = 675D21871BFB871D00717E4F /* rect.h */; }; + 675D218F1BFB871D00717E4F /* software_renderer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 675D21881BFB871D00717E4F /* software_renderer.cpp */; }; + 675D21901BFB871D00717E4F /* software_renderer.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675D21891BFB871D00717E4F /* software_renderer.hpp */; }; + 675D21911BFB871D00717E4F /* text_engine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 675D218A1BFB871D00717E4F /* text_engine.cpp */; }; + 675D21921BFB871D00717E4F /* text_engine.h in Headers */ = {isa = PBXBuildFile; fileRef = 675D218B1BFB871D00717E4F /* text_engine.h */; }; 67E91C751BDFC85E005CEE88 /* feature_processor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670948591BDF9C7F005014C0 /* feature_processor.cpp */; }; 67E91C761BDFC85E005CEE88 /* glyph_cache_impl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670948601BDF9C7F005014C0 /* glyph_cache_impl.cpp */; }; - 67E91C771BDFC85E005CEE88 /* ruler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670948331BDF9C48005014C0 /* ruler.cpp */; }; 67E91C781BDFC85E005CEE88 /* area_shape.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670947EA1BDF9BF5005014C0 /* area_shape.cpp */; }; 67E91C791BDFC85E005CEE88 /* base_renderer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670947EE1BDF9BF5005014C0 /* base_renderer.cpp */; }; 67E91C7A1BDFC85E005CEE88 /* circle_shape.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670947F21BDF9BF5005014C0 /* circle_shape.cpp */; }; @@ -323,6 +330,13 @@ 670948661BDF9C7F005014C0 /* pen_info.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = pen_info.hpp; sourceTree = ""; }; 670948671BDF9C7F005014C0 /* point.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = point.h; sourceTree = ""; }; 6709487E1BDF9F15005014C0 /* defaults.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = defaults.xcconfig; path = ../defaults.xcconfig; sourceTree = ""; }; + 675D21851BFB871D00717E4F /* proto_to_styles.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = proto_to_styles.cpp; sourceTree = ""; }; + 675D21861BFB871D00717E4F /* proto_to_styles.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = proto_to_styles.hpp; sourceTree = ""; }; + 675D21871BFB871D00717E4F /* rect.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = rect.h; sourceTree = ""; }; + 675D21881BFB871D00717E4F /* software_renderer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = software_renderer.cpp; sourceTree = ""; }; + 675D21891BFB871D00717E4F /* software_renderer.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = software_renderer.hpp; sourceTree = ""; }; + 675D218A1BFB871D00717E4F /* text_engine.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = text_engine.cpp; sourceTree = ""; }; + 675D218B1BFB871D00717E4F /* text_engine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = text_engine.h; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -515,6 +529,13 @@ 670948511BDF9C5F005014C0 /* watch */ = { isa = PBXGroup; children = ( + 675D21851BFB871D00717E4F /* proto_to_styles.cpp */, + 675D21861BFB871D00717E4F /* proto_to_styles.hpp */, + 675D21871BFB871D00717E4F /* rect.h */, + 675D21881BFB871D00717E4F /* software_renderer.cpp */, + 675D21891BFB871D00717E4F /* software_renderer.hpp */, + 675D218A1BFB871D00717E4F /* text_engine.cpp */, + 675D218B1BFB871D00717E4F /* text_engine.h */, 670948521BDF9C7F005014C0 /* agg_curves.cpp */, 670948531BDF9C7F005014C0 /* area_info.hpp */, 670948541BDF9C7F005014C0 /* brush_info.hpp */, @@ -553,6 +574,7 @@ 670948031BDF9BF5005014C0 /* drape_engine.hpp in Headers */, 6709486A1BDF9C7F005014C0 /* brush_info.hpp in Headers */, 670948401BDF9C48005014C0 /* country_status_helper.hpp in Headers */, + 675D218E1BFB871D00717E4F /* rect.h in Headers */, 670948191BDF9C39005014C0 /* interpolations.hpp in Headers */, 670947CB1BDF9BE1005014C0 /* threads_commutator.hpp in Headers */, 670948701BDF9C7F005014C0 /* feature_processor.hpp in Headers */, @@ -574,6 +596,8 @@ 670947AE1BDF9BE1005014C0 /* poi_symbol_shape.hpp in Headers */, 670947AA1BDF9BE1005014C0 /* path_symbol_shape.hpp in Headers */, 6709483E1BDF9C48005014C0 /* copyright_label.hpp in Headers */, + 675D21921BFB871D00717E4F /* text_engine.h in Headers */, + 675D218D1BFB871D00717E4F /* proto_to_styles.hpp in Headers */, 670947951BDF9BE1005014C0 /* line_shape_helper.hpp in Headers */, 670948501BDF9C48005014C0 /* skin.hpp in Headers */, 6709481B1BDF9C39005014C0 /* model_view_animation.hpp in Headers */, @@ -626,6 +650,7 @@ 6709487A1BDF9C7F005014C0 /* icon_info.hpp in Headers */, 670948151BDF9C39005014C0 /* base_interpolator.hpp in Headers */, 670947A61BDF9BE1005014C0 /* my_position.hpp in Headers */, + 675D21901BFB871D00717E4F /* software_renderer.hpp in Headers */, 670947A81BDF9BE1005014C0 /* navigator.hpp in Headers */, 670947A21BDF9BE1005014C0 /* message.hpp in Headers */, 6709487B1BDF9C7F005014C0 /* path_info.hpp in Headers */, @@ -692,7 +717,6 @@ files = ( 67E91C751BDFC85E005CEE88 /* feature_processor.cpp in Sources */, 67E91C761BDFC85E005CEE88 /* glyph_cache_impl.cpp in Sources */, - 67E91C771BDFC85E005CEE88 /* ruler.cpp in Sources */, 67E91C781BDFC85E005CEE88 /* area_shape.cpp in Sources */, 67E91C791BDFC85E005CEE88 /* base_renderer.cpp in Sources */, 67E91C7A1BDFC85E005CEE88 /* circle_shape.cpp in Sources */, @@ -703,6 +727,8 @@ 6709486E1BDF9C7F005014C0 /* default_font.cpp in Sources */, 670947D01BDF9BE1005014C0 /* tile_tree_builder.cpp in Sources */, 670947D21BDF9BE1005014C0 /* tile_tree.cpp in Sources */, + 675D21661BFB785900717E4F /* ruler.cpp in Sources */, + 675D218F1BFB871D00717E4F /* software_renderer.cpp in Sources */, 670947CE1BDF9BE1005014C0 /* tile_key.cpp in Sources */, 670947AB1BDF9BE1005014C0 /* path_text_shape.cpp in Sources */, 670947F61BDF9BF5005014C0 /* apply_feature_functors.cpp in Sources */, @@ -713,6 +739,7 @@ 6709483B1BDF9C48005014C0 /* compass.cpp in Sources */, 670947921BDF9BE1005014C0 /* kinetic_scroller.cpp in Sources */, 6709484D1BDF9C48005014C0 /* shape.cpp in Sources */, + 675D218C1BFB871D00717E4F /* proto_to_styles.cpp in Sources */, 670948781BDF9C7F005014C0 /* glyph_cache.cpp in Sources */, 670948431BDF9C48005014C0 /* drape_gui.cpp in Sources */, 670947D61BDF9BE1005014C0 /* user_event_stream.cpp in Sources */, @@ -748,6 +775,7 @@ 670947B91BDF9BE1005014C0 /* route_renderer.cpp in Sources */, 670948411BDF9C48005014C0 /* country_status.cpp in Sources */, 670947B31BDF9BE1005014C0 /* render_group.cpp in Sources */, + 675D21911BFB871D00717E4F /* text_engine.cpp in Sources */, 670947FE1BDF9BF5005014C0 /* batchers_pool.cpp in Sources */, 670947DC1BDF9BE1005014C0 /* viewport.cpp in Sources */, 670947CA1BDF9BE1005014C0 /* threads_commutator.cpp in Sources */, diff --git a/xcode/geometry/geometry.xcodeproj/project.pbxproj b/xcode/geometry/geometry.xcodeproj/project.pbxproj index 4e50925033..30e623dec8 100644 --- a/xcode/geometry/geometry.xcodeproj/project.pbxproj +++ b/xcode/geometry/geometry.xcodeproj/project.pbxproj @@ -71,6 +71,8 @@ 675344DE1A3F68F900A0A8C3 /* binary_operators.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 675344DB1A3F68F900A0A8C3 /* binary_operators.cpp */; }; 675344DF1A3F68F900A0A8C3 /* binary_operators.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675344DC1A3F68F900A0A8C3 /* binary_operators.hpp */; }; 675344E01A3F68F900A0A8C3 /* boost_concept.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675344DD1A3F68F900A0A8C3 /* boost_concept.hpp */; }; + 675D21951BFB874500717E4F /* latlon.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 675D21931BFB874500717E4F /* latlon.cpp */; }; + 675D21961BFB874500717E4F /* latlon.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675D21941BFB874500717E4F /* latlon.hpp */; }; /* End PBXBuildFile section */ /* Begin PBXCopyFilesBuildPhase section */ @@ -152,6 +154,8 @@ 675344DB1A3F68F900A0A8C3 /* binary_operators.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = binary_operators.cpp; sourceTree = ""; }; 675344DC1A3F68F900A0A8C3 /* binary_operators.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = binary_operators.hpp; sourceTree = ""; }; 675344DD1A3F68F900A0A8C3 /* boost_concept.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = boost_concept.hpp; sourceTree = ""; }; + 675D21931BFB874500717E4F /* latlon.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = latlon.cpp; sourceTree = ""; }; + 675D21941BFB874500717E4F /* latlon.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = latlon.hpp; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ diff --git a/xcode/map/map.xcodeproj/project.pbxproj b/xcode/map/map.xcodeproj/project.pbxproj index 1c8bc595b1..b2b451fac5 100644 --- a/xcode/map/map.xcodeproj/project.pbxproj +++ b/xcode/map/map.xcodeproj/project.pbxproj @@ -12,8 +12,6 @@ 34921F661BFA0A6900737D6E /* api_mark_point.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 34921F611BFA0A6900737D6E /* api_mark_point.hpp */; }; 34921F671BFA0A6900737D6E /* styled_point.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 34921F621BFA0A6900737D6E /* styled_point.cpp */; }; 34921F681BFA0A6900737D6E /* styled_point.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 34921F631BFA0A6900737D6E /* styled_point.hpp */; }; - 674A29C71B26F83C001A525C /* navigator_utils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 67D1C8041AE50EEE00A239E3 /* navigator_utils.cpp */; }; - 674A29C81B26F844001A525C /* navigator_utils.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 67D1C8051AE50EEE00A239E3 /* navigator_utils.hpp */; }; 674A29F01B26FD6F001A525C /* testingmain.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 674A29EE1B26FD5F001A525C /* testingmain.cpp */; }; 674A2A0D1B26FE62001A525C /* libalohalitics.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 674A29F11B26FE62001A525C /* libalohalitics.a */; }; 674A2A0E1B26FE62001A525C /* libanim.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 674A29F21B26FE62001A525C /* libanim.a */; }; @@ -46,29 +44,16 @@ 674A2A331B26FFE9001A525C /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 674A2A321B26FFE9001A525C /* OpenGL.framework */; }; 674A2A361B27011A001A525C /* working_time_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 674A2A351B27011A001A525C /* working_time_tests.cpp */; }; 674A2A381B2715FB001A525C /* osm_opening_hours.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 674A2A371B2715FB001A525C /* osm_opening_hours.hpp */; }; + 674C38601BFF3095000D603B /* storage_bridge.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 674C385D1BFF3095000D603B /* storage_bridge.cpp */; }; + 674C38611BFF3095000D603B /* storage_bridge.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 674C385E1BFF3095000D603B /* storage_bridge.hpp */; }; + 674C38621BFF3095000D603B /* user_mark.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 674C385F1BFF3095000D603B /* user_mark.cpp */; }; 675346381A4054E800A0A8C3 /* active_maps_layout.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 675345C91A4054E800A0A8C3 /* active_maps_layout.cpp */; }; 675346391A4054E800A0A8C3 /* active_maps_layout.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675345CA1A4054E800A0A8C3 /* active_maps_layout.hpp */; }; 6753463A1A4054E800A0A8C3 /* address_finder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 675345CB1A4054E800A0A8C3 /* address_finder.cpp */; }; - 6753463B1A4054E800A0A8C3 /* alfa_animation_task.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 675345CC1A4054E800A0A8C3 /* alfa_animation_task.cpp */; }; - 6753463C1A4054E800A0A8C3 /* alfa_animation_task.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675345CD1A4054E800A0A8C3 /* alfa_animation_task.hpp */; }; - 6753463D1A4054E800A0A8C3 /* anim_phase_chain.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 675345CE1A4054E800A0A8C3 /* anim_phase_chain.cpp */; }; - 6753463E1A4054E800A0A8C3 /* anim_phase_chain.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675345CF1A4054E800A0A8C3 /* anim_phase_chain.hpp */; }; - 6753463F1A4054E800A0A8C3 /* animator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 675345D01A4054E800A0A8C3 /* animator.cpp */; }; - 675346401A4054E800A0A8C3 /* animator.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675345D11A4054E800A0A8C3 /* animator.hpp */; }; - 675346441A4054E800A0A8C3 /* benchmark_engine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 675345D51A4054E800A0A8C3 /* benchmark_engine.cpp */; }; - 675346451A4054E800A0A8C3 /* benchmark_engine.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675345D61A4054E800A0A8C3 /* benchmark_engine.hpp */; }; - 675346461A4054E800A0A8C3 /* benchmark_provider.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 675345D71A4054E800A0A8C3 /* benchmark_provider.cpp */; }; - 675346471A4054E800A0A8C3 /* benchmark_provider.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675345D81A4054E800A0A8C3 /* benchmark_provider.hpp */; }; 675346481A4054E800A0A8C3 /* bookmark_manager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 675345D91A4054E800A0A8C3 /* bookmark_manager.cpp */; }; 675346491A4054E800A0A8C3 /* bookmark_manager.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675345DA1A4054E800A0A8C3 /* bookmark_manager.hpp */; }; 6753464A1A4054E800A0A8C3 /* bookmark.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 675345DB1A4054E800A0A8C3 /* bookmark.cpp */; }; 6753464B1A4054E800A0A8C3 /* bookmark.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675345DC1A4054E800A0A8C3 /* bookmark.hpp */; }; - 6753464C1A4054E800A0A8C3 /* change_viewport_task.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 675345DD1A4054E800A0A8C3 /* change_viewport_task.cpp */; }; - 6753464D1A4054E800A0A8C3 /* change_viewport_task.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675345DE1A4054E800A0A8C3 /* change_viewport_task.hpp */; }; - 6753464E1A4054E800A0A8C3 /* compass_arrow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 675345DF1A4054E800A0A8C3 /* compass_arrow.cpp */; }; - 6753464F1A4054E800A0A8C3 /* compass_arrow.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675345E01A4054E800A0A8C3 /* compass_arrow.hpp */; }; - 675346501A4054E800A0A8C3 /* country_status_display.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 675345E11A4054E800A0A8C3 /* country_status_display.cpp */; }; - 675346511A4054E800A0A8C3 /* country_status_display.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675345E21A4054E800A0A8C3 /* country_status_display.hpp */; }; 675346521A4054E800A0A8C3 /* country_tree.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 675345E31A4054E800A0A8C3 /* country_tree.cpp */; }; 675346531A4054E800A0A8C3 /* country_tree.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675345E41A4054E800A0A8C3 /* country_tree.hpp */; }; 675346621A4054E800A0A8C3 /* feature_vec_model.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 675345F31A4054E800A0A8C3 /* feature_vec_model.cpp */; }; @@ -79,31 +64,13 @@ 675346671A4054E800A0A8C3 /* ge0_parser.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675345F81A4054E800A0A8C3 /* ge0_parser.hpp */; }; 6753466A1A4054E800A0A8C3 /* geourl_process.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 675345FB1A4054E800A0A8C3 /* geourl_process.cpp */; }; 6753466B1A4054E800A0A8C3 /* geourl_process.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675345FC1A4054E800A0A8C3 /* geourl_process.hpp */; }; - 6753466C1A4054E800A0A8C3 /* information_display.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 675345FD1A4054E800A0A8C3 /* information_display.cpp */; }; - 6753466D1A4054E800A0A8C3 /* information_display.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675345FE1A4054E800A0A8C3 /* information_display.hpp */; }; - 6753466E1A4054E800A0A8C3 /* location_state.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 675345FF1A4054E800A0A8C3 /* location_state.cpp */; }; - 6753466F1A4054E800A0A8C3 /* location_state.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675346001A4054E800A0A8C3 /* location_state.hpp */; }; - 675346721A4054E800A0A8C3 /* move_screen_task.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 675346031A4054E800A0A8C3 /* move_screen_task.cpp */; }; - 675346731A4054E800A0A8C3 /* move_screen_task.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675346041A4054E800A0A8C3 /* move_screen_task.hpp */; }; 675346741A4054E800A0A8C3 /* mwm_url.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 675346051A4054E800A0A8C3 /* mwm_url.cpp */; }; 675346751A4054E800A0A8C3 /* mwm_url.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675346061A4054E800A0A8C3 /* mwm_url.hpp */; }; - 675346761A4054E800A0A8C3 /* navigator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 675346071A4054E800A0A8C3 /* navigator.cpp */; }; - 675346771A4054E800A0A8C3 /* navigator.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675346081A4054E800A0A8C3 /* navigator.hpp */; }; - 675346791A4054E800A0A8C3 /* pin_click_manager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6753460A1A4054E800A0A8C3 /* pin_click_manager.cpp */; }; - 6753467A1A4054E800A0A8C3 /* pin_click_manager.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 6753460B1A4054E800A0A8C3 /* pin_click_manager.hpp */; }; - 6753467E1A4054E800A0A8C3 /* qgl_render_context.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 6753460F1A4054E800A0A8C3 /* qgl_render_context.hpp */; }; - 675346831A4054E800A0A8C3 /* rotate_screen_task.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 675346141A4054E800A0A8C3 /* rotate_screen_task.cpp */; }; - 675346841A4054E800A0A8C3 /* rotate_screen_task.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675346151A4054E800A0A8C3 /* rotate_screen_task.hpp */; }; - 675346871A4054E800A0A8C3 /* ruler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 675346181A4054E800A0A8C3 /* ruler.cpp */; }; - 675346881A4054E800A0A8C3 /* ruler.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675346191A4054E800A0A8C3 /* ruler.hpp */; }; 6753469B1A4054E800A0A8C3 /* track.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6753462C1A4054E800A0A8C3 /* track.cpp */; }; 6753469C1A4054E800A0A8C3 /* track.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 6753462D1A4054E800A0A8C3 /* track.hpp */; }; 6753469D1A4054E800A0A8C3 /* user_mark_container.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6753462E1A4054E800A0A8C3 /* user_mark_container.cpp */; }; 6753469E1A4054E800A0A8C3 /* user_mark_container.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 6753462F1A4054E800A0A8C3 /* user_mark_container.hpp */; }; - 6753469F1A4054E800A0A8C3 /* user_mark_dl_cache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 675346301A4054E800A0A8C3 /* user_mark_dl_cache.cpp */; }; - 675346A01A4054E800A0A8C3 /* user_mark_dl_cache.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675346311A4054E800A0A8C3 /* user_mark_dl_cache.hpp */; }; 675346A21A4054E800A0A8C3 /* user_mark.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675346331A4054E800A0A8C3 /* user_mark.hpp */; }; - 67A2526C1BB42E4B0063F8A8 /* qgl_render_context.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6753460E1A4054E800A0A8C3 /* qgl_render_context.cpp */; }; 67F183751BD5041700AB1840 /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 67F183741BD5041700AB1840 /* libz.tbd */; }; 67F183761BD5045700AB1840 /* bookmarks_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 674A29CB1B26FCFE001A525C /* bookmarks_test.cpp */; }; 67F183771BD5045700AB1840 /* ge0_parser_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 674A29CC1B26FCFE001A525C /* ge0_parser_tests.cpp */; }; @@ -179,30 +146,17 @@ 674A2A321B26FFE9001A525C /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = System/Library/Frameworks/OpenGL.framework; sourceTree = SDKROOT; }; 674A2A351B27011A001A525C /* working_time_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = working_time_tests.cpp; sourceTree = ""; }; 674A2A371B2715FB001A525C /* osm_opening_hours.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = osm_opening_hours.hpp; sourceTree = ""; }; + 674C385D1BFF3095000D603B /* storage_bridge.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = storage_bridge.cpp; sourceTree = ""; }; + 674C385E1BFF3095000D603B /* storage_bridge.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = storage_bridge.hpp; sourceTree = ""; }; + 674C385F1BFF3095000D603B /* user_mark.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = user_mark.cpp; sourceTree = ""; }; 675345BB1A4054AD00A0A8C3 /* libmap.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libmap.a; sourceTree = BUILT_PRODUCTS_DIR; }; 675345C91A4054E800A0A8C3 /* active_maps_layout.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = active_maps_layout.cpp; sourceTree = ""; }; 675345CA1A4054E800A0A8C3 /* active_maps_layout.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = active_maps_layout.hpp; sourceTree = ""; }; 675345CB1A4054E800A0A8C3 /* address_finder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = address_finder.cpp; sourceTree = ""; }; - 675345CC1A4054E800A0A8C3 /* alfa_animation_task.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = alfa_animation_task.cpp; sourceTree = ""; }; - 675345CD1A4054E800A0A8C3 /* alfa_animation_task.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = alfa_animation_task.hpp; sourceTree = ""; }; - 675345CE1A4054E800A0A8C3 /* anim_phase_chain.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = anim_phase_chain.cpp; sourceTree = ""; }; - 675345CF1A4054E800A0A8C3 /* anim_phase_chain.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = anim_phase_chain.hpp; sourceTree = ""; }; - 675345D01A4054E800A0A8C3 /* animator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = animator.cpp; sourceTree = ""; }; - 675345D11A4054E800A0A8C3 /* animator.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = animator.hpp; sourceTree = ""; }; - 675345D51A4054E800A0A8C3 /* benchmark_engine.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = benchmark_engine.cpp; sourceTree = ""; }; - 675345D61A4054E800A0A8C3 /* benchmark_engine.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = benchmark_engine.hpp; sourceTree = ""; }; - 675345D71A4054E800A0A8C3 /* benchmark_provider.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = benchmark_provider.cpp; sourceTree = ""; }; - 675345D81A4054E800A0A8C3 /* benchmark_provider.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = benchmark_provider.hpp; sourceTree = ""; }; 675345D91A4054E800A0A8C3 /* bookmark_manager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = bookmark_manager.cpp; sourceTree = ""; }; 675345DA1A4054E800A0A8C3 /* bookmark_manager.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = bookmark_manager.hpp; sourceTree = ""; }; 675345DB1A4054E800A0A8C3 /* bookmark.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = bookmark.cpp; sourceTree = ""; }; 675345DC1A4054E800A0A8C3 /* bookmark.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = bookmark.hpp; sourceTree = ""; }; - 675345DD1A4054E800A0A8C3 /* change_viewport_task.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = change_viewport_task.cpp; sourceTree = ""; }; - 675345DE1A4054E800A0A8C3 /* change_viewport_task.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = change_viewport_task.hpp; sourceTree = ""; }; - 675345DF1A4054E800A0A8C3 /* compass_arrow.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = compass_arrow.cpp; sourceTree = ""; }; - 675345E01A4054E800A0A8C3 /* compass_arrow.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = compass_arrow.hpp; sourceTree = ""; }; - 675345E11A4054E800A0A8C3 /* country_status_display.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = country_status_display.cpp; sourceTree = ""; }; - 675345E21A4054E800A0A8C3 /* country_status_display.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = country_status_display.hpp; sourceTree = ""; }; 675345E31A4054E800A0A8C3 /* country_tree.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = country_tree.cpp; sourceTree = ""; }; 675345E41A4054E800A0A8C3 /* country_tree.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = country_tree.hpp; sourceTree = ""; }; 675345F31A4054E800A0A8C3 /* feature_vec_model.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = feature_vec_model.cpp; sourceTree = ""; }; @@ -213,35 +167,13 @@ 675345F81A4054E800A0A8C3 /* ge0_parser.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = ge0_parser.hpp; sourceTree = ""; }; 675345FB1A4054E800A0A8C3 /* geourl_process.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = geourl_process.cpp; sourceTree = ""; }; 675345FC1A4054E800A0A8C3 /* geourl_process.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = geourl_process.hpp; sourceTree = ""; }; - 675345FD1A4054E800A0A8C3 /* information_display.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = information_display.cpp; sourceTree = ""; }; - 675345FE1A4054E800A0A8C3 /* information_display.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = information_display.hpp; sourceTree = ""; }; - 675345FF1A4054E800A0A8C3 /* location_state.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = location_state.cpp; sourceTree = ""; }; - 675346001A4054E800A0A8C3 /* location_state.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = location_state.hpp; sourceTree = ""; }; - 675346031A4054E800A0A8C3 /* move_screen_task.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = move_screen_task.cpp; sourceTree = ""; }; - 675346041A4054E800A0A8C3 /* move_screen_task.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = move_screen_task.hpp; sourceTree = ""; }; 675346051A4054E800A0A8C3 /* mwm_url.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mwm_url.cpp; sourceTree = ""; }; 675346061A4054E800A0A8C3 /* mwm_url.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = mwm_url.hpp; sourceTree = ""; }; - 675346071A4054E800A0A8C3 /* navigator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = navigator.cpp; sourceTree = ""; }; - 675346081A4054E800A0A8C3 /* navigator.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = navigator.hpp; sourceTree = ""; }; - 6753460A1A4054E800A0A8C3 /* pin_click_manager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = pin_click_manager.cpp; sourceTree = ""; }; - 6753460B1A4054E800A0A8C3 /* pin_click_manager.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = pin_click_manager.hpp; sourceTree = ""; }; - 6753460E1A4054E800A0A8C3 /* qgl_render_context.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = qgl_render_context.cpp; sourceTree = ""; }; - 6753460F1A4054E800A0A8C3 /* qgl_render_context.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = qgl_render_context.hpp; sourceTree = ""; }; - 675346141A4054E800A0A8C3 /* rotate_screen_task.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = rotate_screen_task.cpp; sourceTree = ""; }; - 675346151A4054E800A0A8C3 /* rotate_screen_task.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = rotate_screen_task.hpp; sourceTree = ""; }; - 675346181A4054E800A0A8C3 /* ruler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ruler.cpp; sourceTree = ""; }; - 675346191A4054E800A0A8C3 /* ruler.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = ruler.hpp; sourceTree = ""; }; 6753462C1A4054E800A0A8C3 /* track.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = track.cpp; sourceTree = ""; }; 6753462D1A4054E800A0A8C3 /* track.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = track.hpp; sourceTree = ""; }; 6753462E1A4054E800A0A8C3 /* user_mark_container.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = user_mark_container.cpp; sourceTree = ""; }; 6753462F1A4054E800A0A8C3 /* user_mark_container.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = user_mark_container.hpp; sourceTree = ""; }; - 675346301A4054E800A0A8C3 /* user_mark_dl_cache.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = user_mark_dl_cache.cpp; sourceTree = ""; }; - 675346311A4054E800A0A8C3 /* user_mark_dl_cache.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = user_mark_dl_cache.hpp; sourceTree = ""; }; 675346331A4054E800A0A8C3 /* user_mark.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = user_mark.hpp; sourceTree = ""; }; - 67D1C8041AE50EEE00A239E3 /* navigator_utils.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = navigator_utils.cpp; sourceTree = ""; }; - 67D1C8051AE50EEE00A239E3 /* navigator_utils.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = navigator_utils.hpp; sourceTree = ""; }; - 67D1C8061AE50EEE00A239E3 /* route_track.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = route_track.cpp; sourceTree = ""; }; - 67D1C8071AE50EEF00A239E3 /* route_track.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = route_track.hpp; sourceTree = ""; }; 67F183741BD5041700AB1840 /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; }; 67F1837D1BD5049500AB1840 /* libagg.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libagg.a; path = "../../../omim-xcode-build/Debug/libagg.a"; sourceTree = ""; }; 67F1837E1BD5049500AB1840 /* liblodepng.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = liblodepng.a; path = "../../../omim-xcode-build/Debug/liblodepng.a"; sourceTree = ""; }; @@ -389,38 +321,21 @@ 675345BD1A4054AD00A0A8C3 /* map */ = { isa = PBXGroup; children = ( + 674C385D1BFF3095000D603B /* storage_bridge.cpp */, + 674C385E1BFF3095000D603B /* storage_bridge.hpp */, + 674C385F1BFF3095000D603B /* user_mark.cpp */, 34921F5F1BFA0A6900737D6E /* api_mark_container.cpp */, 34921F601BFA0A6900737D6E /* api_mark_container.hpp */, 34921F611BFA0A6900737D6E /* api_mark_point.hpp */, 34921F621BFA0A6900737D6E /* styled_point.cpp */, 34921F631BFA0A6900737D6E /* styled_point.hpp */, - 67D1C8041AE50EEE00A239E3 /* navigator_utils.cpp */, - 67D1C8051AE50EEE00A239E3 /* navigator_utils.hpp */, - 67D1C8061AE50EEE00A239E3 /* route_track.cpp */, - 67D1C8071AE50EEF00A239E3 /* route_track.hpp */, 675345C91A4054E800A0A8C3 /* active_maps_layout.cpp */, 675345CA1A4054E800A0A8C3 /* active_maps_layout.hpp */, 675345CB1A4054E800A0A8C3 /* address_finder.cpp */, - 675345CC1A4054E800A0A8C3 /* alfa_animation_task.cpp */, - 675345CD1A4054E800A0A8C3 /* alfa_animation_task.hpp */, - 675345CE1A4054E800A0A8C3 /* anim_phase_chain.cpp */, - 675345CF1A4054E800A0A8C3 /* anim_phase_chain.hpp */, - 675345D01A4054E800A0A8C3 /* animator.cpp */, - 675345D11A4054E800A0A8C3 /* animator.hpp */, - 675345D51A4054E800A0A8C3 /* benchmark_engine.cpp */, - 675345D61A4054E800A0A8C3 /* benchmark_engine.hpp */, - 675345D71A4054E800A0A8C3 /* benchmark_provider.cpp */, - 675345D81A4054E800A0A8C3 /* benchmark_provider.hpp */, 675345D91A4054E800A0A8C3 /* bookmark_manager.cpp */, 675345DA1A4054E800A0A8C3 /* bookmark_manager.hpp */, 675345DB1A4054E800A0A8C3 /* bookmark.cpp */, 675345DC1A4054E800A0A8C3 /* bookmark.hpp */, - 675345DD1A4054E800A0A8C3 /* change_viewport_task.cpp */, - 675345DE1A4054E800A0A8C3 /* change_viewport_task.hpp */, - 675345DF1A4054E800A0A8C3 /* compass_arrow.cpp */, - 675345E01A4054E800A0A8C3 /* compass_arrow.hpp */, - 675345E11A4054E800A0A8C3 /* country_status_display.cpp */, - 675345E21A4054E800A0A8C3 /* country_status_display.hpp */, 675345E31A4054E800A0A8C3 /* country_tree.cpp */, 675345E41A4054E800A0A8C3 /* country_tree.hpp */, 675345F31A4054E800A0A8C3 /* feature_vec_model.cpp */, @@ -431,30 +346,12 @@ 675345F81A4054E800A0A8C3 /* ge0_parser.hpp */, 675345FB1A4054E800A0A8C3 /* geourl_process.cpp */, 675345FC1A4054E800A0A8C3 /* geourl_process.hpp */, - 675345FD1A4054E800A0A8C3 /* information_display.cpp */, - 675345FE1A4054E800A0A8C3 /* information_display.hpp */, - 675345FF1A4054E800A0A8C3 /* location_state.cpp */, - 675346001A4054E800A0A8C3 /* location_state.hpp */, - 675346031A4054E800A0A8C3 /* move_screen_task.cpp */, - 675346041A4054E800A0A8C3 /* move_screen_task.hpp */, 675346051A4054E800A0A8C3 /* mwm_url.cpp */, 675346061A4054E800A0A8C3 /* mwm_url.hpp */, - 675346071A4054E800A0A8C3 /* navigator.cpp */, - 675346081A4054E800A0A8C3 /* navigator.hpp */, - 6753460A1A4054E800A0A8C3 /* pin_click_manager.cpp */, - 6753460B1A4054E800A0A8C3 /* pin_click_manager.hpp */, - 6753460E1A4054E800A0A8C3 /* qgl_render_context.cpp */, - 6753460F1A4054E800A0A8C3 /* qgl_render_context.hpp */, - 675346141A4054E800A0A8C3 /* rotate_screen_task.cpp */, - 675346151A4054E800A0A8C3 /* rotate_screen_task.hpp */, - 675346181A4054E800A0A8C3 /* ruler.cpp */, - 675346191A4054E800A0A8C3 /* ruler.hpp */, 6753462C1A4054E800A0A8C3 /* track.cpp */, 6753462D1A4054E800A0A8C3 /* track.hpp */, 6753462E1A4054E800A0A8C3 /* user_mark_container.cpp */, 6753462F1A4054E800A0A8C3 /* user_mark_container.hpp */, - 675346301A4054E800A0A8C3 /* user_mark_dl_cache.cpp */, - 675346311A4054E800A0A8C3 /* user_mark_dl_cache.hpp */, 675346331A4054E800A0A8C3 /* user_mark.hpp */, 674A2A371B2715FB001A525C /* osm_opening_hours.hpp */, ); @@ -469,39 +366,22 @@ isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( - 675346881A4054E800A0A8C3 /* ruler.hpp in Headers */, - 6753464D1A4054E800A0A8C3 /* change_viewport_task.hpp in Headers */, 6753466B1A4054E800A0A8C3 /* geourl_process.hpp in Headers */, - 675346471A4054E800A0A8C3 /* benchmark_provider.hpp in Headers */, - 6753466D1A4054E800A0A8C3 /* information_display.hpp in Headers */, 675346671A4054E800A0A8C3 /* ge0_parser.hpp in Headers */, 675346A21A4054E800A0A8C3 /* user_mark.hpp in Headers */, - 675346841A4054E800A0A8C3 /* rotate_screen_task.hpp in Headers */, - 6753464F1A4054E800A0A8C3 /* compass_arrow.hpp in Headers */, - 6753463C1A4054E800A0A8C3 /* alfa_animation_task.hpp in Headers */, 34921F661BFA0A6900737D6E /* api_mark_point.hpp in Headers */, - 675346451A4054E800A0A8C3 /* benchmark_engine.hpp in Headers */, 675346751A4054E800A0A8C3 /* mwm_url.hpp in Headers */, 6753464B1A4054E800A0A8C3 /* bookmark.hpp in Headers */, - 675346401A4054E800A0A8C3 /* animator.hpp in Headers */, - 675346771A4054E800A0A8C3 /* navigator.hpp in Headers */, 34921F681BFA0A6900737D6E /* styled_point.hpp in Headers */, - 6753467E1A4054E800A0A8C3 /* qgl_render_context.hpp in Headers */, - 6753466F1A4054E800A0A8C3 /* location_state.hpp in Headers */, 6753469E1A4054E800A0A8C3 /* user_mark_container.hpp in Headers */, 34921F651BFA0A6900737D6E /* api_mark_container.hpp in Headers */, 675346491A4054E800A0A8C3 /* bookmark_manager.hpp in Headers */, - 6753467A1A4054E800A0A8C3 /* pin_click_manager.hpp in Headers */, - 675346731A4054E800A0A8C3 /* move_screen_task.hpp in Headers */, 675346631A4054E800A0A8C3 /* feature_vec_model.hpp in Headers */, - 675346511A4054E800A0A8C3 /* country_status_display.hpp in Headers */, 6753469C1A4054E800A0A8C3 /* track.hpp in Headers */, 675346391A4054E800A0A8C3 /* active_maps_layout.hpp in Headers */, - 6753463E1A4054E800A0A8C3 /* anim_phase_chain.hpp in Headers */, - 674A29C81B26F844001A525C /* navigator_utils.hpp in Headers */, - 675346A01A4054E800A0A8C3 /* user_mark_dl_cache.hpp in Headers */, 675346651A4054E800A0A8C3 /* framework.hpp in Headers */, 675346531A4054E800A0A8C3 /* country_tree.hpp in Headers */, + 674C38611BFF3095000D603B /* storage_bridge.hpp in Headers */, 674A2A381B2715FB001A525C /* osm_opening_hours.hpp in Headers */, ); runOnlyForDeploymentPostprocessing = 0; @@ -598,36 +478,20 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 675346791A4054E800A0A8C3 /* pin_click_manager.cpp in Sources */, - 675346441A4054E800A0A8C3 /* benchmark_engine.cpp in Sources */, 675346481A4054E800A0A8C3 /* bookmark_manager.cpp in Sources */, 675346741A4054E800A0A8C3 /* mwm_url.cpp in Sources */, - 6753469F1A4054E800A0A8C3 /* user_mark_dl_cache.cpp in Sources */, - 675346831A4054E800A0A8C3 /* rotate_screen_task.cpp in Sources */, 675346521A4054E800A0A8C3 /* country_tree.cpp in Sources */, - 674A29C71B26F83C001A525C /* navigator_utils.cpp in Sources */, 6753469B1A4054E800A0A8C3 /* track.cpp in Sources */, 675346621A4054E800A0A8C3 /* feature_vec_model.cpp in Sources */, - 675346871A4054E800A0A8C3 /* ruler.cpp in Sources */, - 675346761A4054E800A0A8C3 /* navigator.cpp in Sources */, - 6753463F1A4054E800A0A8C3 /* animator.cpp in Sources */, 6753469D1A4054E800A0A8C3 /* user_mark_container.cpp in Sources */, - 6753466E1A4054E800A0A8C3 /* location_state.cpp in Sources */, - 6753463D1A4054E800A0A8C3 /* anim_phase_chain.cpp in Sources */, 34921F641BFA0A6900737D6E /* api_mark_container.cpp in Sources */, - 6753463B1A4054E800A0A8C3 /* alfa_animation_task.cpp in Sources */, - 6753464C1A4054E800A0A8C3 /* change_viewport_task.cpp in Sources */, - 6753466C1A4054E800A0A8C3 /* information_display.cpp in Sources */, - 675346501A4054E800A0A8C3 /* country_status_display.cpp in Sources */, - 6753464E1A4054E800A0A8C3 /* compass_arrow.cpp in Sources */, + 674C38621BFF3095000D603B /* user_mark.cpp in Sources */, 675346641A4054E800A0A8C3 /* framework.cpp in Sources */, 6753466A1A4054E800A0A8C3 /* geourl_process.cpp in Sources */, - 675346461A4054E800A0A8C3 /* benchmark_provider.cpp in Sources */, + 674C38601BFF3095000D603B /* storage_bridge.cpp in Sources */, 675346661A4054E800A0A8C3 /* ge0_parser.cpp in Sources */, 6753463A1A4054E800A0A8C3 /* address_finder.cpp in Sources */, - 67A2526C1BB42E4B0063F8A8 /* qgl_render_context.cpp in Sources */, 675346381A4054E800A0A8C3 /* active_maps_layout.cpp in Sources */, - 675346721A4054E800A0A8C3 /* move_screen_task.cpp in Sources */, 6753464A1A4054E800A0A8C3 /* bookmark.cpp in Sources */, 34921F671BFA0A6900737D6E /* styled_point.cpp in Sources */, ); @@ -735,6 +599,7 @@ "$(QT_PATH)/include", "$(OMIM_ROOT)/3party/freetype/include", "$(OMIM_ROOT)/3party/expat/lib", + "$(OMIM_ROOT)/3party/glm", ); MACOSX_DEPLOYMENT_TARGET = 10.10; MTL_ENABLE_DEBUG_INFO = YES; @@ -781,6 +646,7 @@ "$(QT_PATH)/include", "$(OMIM_ROOT)/3party/freetype/include", "$(OMIM_ROOT)/3party/expat/lib", + "$(OMIM_ROOT)/3party/glm", ); MACOSX_DEPLOYMENT_TARGET = 10.10; MTL_ENABLE_DEBUG_INFO = NO; diff --git a/xcode/omim.xcworkspace/contents.xcworkspacedata b/xcode/omim.xcworkspace/contents.xcworkspacedata index 5dc34f3829..8ecd0d496d 100644 --- a/xcode/omim.xcworkspace/contents.xcworkspacedata +++ b/xcode/omim.xcworkspace/contents.xcworkspacedata @@ -52,6 +52,12 @@ + + + + @@ -117,4 +123,7 @@ location = "group:../iphone/Maps/Maps.xcodeproj"> + + diff --git a/xcode/sdf_image/sdf_image.xcodeproj/project.pbxproj b/xcode/sdf_image/sdf_image.xcodeproj/project.pbxproj new file mode 100644 index 0000000000..b8c6cb6352 --- /dev/null +++ b/xcode/sdf_image/sdf_image.xcodeproj/project.pbxproj @@ -0,0 +1,255 @@ +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 46; + objects = { + +/* Begin PBXBuildFile section */ + 675D21AF1BFB8D8A00717E4F /* sdf_image.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 675D21AD1BFB8D8A00717E4F /* sdf_image.cpp */; }; + 675D21B01BFB8D8A00717E4F /* sdf_image.h in Headers */ = {isa = PBXBuildFile; fileRef = 675D21AE1BFB8D8A00717E4F /* sdf_image.h */; }; +/* End PBXBuildFile section */ + +/* Begin PBXFileReference section */ + 675D21A41BFB8D3F00717E4F /* libsdf_image.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libsdf_image.a; sourceTree = BUILT_PRODUCTS_DIR; }; + 675D21AB1BFB8D4900717E4F /* defaults.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = defaults.xcconfig; path = ../defaults.xcconfig; sourceTree = ""; }; + 675D21AD1BFB8D8A00717E4F /* sdf_image.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = sdf_image.cpp; sourceTree = ""; }; + 675D21AE1BFB8D8A00717E4F /* sdf_image.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sdf_image.h; sourceTree = ""; }; +/* End PBXFileReference section */ + +/* Begin PBXFrameworksBuildPhase section */ + 675D21A11BFB8D3F00717E4F /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXFrameworksBuildPhase section */ + +/* Begin PBXGroup section */ + 675D219B1BFB8D3F00717E4F = { + isa = PBXGroup; + children = ( + 675D21AC1BFB8D6700717E4F /* sdf_image */, + 675D21AB1BFB8D4900717E4F /* defaults.xcconfig */, + 675D21A51BFB8D3F00717E4F /* Products */, + ); + sourceTree = ""; + }; + 675D21A51BFB8D3F00717E4F /* Products */ = { + isa = PBXGroup; + children = ( + 675D21A41BFB8D3F00717E4F /* libsdf_image.a */, + ); + name = Products; + sourceTree = ""; + }; + 675D21AC1BFB8D6700717E4F /* sdf_image */ = { + isa = PBXGroup; + children = ( + 675D21AD1BFB8D8A00717E4F /* sdf_image.cpp */, + 675D21AE1BFB8D8A00717E4F /* sdf_image.h */, + ); + name = sdf_image; + path = ../../3party/sdf_image; + sourceTree = ""; + }; +/* End PBXGroup section */ + +/* Begin PBXHeadersBuildPhase section */ + 675D21A21BFB8D3F00717E4F /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + 675D21B01BFB8D8A00717E4F /* sdf_image.h in Headers */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXHeadersBuildPhase section */ + +/* Begin PBXNativeTarget section */ + 675D21A31BFB8D3F00717E4F /* sdf_image */ = { + isa = PBXNativeTarget; + buildConfigurationList = 675D21A81BFB8D3F00717E4F /* Build configuration list for PBXNativeTarget "sdf_image" */; + buildPhases = ( + 675D21A01BFB8D3F00717E4F /* Sources */, + 675D21A11BFB8D3F00717E4F /* Frameworks */, + 675D21A21BFB8D3F00717E4F /* Headers */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = sdf_image; + productName = sdf_image; + productReference = 675D21A41BFB8D3F00717E4F /* libsdf_image.a */; + productType = "com.apple.product-type.library.static"; + }; +/* End PBXNativeTarget section */ + +/* Begin PBXProject section */ + 675D219C1BFB8D3F00717E4F /* Project object */ = { + isa = PBXProject; + attributes = { + LastUpgradeCheck = 0710; + ORGANIZATIONNAME = maps.me; + TargetAttributes = { + 675D21A31BFB8D3F00717E4F = { + CreatedOnToolsVersion = 7.1.1; + }; + }; + }; + buildConfigurationList = 675D219F1BFB8D3F00717E4F /* Build configuration list for PBXProject "sdf_image" */; + compatibilityVersion = "Xcode 3.2"; + developmentRegion = English; + hasScannedForEncodings = 0; + knownRegions = ( + en, + ); + mainGroup = 675D219B1BFB8D3F00717E4F; + productRefGroup = 675D21A51BFB8D3F00717E4F /* Products */; + projectDirPath = ""; + projectRoot = ""; + targets = ( + 675D21A31BFB8D3F00717E4F /* sdf_image */, + ); + }; +/* End PBXProject section */ + +/* Begin PBXSourcesBuildPhase section */ + 675D21A01BFB8D3F00717E4F /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 675D21AF1BFB8D8A00717E4F /* sdf_image.cpp in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXSourcesBuildPhase section */ + +/* Begin XCBuildConfiguration section */ + 675D21A61BFB8D3F00717E4F /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 675D21AB1BFB8D4900717E4F /* defaults.xcconfig */; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + CODE_SIGN_IDENTITY = "-"; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = dwarf; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_DYNAMIC_NO_PIC = NO; + GCC_NO_COMMON_BLOCKS = YES; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + MACOSX_DEPLOYMENT_TARGET = 10.11; + MTL_ENABLE_DEBUG_INFO = YES; + ONLY_ACTIVE_ARCH = YES; + SDKROOT = macosx; + SUPPORTED_PLATFORMS = "iphonesimulator iphoneos macosx"; + }; + name = Debug; + }; + 675D21A71BFB8D3F00717E4F /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 675D21AB1BFB8D4900717E4F /* defaults.xcconfig */; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + CODE_SIGN_IDENTITY = "-"; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + MACOSX_DEPLOYMENT_TARGET = 10.11; + MTL_ENABLE_DEBUG_INFO = NO; + SDKROOT = macosx; + SUPPORTED_PLATFORMS = "iphonesimulator iphoneos macosx"; + }; + name = Release; + }; + 675D21A91BFB8D3F00717E4F /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + EXECUTABLE_PREFIX = lib; + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Debug; + }; + 675D21AA1BFB8D3F00717E4F /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + EXECUTABLE_PREFIX = lib; + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Release; + }; +/* End XCBuildConfiguration section */ + +/* Begin XCConfigurationList section */ + 675D219F1BFB8D3F00717E4F /* Build configuration list for PBXProject "sdf_image" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 675D21A61BFB8D3F00717E4F /* Debug */, + 675D21A71BFB8D3F00717E4F /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 675D21A81BFB8D3F00717E4F /* Build configuration list for PBXNativeTarget "sdf_image" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 675D21A91BFB8D3F00717E4F /* Debug */, + 675D21AA1BFB8D3F00717E4F /* Release */, + ); + defaultConfigurationIsVisible = 0; + }; +/* End XCConfigurationList section */ + }; + rootObject = 675D219C1BFB8D3F00717E4F /* Project object */; +} diff --git a/xcode/stb_image/stb_image.xcodeproj/project.pbxproj b/xcode/stb_image/stb_image.xcodeproj/project.pbxproj new file mode 100644 index 0000000000..ba03ef5e4f --- /dev/null +++ b/xcode/stb_image/stb_image.xcodeproj/project.pbxproj @@ -0,0 +1,255 @@ +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 46; + objects = { + +/* Begin PBXBuildFile section */ + 675D21C51BFB8F2B00717E4F /* stb_image.c in Sources */ = {isa = PBXBuildFile; fileRef = 675D21C31BFB8F2B00717E4F /* stb_image.c */; }; + 675D21C61BFB8F2B00717E4F /* stb_image.h in Headers */ = {isa = PBXBuildFile; fileRef = 675D21C41BFB8F2B00717E4F /* stb_image.h */; }; +/* End PBXBuildFile section */ + +/* Begin PBXFileReference section */ + 675D21BA1BFB8DBA00717E4F /* libstb_image.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libstb_image.a; sourceTree = BUILT_PRODUCTS_DIR; }; + 675D21C11BFB8DC900717E4F /* defaults.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = defaults.xcconfig; path = ../defaults.xcconfig; sourceTree = ""; }; + 675D21C31BFB8F2B00717E4F /* stb_image.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = stb_image.c; sourceTree = ""; }; + 675D21C41BFB8F2B00717E4F /* stb_image.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = stb_image.h; sourceTree = ""; }; +/* End PBXFileReference section */ + +/* Begin PBXFrameworksBuildPhase section */ + 675D21B71BFB8DBA00717E4F /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXFrameworksBuildPhase section */ + +/* Begin PBXGroup section */ + 675D21B11BFB8DBA00717E4F = { + isa = PBXGroup; + children = ( + 675D21C21BFB8F1000717E4F /* stb_image */, + 675D21C11BFB8DC900717E4F /* defaults.xcconfig */, + 675D21BB1BFB8DBA00717E4F /* Products */, + ); + sourceTree = ""; + }; + 675D21BB1BFB8DBA00717E4F /* Products */ = { + isa = PBXGroup; + children = ( + 675D21BA1BFB8DBA00717E4F /* libstb_image.a */, + ); + name = Products; + sourceTree = ""; + }; + 675D21C21BFB8F1000717E4F /* stb_image */ = { + isa = PBXGroup; + children = ( + 675D21C31BFB8F2B00717E4F /* stb_image.c */, + 675D21C41BFB8F2B00717E4F /* stb_image.h */, + ); + name = stb_image; + path = ../../3party/stb_image; + sourceTree = ""; + }; +/* End PBXGroup section */ + +/* Begin PBXHeadersBuildPhase section */ + 675D21B81BFB8DBA00717E4F /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + 675D21C61BFB8F2B00717E4F /* stb_image.h in Headers */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXHeadersBuildPhase section */ + +/* Begin PBXNativeTarget section */ + 675D21B91BFB8DBA00717E4F /* stb_image */ = { + isa = PBXNativeTarget; + buildConfigurationList = 675D21BE1BFB8DBA00717E4F /* Build configuration list for PBXNativeTarget "stb_image" */; + buildPhases = ( + 675D21B61BFB8DBA00717E4F /* Sources */, + 675D21B71BFB8DBA00717E4F /* Frameworks */, + 675D21B81BFB8DBA00717E4F /* Headers */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = stb_image; + productName = stb_image; + productReference = 675D21BA1BFB8DBA00717E4F /* libstb_image.a */; + productType = "com.apple.product-type.library.static"; + }; +/* End PBXNativeTarget section */ + +/* Begin PBXProject section */ + 675D21B21BFB8DBA00717E4F /* Project object */ = { + isa = PBXProject; + attributes = { + LastUpgradeCheck = 0710; + ORGANIZATIONNAME = maps.me; + TargetAttributes = { + 675D21B91BFB8DBA00717E4F = { + CreatedOnToolsVersion = 7.1.1; + }; + }; + }; + buildConfigurationList = 675D21B51BFB8DBA00717E4F /* Build configuration list for PBXProject "stb_image" */; + compatibilityVersion = "Xcode 3.2"; + developmentRegion = English; + hasScannedForEncodings = 0; + knownRegions = ( + en, + ); + mainGroup = 675D21B11BFB8DBA00717E4F; + productRefGroup = 675D21BB1BFB8DBA00717E4F /* Products */; + projectDirPath = ""; + projectRoot = ""; + targets = ( + 675D21B91BFB8DBA00717E4F /* stb_image */, + ); + }; +/* End PBXProject section */ + +/* Begin PBXSourcesBuildPhase section */ + 675D21B61BFB8DBA00717E4F /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 675D21C51BFB8F2B00717E4F /* stb_image.c in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXSourcesBuildPhase section */ + +/* Begin XCBuildConfiguration section */ + 675D21BC1BFB8DBA00717E4F /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 675D21C11BFB8DC900717E4F /* defaults.xcconfig */; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + CODE_SIGN_IDENTITY = "-"; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = dwarf; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_DYNAMIC_NO_PIC = NO; + GCC_NO_COMMON_BLOCKS = YES; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + MACOSX_DEPLOYMENT_TARGET = 10.11; + MTL_ENABLE_DEBUG_INFO = YES; + ONLY_ACTIVE_ARCH = YES; + SDKROOT = macosx; + SUPPORTED_PLATFORMS = "iphonesimulator iphoneos macosx"; + }; + name = Debug; + }; + 675D21BD1BFB8DBA00717E4F /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 675D21C11BFB8DC900717E4F /* defaults.xcconfig */; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + CODE_SIGN_IDENTITY = "-"; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + MACOSX_DEPLOYMENT_TARGET = 10.11; + MTL_ENABLE_DEBUG_INFO = NO; + SDKROOT = macosx; + SUPPORTED_PLATFORMS = "iphonesimulator iphoneos macosx"; + }; + name = Release; + }; + 675D21BF1BFB8DBA00717E4F /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + EXECUTABLE_PREFIX = lib; + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Debug; + }; + 675D21C01BFB8DBA00717E4F /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + EXECUTABLE_PREFIX = lib; + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Release; + }; +/* End XCBuildConfiguration section */ + +/* Begin XCConfigurationList section */ + 675D21B51BFB8DBA00717E4F /* Build configuration list for PBXProject "stb_image" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 675D21BC1BFB8DBA00717E4F /* Debug */, + 675D21BD1BFB8DBA00717E4F /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 675D21BE1BFB8DBA00717E4F /* Build configuration list for PBXNativeTarget "stb_image" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 675D21BF1BFB8DBA00717E4F /* Debug */, + 675D21C01BFB8DBA00717E4F /* Release */, + ); + defaultConfigurationIsVisible = 0; + }; +/* End XCConfigurationList section */ + }; + rootObject = 675D21B21BFB8DBA00717E4F /* Project object */; +}