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

Merge pull request #280 from syershov/fix-xcode-build

Browse source 
Fix xcode project
This commit is contained in:
Илья Гречухин 2015-10-19 13:31:46 +03:00
commit bc070261af
3 changed files with 58 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
xcode/MapsMe/MapsMe.xcodeproj/project.pbxproj
View file

@ -17,6 +17,14 @@
670D059A1B0CBD5B0013A7AC /* mainwindow.hpp in Sources */ = {isa = PBXBuildFile; fileRef = 675345761A404CB200A0A8C3 /* mainwindow.hpp */; };
670D059B1B0CBD5B0013A7AC /* proxystyle.hpp in Sources */ = {isa = PBXBuildFile; fileRef = 6753457A1A404CB200A0A8C3 /* proxystyle.hpp */; };
670D059C1B0CBD5B0013A7AC /* widgets.hpp in Sources */ = {isa = PBXBuildFile; fileRef = 675345851A404CB200A0A8C3 /* widgets.hpp */; };
6714E5E41BD13F67008AB603 /* drules_proto_clear.bin in CopyFiles */ = {isa = PBXBuildFile; fileRef = 6714E5DE1BD13F67008AB603 /* drules_proto_clear.bin */; };
6714E5E51BD13F67008AB603 /* drules_proto_clear.txt in CopyFiles */ = {isa = PBXBuildFile; fileRef = 6714E5DF1BD13F67008AB603 /* drules_proto_clear.txt */; };
6714E5E61BD13F67008AB603 /* drules_proto_dark.bin in CopyFiles */ = {isa = PBXBuildFile; fileRef = 6714E5E01BD13F67008AB603 /* drules_proto_dark.bin */; };
6714E5E71BD13F67008AB603 /* drules_proto_dark.txt in CopyFiles */ = {isa = PBXBuildFile; fileRef = 6714E5E11BD13F67008AB603 /* drules_proto_dark.txt */; };
6714E5E81BD13F67008AB603 /* drules_proto-bw.bin in CopyFiles */ = {isa = PBXBuildFile; fileRef = 6714E5E21BD13F67008AB603 /* drules_proto-bw.bin */; };
6714E5E91BD13F67008AB603 /* drules_proto-bw.txt in CopyFiles */ = {isa = PBXBuildFile; fileRef = 6714E5E31BD13F67008AB603 /* drules_proto-bw.txt */; };
6714E6021BD14016008AB603 /* resources-mdpi_clear in Resources */ = {isa = PBXBuildFile; fileRef = 6714E6001BD14016008AB603 /* resources-mdpi_clear */; settings = {ASSET_TAGS = (); }; };
6714E6031BD14016008AB603 /* resources-mdpi_dark in Resources */ = {isa = PBXBuildFile; fileRef = 6714E6011BD14016008AB603 /* resources-mdpi_dark */; settings = {ASSET_TAGS = (); }; };
671F59021B8755FE0032311E /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 671F59011B8755FE0032311E /* libz.dylib */; };
671F59301B8759460032311E /* libminizip.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 671F592F1B8759460032311E /* libminizip.a */; };
6729A5C11A693014007D5872 /* categories.txt in CopyFiles */ = {isa = PBXBuildFile; fileRef = 6729A5B91A693013007D5872 /* categories.txt */; };
@ -125,6 +133,12 @@
dstPath = "";
dstSubfolderSpec = 7;
files = (
6714E5E41BD13F67008AB603 /* drules_proto_clear.bin in CopyFiles */,
6714E5E51BD13F67008AB603 /* drules_proto_clear.txt in CopyFiles */,
6714E5E61BD13F67008AB603 /* drules_proto_dark.bin in CopyFiles */,
6714E5E71BD13F67008AB603 /* drules_proto_dark.txt in CopyFiles */,
6714E5E81BD13F67008AB603 /* drules_proto-bw.bin in CopyFiles */,
6714E5E91BD13F67008AB603 /* drules_proto-bw.txt in CopyFiles */,
6729A6711A695CA8007D5872 /* languages.txt in CopyFiles */,
6729A66D1A695C70007D5872 /* copyright.html in CopyFiles */,
6729A66E1A695C70007D5872 /* eula.html in CopyFiles */,
@ -159,6 +173,14 @@
/* Begin PBXFileReference section */
670D05BC1B0E10640013A7AC /* defaults.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = defaults.xcconfig; path = ../defaults.xcconfig; sourceTree = "<group>"; };
6714E5DE1BD13F67008AB603 /* drules_proto_clear.bin */ = {isa = PBXFileReference; lastKnownFileType = archive.macbinary; name = drules_proto_clear.bin; path = ../../data/drules_proto_clear.bin; sourceTree = "<group>"; };
6714E5DF1BD13F67008AB603 /* drules_proto_clear.txt */ = {isa = PBXFileReference; lastKnownFileType = text; name = drules_proto_clear.txt; path = ../../data/drules_proto_clear.txt; sourceTree = "<group>"; };
6714E5E01BD13F67008AB603 /* drules_proto_dark.bin */ = {isa = PBXFileReference; lastKnownFileType = archive.macbinary; name = drules_proto_dark.bin; path = ../../data/drules_proto_dark.bin; sourceTree = "<group>"; };
6714E5E11BD13F67008AB603 /* drules_proto_dark.txt */ = {isa = PBXFileReference; lastKnownFileType = text; name = drules_proto_dark.txt; path = ../../data/drules_proto_dark.txt; sourceTree = "<group>"; };
6714E5E21BD13F67008AB603 /* drules_proto-bw.bin */ = {isa = PBXFileReference; lastKnownFileType = archive.macbinary; name = "drules_proto-bw.bin"; path = "../../data/drules_proto-bw.bin"; sourceTree = "<group>"; };
6714E5E31BD13F67008AB603 /* drules_proto-bw.txt */ = {isa = PBXFileReference; lastKnownFileType = text; name = "drules_proto-bw.txt"; path = "../../data/drules_proto-bw.txt"; sourceTree = "<group>"; };
6714E6001BD14016008AB603 /* resources-mdpi_clear */ = {isa = PBXFileReference; lastKnownFileType = folder; path = "resources-mdpi_clear"; sourceTree = "<group>"; };
6714E6011BD14016008AB603 /* resources-mdpi_dark */ = {isa = PBXFileReference; lastKnownFileType = folder; path = "resources-mdpi_dark"; sourceTree = "<group>"; };
671F59011B8755FE0032311E /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; };
671F592F1B8759460032311E /* libminizip.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libminizip.a; path = "/Volumes/AltHD/omim/xcode/minizip/../../../omim-xcode-build/Debug/libminizip.a"; sourceTree = "<absolute>"; };
6729A5B91A693013007D5872 /* categories.txt */ = {isa = PBXFileReference; lastKnownFileType = text; path = categories.txt; sourceTree = "<group>"; };
@ -366,6 +388,8 @@
6729A5CA1A69309E007D5872 /* types.txt */,
6729A5B91A693013007D5872 /* categories.txt */,
6729A5BA1A693013007D5872 /* classificator.txt */,
6714E6001BD14016008AB603 /* resources-mdpi_clear */,
6714E6011BD14016008AB603 /* resources-mdpi_dark */,
6729A5BB1A693013007D5872 /* countries.txt */,
6729A5BC1A693013007D5872 /* resources-hdpi */,
6729A5BD1A693014007D5872 /* resources-ldpi */,
@ -380,6 +404,12 @@
675345401A404C6100A0A8C3 = {
isa = PBXGroup;
children = (
6714E5DE1BD13F67008AB603 /* drules_proto_clear.bin */,
6714E5DF1BD13F67008AB603 /* drules_proto_clear.txt */,
6714E5E01BD13F67008AB603 /* drules_proto_dark.bin */,
6714E5E11BD13F67008AB603 /* drules_proto_dark.txt */,
6714E5E21BD13F67008AB603 /* drules_proto-bw.bin */,
6714E5E31BD13F67008AB603 /* drules_proto-bw.txt */,
67E8DC911BBC1D3F0053C5BA /* libagg.a */,
67E8DC921BBC1D3F0053C5BA /* liblodepng.a */,
670D05BC1B0E10640013A7AC /* defaults.xcconfig */,
@ -497,6 +527,8 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
6714E6031BD14016008AB603 /* resources-mdpi_dark in Resources */,
6714E6021BD14016008AB603 /* resources-mdpi_clear in Resources */,
6729A6681A69394D007D5872 /* resources.qrc in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;

22
xcode/MapsMe/MapsMe/Info.plist
View file

@ -30,5 +30,27 @@
<string>MainMenu</string>
<key>NSPrincipalClass</key>
<string>NSApplication</string>
<key>NSAppTransportSecurity</key>
<dict>
<key>NSAllowsArbitraryLoads</key>
<true/>
<key>NSExceptionDomains</key>
<dict>
<key>maps.me</key>
<dict>
<key>NSExceptionAllowsInsecureHTTPLoads</key>
<true/>
<key>NSIncludesSubdomains</key>
<true/>
</dict>
<key>mapswithme.com</key>
<dict>
<key>NSExceptionAllowsInsecureHTTPLoads</key>
<true/>
<key>NSIncludesSubdomains</key>
<true/>
</dict>
</dict>
</dict>
</dict>
</plist>

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

@ -48,8 +48,6 @@
670D04AD1B0BA8580013A7AC /* interval_index_101.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 670D04AA1B0BA8580013A7AC /* interval_index_101.hpp */; };
670EE56C1B60033A001E8064 /* features_vector.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670EE56A1B60033A001E8064 /* features_vector.cpp */; };
670EE56D1B60033A001E8064 /* unique_index.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 670EE56B1B60033A001E8064 /* unique_index.hpp */; };
670F291F1BA86D5400F2ABF4 /* drules_city_rank_table.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670F291D1BA86D5400F2ABF4 /* drules_city_rank_table.cpp */; };
670F29201BA86D5400F2ABF4 /* drules_city_rank_table.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 670F291E1BA86D5400F2ABF4 /* drules_city_rank_table.hpp */; };
6726C1D11A49DAAC005EEA39 /* feature_meta.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6726C1CF1A49DAAC005EEA39 /* feature_meta.cpp */; };
6726C1D21A49DAAC005EEA39 /* feature_meta.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 6726C1D01A49DAAC005EEA39 /* feature_meta.hpp */; };
674125131B4C02F100A3E828 /* map_style_reader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 674125101B4C02F100A3E828 /* map_style_reader.cpp */; };
@ -137,6 +135,7 @@
6758AED21BB4413000C26E27 /* drules_selector_parser.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 6758AECE1BB4413000C26E27 /* drules_selector_parser.hpp */; settings = {ASSET_TAGS = (); }; };
6758AED31BB4413000C26E27 /* drules_selector.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6758AECF1BB4413000C26E27 /* drules_selector.cpp */; settings = {ASSET_TAGS = (); }; };
6758AED41BB4413000C26E27 /* drules_selector.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 6758AED01BB4413000C26E27 /* drules_selector.hpp */; settings = {ASSET_TAGS = (); }; };
67F183731BD4FCF500AB1840 /* map_style.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 67F183721BD4FCF500AB1840 /* map_style.cpp */; settings = {ASSET_TAGS = (); }; };
/* End PBXBuildFile section */
/* Begin PBXCopyFilesBuildPhase section */
@ -195,8 +194,6 @@
670D05AB1B0E07040013A7AC /* defaults.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = defaults.xcconfig; path = ../defaults.xcconfig; sourceTree = "<group>"; };
670EE56A1B60033A001E8064 /* features_vector.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = features_vector.cpp; sourceTree = "<group>"; };
670EE56B1B60033A001E8064 /* unique_index.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = unique_index.hpp; sourceTree = "<group>"; };
670F291D1BA86D5400F2ABF4 /* drules_city_rank_table.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = drules_city_rank_table.cpp; sourceTree = "<group>"; };
670F291E1BA86D5400F2ABF4 /* drules_city_rank_table.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = drules_city_rank_table.hpp; sourceTree = "<group>"; };
6726C1CF1A49DAAC005EEA39 /* feature_meta.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = feature_meta.cpp; sourceTree = "<group>"; };
6726C1D01A49DAAC005EEA39 /* feature_meta.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = feature_meta.hpp; sourceTree = "<group>"; };
674125101B4C02F100A3E828 /* map_style_reader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = map_style_reader.cpp; sourceTree = "<group>"; };
@ -286,6 +283,7 @@
6758AECE1BB4413000C26E27 /* drules_selector_parser.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = drules_selector_parser.hpp; sourceTree = "<group>"; };
6758AECF1BB4413000C26E27 /* drules_selector.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = drules_selector.cpp; sourceTree = "<group>"; };
6758AED01BB4413000C26E27 /* drules_selector.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = drules_selector.hpp; sourceTree = "<group>"; };
67F183721BD4FCF500AB1840 /* map_style.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = map_style.cpp; sourceTree = "<group>"; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
@ -321,10 +319,6 @@
isa = PBXGroup;
children = (
670C61571AB068C100C38A8C /* Libs */,
678FB4181BB43D8900C49B9C /* drules_selector_parser.cpp */,
678FB4191BB43D8900C49B9C /* drules_selector_parser.hpp */,
678FB41A1BB43D8900C49B9C /* drules_selector.cpp */,
678FB41B1BB43D8900C49B9C /* drules_selector.hpp */,
670C611F1AB065E100C38A8C /* testingmain.cpp */,
670C60F91AB065B100C38A8C /* categories_test.cpp */,
670C60FA1AB065B100C38A8C /* cell_coverer_test.cpp */,
@ -407,11 +401,10 @@
6758AECE1BB4413000C26E27 /* drules_selector_parser.hpp */,
6758AECF1BB4413000C26E27 /* drules_selector.cpp */,
6758AED01BB4413000C26E27 /* drules_selector.hpp */,
670F291D1BA86D5400F2ABF4 /* drules_city_rank_table.cpp */,
670F291E1BA86D5400F2ABF4 /* drules_city_rank_table.hpp */,
674125101B4C02F100A3E828 /* map_style_reader.cpp */,
674125111B4C02F100A3E828 /* map_style_reader.hpp */,
674125121B4C02F100A3E828 /* map_style.hpp */,
67F183721BD4FCF500AB1840 /* map_style.cpp */,
670C61581AB0691900C38A8C /* features_offsets_table.cpp */,
670C61591AB0691900C38A8C /* features_offsets_table.hpp */,
670C615A1AB0691900C38A8C /* string_file_values.hpp */,
@ -511,7 +504,6 @@
buildActionMask = 2147483647;
files = (
675341361A3F540F00A0A8C3 /* mercator.hpp in Headers */,
670F29201BA86D5400F2ABF4 /* drules_city_rank_table.hpp in Headers */,
6753414E1A3F540F00A0A8C3 /* types_mapping.hpp in Headers */,
6753411F1A3F540F00A0A8C3 /* feature_loader.hpp in Headers */,
675341151A3F540F00A0A8C3 /* feature_covering.hpp in Headers */,
@ -658,6 +650,7 @@
buildActionMask = 2147483647;
files = (
670C610C1AB065B100C38A8C /* categories_test.cpp in Sources */,
67F183731BD4FCF500AB1840 /* map_style.cpp in Sources */,
675341461A3F540F00A0A8C3 /* search_string_utils.cpp in Sources */,
670D04AB1B0BA8580013A7AC /* feature_loader_101.cpp in Sources */,
6758AED31BB4413000C26E27 /* drules_selector.cpp in Sources */,
@ -676,7 +669,6 @@
675341211A3F540F00A0A8C3 /* feature_utils.cpp in Sources */,
670C61151AB065B100C38A8C /* interval_index_test.cpp in Sources */,
670C61121AB065B100C38A8C /* geometry_serialization_test.cpp in Sources */,
670F291F1BA86D5400F2ABF4 /* drules_city_rank_table.cpp in Sources */,
675341231A3F540F00A0A8C3 /* feature_visibility.cpp in Sources */,
670C610F1AB065B100C38A8C /* checker_test.cpp in Sources */,
675341161A3F540F00A0A8C3 /* feature_data.cpp in Sources */,