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

Merge pull request #4844 from igrechuhin/MAPSME-3126

Browse source 
Fixed build & crash.
This commit is contained in:
Sergey Yershov 2016-12-01 10:54:34 +03:00 • committed by GitHub
commit b4b1cbd602
2 changed files with 16 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
iphone/Maps/Maps.xcodeproj/project.pbxproj
View file

@ -125,6 +125,9 @@
34479C7D1C60C6130065D261 /* MWMFrameworkListener.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34479C781C60C6130065D261 /* MWMFrameworkListener.mm */; };
344D77B41D1BD7C800DBED70 /* MWMLocationManager.mm in Sources */ = {isa = PBXBuildFile; fileRef = 344D77B31D1BD7C800DBED70 /* MWMLocationManager.mm */; };
344D77B51D1BD7C800DBED70 /* MWMLocationManager.mm in Sources */ = {isa = PBXBuildFile; fileRef = 344D77B31D1BD7C800DBED70 /* MWMLocationManager.mm */; };
3454E05F1DF00DAE00F40F46 /* banners.txt in Resources */ = {isa = PBXBuildFile; fileRef = 3454E05E1DF00DAE00F40F46 /* banners.txt */; };
3454E0601DF00DC000F40F46 /* banners.txt in Resources */ = {isa = PBXBuildFile; fileRef = 3454E05E1DF00DAE00F40F46 /* banners.txt */; };
3454E0611DF00DC100F40F46 /* banners.txt in Resources */ = {isa = PBXBuildFile; fileRef = 3454E05E1DF00DAE00F40F46 /* banners.txt */; };
3456E0211DC0C4030055DF50 /* HockeySDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3456E0201DC0C4030055DF50 /* HockeySDK.framework */; };
3456E0241DC0C4290055DF50 /* HockeySDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3456E0201DC0C4030055DF50 /* HockeySDK.framework */; };
3456E0261DC0C4500055DF50 /* HockeySDKResources.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 3456E0251DC0C4500055DF50 /* HockeySDKResources.bundle */; };
@ -1536,6 +1539,7 @@
344BDB021B9069810076DB31 /* MWMSearchTabbedViewProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMSearchTabbedViewProtocol.h; sourceTree = "<group>"; };
344D77B21D1BD7C800DBED70 /* MWMLocationManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMLocationManager.h; sourceTree = "<group>"; };
344D77B31D1BD7C800DBED70 /* MWMLocationManager.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMLocationManager.mm; sourceTree = "<group>"; };
3454E05E1DF00DAE00F40F46 /* banners.txt */ = {isa = PBXFileReference; lastKnownFileType = text; name = banners.txt; path = ../../data/banners.txt; sourceTree = "<group>"; };
3456E0201DC0C4030055DF50 /* HockeySDK.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = HockeySDK.framework; path = Frameworks/HockeySDK.embeddedframework/HockeySDK.framework; sourceTree = "<group>"; };
3456E0251DC0C4500055DF50 /* HockeySDKResources.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; name = HockeySDKResources.bundle; path = Frameworks/HockeySDK.embeddedframework/Resources/HockeySDKResources.bundle; sourceTree = "<group>"; };
34570A3A1B13222600E6D4FD /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; };
@ -3784,6 +3788,7 @@
FA065FC61286143F00FEA989 /* External Resources */ = {
isa = PBXGroup;
children = (
3454E05E1DF00DAE00F40F46 /* banners.txt */,
F623DA6A1C9C2731006A3436 /* opening_hours_how_to_edit.html */,
6B9978341C89A316003B8AA0 /* editor.config */,
671182DE1C7F0DD400CB8177 /* countries_obsolete.txt */,
@ -4075,6 +4080,7 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
3454E05F1DF00DAE00F40F46 /* banners.txt in Resources */,
3456E0261DC0C4500055DF50 /* HockeySDKResources.bundle in Resources */,
4519503A1B7A3E070085DA05 /* patterns.txt in Resources */,
346225911DDC5FBA001E8752 /* MWMSearchNoResultsAlert.xib in Resources */,
@ -4337,6 +4343,7 @@
6741A9741BF340DE002C974C /* resources-6plus_dark in Resources */,
3401CD6A1C3C03A80028C6F8 /* MWMEditorTextTableViewCell.xib in Resources */,
F617B4E71D8FDEC4007A1A4E /* MWMBookmarkCell.xib in Resources */,
3454E0601DF00DC000F40F46 /* banners.txt in Resources */,
341F99E01C6B1165001C67B8 /* MWMMapDownloaderSubplaceTableViewCell.xib in Resources */,
6741A9751BF340DE002C974C /* WorldCoasts.mwm in Resources */,
3490D2E31CE9DD2500D0B838 /* MWMSideButtonsView.xib in Resources */,
@ -4485,6 +4492,7 @@
849CF6341DE842290024A8A5 /* resources-mdpi_legacy in Resources */,
849CF6351DE842290024A8A5 /* MWMPlacePageOpeningHoursWeekDayView.xib in Resources */,
849CF6361DE842290024A8A5 /* _MWMOHHeaderCell.xib in Resources */,
3454E0611DF00DC100F40F46 /* banners.txt in Resources */,
849CF6371DE842290024A8A5 /* MWMOpeningHoursDeleteScheduleTableViewCell.xib in Resources */,
849CF6381DE842290024A8A5 /* MWMiPadRoutePreview.xib in Resources */,
849CF6391DE842290024A8A5 /* copyright.html in Resources */,

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

@ -9,6 +9,8 @@
/* Begin PBXBuildFile section */
0C5FEC731DDE1A140017688C /* routing_section.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 0C5FEC721DDE1A140017688C /* routing_section.hpp */; };
340DF9D01C1FF04D00B5C7EC /* osm_editor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 340DF9CF1C1FF04D00B5C7EC /* osm_editor.cpp */; };
3454E05C1DF00D2D00F40F46 /* banners.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3454E05A1DF00D2D00F40F46 /* banners.cpp */; };
3454E05D1DF00D2D00F40F46 /* banners.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3454E05B1DF00D2D00F40F46 /* banners.hpp */; };
34583BC71C88552100F94664 /* cuisines.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 34583BC11C88552100F94664 /* cuisines.cpp */; };
34583BC81C88552100F94664 /* cuisines.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 34583BC21C88552100F94664 /* cuisines.hpp */; };
34583BC91C88552100F94664 /* editable_map_object.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 34583BC31C88552100F94664 /* editable_map_object.cpp */; };
@ -226,6 +228,8 @@
/* Begin PBXFileReference section */
0C5FEC721DDE1A140017688C /* routing_section.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = routing_section.hpp; sourceTree = "<group>"; };
340DF9CF1C1FF04D00B5C7EC /* osm_editor.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = osm_editor.cpp; sourceTree = "<group>"; };
3454E05A1DF00D2D00F40F46 /* banners.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = banners.cpp; sourceTree = "<group>"; };
3454E05B1DF00D2D00F40F46 /* banners.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = banners.hpp; sourceTree = "<group>"; };
34583BC11C88552100F94664 /* cuisines.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = cuisines.cpp; sourceTree = "<group>"; };
34583BC21C88552100F94664 /* cuisines.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = cuisines.hpp; sourceTree = "<group>"; };
34583BC31C88552100F94664 /* editable_map_object.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = editable_map_object.cpp; sourceTree = "<group>"; };
@ -624,6 +628,8 @@
6753409C1A3F53CB00A0A8C3 /* indexer */ = {
isa = PBXGroup;
children = (
3454E05A1DF00D2D00F40F46 /* banners.cpp */,
3454E05B1DF00D2D00F40F46 /* banners.hpp */,
3D928F651D50F9FE001670E0 /* index_helpers.cpp */,
3D928F661D50F9FE001670E0 /* index_helpers.hpp */,
34664CEE1D49FEC1003D7096 /* altitude_loader.cpp */,
@ -820,6 +826,7 @@
6753413C1A3F540F00A0A8C3 /* point_to_int64.hpp in Headers */,
6758AED41BB4413000C26E27 /* drules_selector.hpp in Headers */,
675341061A3F540F00A0A8C3 /* coding_params.hpp in Headers */,
3454E05D1DF00D2D00F40F46 /* banners.hpp in Headers */,
56C74C211C749E4700B71B9F /* edits_migration.hpp in Headers */,
6753412F1A3F540F00A0A8C3 /* index_builder.hpp in Headers */,
675341411A3F540F00A0A8C3 /* scales.hpp in Headers */,
@ -1038,6 +1045,7 @@
34664CF61D49FEC1003D7096 /* centers_table.cpp in Sources */,
56C74C201C749E4700B71B9F /* edits_migration.cpp in Sources */,
6753414D1A3F540F00A0A8C3 /* types_mapping.cpp in Sources */,
3454E05C1DF00D2D00F40F46 /* banners.cpp in Sources */,
6753412A1A3F540F00A0A8C3 /* geometry_coding.cpp in Sources */,
34583BC71C88552100F94664 /* cuisines.cpp in Sources */,
675341121A3F540F00A0A8C3 /* feature_algo.cpp in Sources */,