diff --git a/xcode/MapsMe/MapsMe.xcodeproj/project.pbxproj b/xcode/MapsMe/MapsMe.xcodeproj/project.pbxproj index baa46b1c01..7ba9cc9b95 100644 --- a/xcode/MapsMe/MapsMe.xcodeproj/project.pbxproj +++ b/xcode/MapsMe/MapsMe.xcodeproj/project.pbxproj @@ -17,7 +17,6 @@ 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 */; }; - 670D05BD1B0E10640013A7AC /* defaults.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 670D05BC1B0E10640013A7AC /* defaults.xcconfig */; }; 6729A5C11A693014007D5872 /* categories.txt in CopyFiles */ = {isa = PBXBuildFile; fileRef = 6729A5B91A693013007D5872 /* categories.txt */; }; 6729A5C21A693014007D5872 /* classificator.txt in CopyFiles */ = {isa = PBXBuildFile; fileRef = 6729A5BA1A693013007D5872 /* classificator.txt */; }; 6729A5C31A693014007D5872 /* countries.txt in CopyFiles */ = {isa = PBXBuildFile; fileRef = 6729A5BB1A693013007D5872 /* countries.txt */; }; @@ -467,7 +466,7 @@ 675345411A404C6100A0A8C3 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0630; + LastUpgradeCheck = 0640; ORGANIZATIONNAME = maps.me; TargetAttributes = { 675345481A404C6100A0A8C3 = { @@ -498,7 +497,6 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - 670D05BD1B0E10640013A7AC /* defaults.xcconfig in Resources */, 6729A6681A69394D007D5872 /* resources.qrc in Resources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -594,6 +592,8 @@ QtOpenGL, "-framework", QtGui, + "-framework", + SystemConfiguration, ); SDKROOT = macosx; SYMROOT = build; @@ -650,6 +650,8 @@ QtOpenGL, "-framework", QtGui, + "-framework", + SystemConfiguration, ); SDKROOT = macosx; SYMROOT = build; diff --git a/xcode/alohalitics/alohalitics.xcodeproj/project.pbxproj b/xcode/alohalitics/alohalitics.xcodeproj/project.pbxproj index 1940dc7ffd..4359ccc164 100644 --- a/xcode/alohalitics/alohalitics.xcodeproj/project.pbxproj +++ b/xcode/alohalitics/alohalitics.xcodeproj/project.pbxproj @@ -3,11 +3,12 @@ archiveVersion = 1; classes = { }; - objectVersion = 47; + objectVersion = 46; objects = { /* Begin PBXBuildFile section */ 670D04A31B0B7E460013A7AC /* alohalytics.cc in Sources */ = {isa = PBXBuildFile; fileRef = 670D04A21B0B7E460013A7AC /* alohalytics.cc */; }; + 674125171B4C056600A3E828 /* file_manager_posix_impl.cc in Sources */ = {isa = PBXBuildFile; fileRef = 674125161B4C056600A3E828 /* file_manager_posix_impl.cc */; }; 67D1C7F71AE50DDF00A239E3 /* alohalytics_objc.mm in Sources */ = {isa = PBXBuildFile; fileRef = 67D1C7F51AE50DDF00A239E3 /* alohalytics_objc.mm */; }; 67D1C7F81AE50DDF00A239E3 /* http_client_apple.mm in Sources */ = {isa = PBXBuildFile; fileRef = 67D1C7F61AE50DDF00A239E3 /* http_client_apple.mm */; }; 67D1C7FB1AE50DFB00A239E3 /* alohalytics_objc.h in Headers */ = {isa = PBXBuildFile; fileRef = 67D1C7F91AE50DFB00A239E3 /* alohalytics_objc.h */; }; @@ -17,6 +18,7 @@ /* Begin PBXFileReference section */ 670D04A21B0B7E460013A7AC /* alohalytics.cc */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = alohalytics.cc; path = src/cpp/alohalytics.cc; sourceTree = ""; }; 670D05B91B0E0CAD0013A7AC /* defaults.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = defaults.xcconfig; path = ../defaults.xcconfig; sourceTree = ""; }; + 674125161B4C056600A3E828 /* file_manager_posix_impl.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = file_manager_posix_impl.cc; path = src/posix/file_manager_posix_impl.cc; sourceTree = ""; }; 67D1C7DF1AE507D700A239E3 /* libalohalitics.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libalohalitics.a; sourceTree = BUILT_PRODUCTS_DIR; }; 67D1C7F51AE50DDF00A239E3 /* alohalytics_objc.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = alohalytics_objc.mm; path = src/apple/alohalytics_objc.mm; sourceTree = ""; }; 67D1C7F61AE50DDF00A239E3 /* http_client_apple.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = http_client_apple.mm; path = src/apple/http_client_apple.mm; sourceTree = ""; }; @@ -55,6 +57,7 @@ 67D1C7E11AE507D700A239E3 /* alohalitics */ = { isa = PBXGroup; children = ( + 674125161B4C056600A3E828 /* file_manager_posix_impl.cc */, 670D04A21B0B7E460013A7AC /* alohalytics.cc */, 67D1C7F91AE50DFB00A239E3 /* alohalytics_objc.h */, 67D1C7FA1AE50DFB00A239E3 /* alohalytics.h */, @@ -103,7 +106,7 @@ 67D1C7D71AE507D700A239E3 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0630; + LastUpgradeCheck = 0640; ORGANIZATIONNAME = maps.me; TargetAttributes = { 67D1C7DE1AE507D700A239E3 = { @@ -112,7 +115,7 @@ }; }; buildConfigurationList = 67D1C7DA1AE507D700A239E3 /* Build configuration list for PBXProject "alohalitics" */; - compatibilityVersion = "Xcode 6.3"; + compatibilityVersion = "Xcode 3.2"; developmentRegion = English; hasScannedForEncodings = 0; knownRegions = ( @@ -136,6 +139,7 @@ 670D04A31B0B7E460013A7AC /* alohalytics.cc in Sources */, 67D1C7F71AE50DDF00A239E3 /* alohalytics_objc.mm in Sources */, 67D1C7F81AE50DDF00A239E3 /* http_client_apple.mm in Sources */, + 674125171B4C056600A3E828 /* file_manager_posix_impl.cc in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -226,6 +230,7 @@ 67D1C7EB1AE507D700A239E3 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + COMBINE_HIDPI_IMAGES = YES; EXECUTABLE_PREFIX = lib; GCC_ENABLE_CPP_EXCEPTIONS = YES; GCC_ENABLE_CPP_RTTI = YES; @@ -238,6 +243,7 @@ 67D1C7EC1AE507D700A239E3 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + COMBINE_HIDPI_IMAGES = YES; EXECUTABLE_PREFIX = lib; GCC_ENABLE_CPP_EXCEPTIONS = YES; GCC_ENABLE_CPP_RTTI = YES; diff --git a/xcode/anim/anim.xcodeproj/project.pbxproj b/xcode/anim/anim.xcodeproj/project.pbxproj index 6f4ea9624c..1f566025f7 100644 --- a/xcode/anim/anim.xcodeproj/project.pbxproj +++ b/xcode/anim/anim.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 47; + objectVersion = 46; objects = { /* Begin PBXBuildFile section */ @@ -128,7 +128,7 @@ 675347321A40590300A0A8C3 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0630; + LastUpgradeCheck = 0640; ORGANIZATIONNAME = maps.me; TargetAttributes = { 675347391A40590300A0A8C3 = { @@ -137,7 +137,7 @@ }; }; buildConfigurationList = 675347351A40590300A0A8C3 /* Build configuration list for PBXProject "anim" */; - compatibilityVersion = "Xcode 6.3"; + compatibilityVersion = "Xcode 3.2"; developmentRegion = English; hasScannedForEncodings = 0; knownRegions = ( diff --git a/xcode/api/api.xcodeproj/project.pbxproj b/xcode/api/api.xcodeproj/project.pbxproj index 1b3bbcb91f..70efb84e86 100644 --- a/xcode/api/api.xcodeproj/project.pbxproj +++ b/xcode/api/api.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 47; + objectVersion = 46; objects = { /* Begin PBXBuildFile section */ @@ -105,7 +105,7 @@ 6753470F1A40577A00A0A8C3 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0630; + LastUpgradeCheck = 0640; ORGANIZATIONNAME = maps.me; TargetAttributes = { 675347161A40577A00A0A8C3 = { @@ -114,7 +114,7 @@ }; }; buildConfigurationList = 675347121A40577A00A0A8C3 /* Build configuration list for PBXProject "api" */; - compatibilityVersion = "Xcode 6.3"; + compatibilityVersion = "Xcode 3.2"; developmentRegion = English; hasScannedForEncodings = 0; knownRegions = ( diff --git a/xcode/coding/coding.xcodeproj/project.pbxproj b/xcode/coding/coding.xcodeproj/project.pbxproj index 7197f13e1a..c1e8e484c2 100644 --- a/xcode/coding/coding.xcodeproj/project.pbxproj +++ b/xcode/coding/coding.xcodeproj/project.pbxproj @@ -7,8 +7,6 @@ objects = { /* Begin PBXBuildFile section */ - 670D04BB1B0BA91F0013A7AC /* timsort.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670D04B91B0BA9050013A7AC /* timsort.cpp */; }; - 670D04BC1B0BA9270013A7AC /* timsort.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 670D04BA1B0BA9050013A7AC /* timsort.hpp */; }; 670D04BD1B0BA92D0013A7AC /* expat_impl.h in Headers */ = {isa = PBXBuildFile; fileRef = 670D04B31B0BA9050013A7AC /* expat_impl.h */; }; 670D04BE1B0BA92D0013A7AC /* file64_api.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 670D04B41B0BA9050013A7AC /* file64_api.hpp */; }; 670D04BF1B0BA92D0013A7AC /* file_data.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670D04B51B0BA9050013A7AC /* file_data.cpp */; }; @@ -360,7 +358,6 @@ 675342CD1A3F588C00A0A8C3 /* varint_vector.hpp in Headers */, 675342B51A3F588C00A0A8C3 /* reader_cache.hpp in Headers */, 675342CE1A3F588C00A0A8C3 /* varint.hpp in Headers */, - 670D04BC1B0BA9270013A7AC /* timsort.hpp in Headers */, 675342D01A3F588C00A0A8C3 /* writer.hpp in Headers */, 675342CA1A3F588C00A0A8C3 /* var_serial_vector.hpp in Headers */, 6753429D1A3F588C00A0A8C3 /* file_name_utils.hpp in Headers */, @@ -490,7 +487,6 @@ 675342871A3F588C00A0A8C3 /* blob_indexer.cpp in Sources */, 675342D31A3F588C00A0A8C3 /* zip_reader.cpp in Sources */, 675342931A3F588C00A0A8C3 /* compressed_varnum_vector.cpp in Sources */, - 670D04BB1B0BA91F0013A7AC /* timsort.cpp in Sources */, 675342911A3F588C00A0A8C3 /* compressed_bit_vector.cpp in Sources */, 6753429F1A3F588C00A0A8C3 /* file_reader.cpp in Sources */, 675342C51A3F588C00A0A8C3 /* uri.cpp in Sources */, diff --git a/xcode/drape/drape.xcodeproj/project.pbxproj b/xcode/drape/drape.xcodeproj/project.pbxproj index 20a93e8caf..6ef99b392a 100644 --- a/xcode/drape/drape.xcodeproj/project.pbxproj +++ b/xcode/drape/drape.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 47; + objectVersion = 46; objects = { /* Begin PBXBuildFile section */ @@ -434,7 +434,7 @@ 6729A4E91A691F6A007D5872 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0630; + LastUpgradeCheck = 0640; ORGANIZATIONNAME = maps.me; TargetAttributes = { 6729A4F01A691F6A007D5872 = { @@ -443,7 +443,7 @@ }; }; buildConfigurationList = 6729A4EC1A691F6A007D5872 /* Build configuration list for PBXProject "drape" */; - compatibilityVersion = "Xcode 6.3"; + compatibilityVersion = "Xcode 3.2"; developmentRegion = English; hasScannedForEncodings = 0; knownRegions = ( diff --git a/xcode/expat/expat.xcodeproj/project.pbxproj b/xcode/expat/expat.xcodeproj/project.pbxproj index 4ac302aaca..b563c5364f 100644 --- a/xcode/expat/expat.xcodeproj/project.pbxproj +++ b/xcode/expat/expat.xcodeproj/project.pbxproj @@ -101,7 +101,7 @@ 670D04F01B0BAEE50013A7AC /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0630; + LastUpgradeCheck = 0640; ORGANIZATIONNAME = maps.me; TargetAttributes = { 670D04F71B0BAEE50013A7AC = { @@ -230,6 +230,7 @@ 670D05041B0BAEE50013A7AC /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + COMBINE_HIDPI_IMAGES = YES; EXECUTABLE_PREFIX = lib; GCC_ENABLE_CPP_EXCEPTIONS = YES; GCC_ENABLE_CPP_RTTI = YES; @@ -247,6 +248,7 @@ 670D05051B0BAEE50013A7AC /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + COMBINE_HIDPI_IMAGES = YES; EXECUTABLE_PREFIX = lib; GCC_ENABLE_CPP_EXCEPTIONS = YES; GCC_ENABLE_CPP_RTTI = YES; diff --git a/xcode/freetype/freetype.xcodeproj/project.pbxproj b/xcode/freetype/freetype.xcodeproj/project.pbxproj index 230e7e783c..c0fdb09465 100644 --- a/xcode/freetype/freetype.xcodeproj/project.pbxproj +++ b/xcode/freetype/freetype.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 47; + objectVersion = 46; objects = { /* Begin PBXBuildFile section */ @@ -1595,7 +1595,7 @@ 6753484A1A408D9300A0A8C3 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0630; + LastUpgradeCheck = 0640; ORGANIZATIONNAME = maps.me; TargetAttributes = { 675348511A408D9300A0A8C3 = { @@ -1604,7 +1604,7 @@ }; }; buildConfigurationList = 6753484D1A408D9300A0A8C3 /* Build configuration list for PBXProject "freetype" */; - compatibilityVersion = "Xcode 6.3"; + compatibilityVersion = "Xcode 3.2"; developmentRegion = English; hasScannedForEncodings = 0; knownRegions = ( diff --git a/xcode/fribidi/fribidi.xcodeproj/project.pbxproj b/xcode/fribidi/fribidi.xcodeproj/project.pbxproj index 5bba34a333..91e5f0ed45 100644 --- a/xcode/fribidi/fribidi.xcodeproj/project.pbxproj +++ b/xcode/fribidi/fribidi.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 47; + objectVersion = 46; objects = { /* Begin PBXBuildFile section */ @@ -221,7 +221,7 @@ 67534C461A4098BE00A0A8C3 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0630; + LastUpgradeCheck = 0640; ORGANIZATIONNAME = maps.me; TargetAttributes = { 67534C4D1A4098BE00A0A8C3 = { @@ -230,7 +230,7 @@ }; }; buildConfigurationList = 67534C491A4098BE00A0A8C3 /* Build configuration list for PBXProject "fribidi" */; - compatibilityVersion = "Xcode 6.3"; + compatibilityVersion = "Xcode 3.2"; developmentRegion = English; hasScannedForEncodings = 0; knownRegions = ( diff --git a/xcode/generator_tool/generator_tool.xcodeproj/project.pbxproj b/xcode/generator_tool/generator_tool.xcodeproj/project.pbxproj index 0398450deb..c1f86dc57e 100644 --- a/xcode/generator_tool/generator_tool.xcodeproj/project.pbxproj +++ b/xcode/generator_tool/generator_tool.xcodeproj/project.pbxproj @@ -542,6 +542,8 @@ OTHER_LDFLAGS = ( "-framework", QtCore, + "-framework", + SystemConfiguration, ); SDKROOT = macosx; }; @@ -587,6 +589,8 @@ OTHER_LDFLAGS = ( "-framework", QtCore, + "-framework", + SystemConfiguration, ); SDKROOT = macosx; }; diff --git a/xcode/graphics/graphics.xcodeproj/project.pbxproj b/xcode/graphics/graphics.xcodeproj/project.pbxproj index 252f0d40a7..c914e0c1f4 100644 --- a/xcode/graphics/graphics.xcodeproj/project.pbxproj +++ b/xcode/graphics/graphics.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 47; + objectVersion = 46; objects = { /* Begin PBXBuildFile section */ @@ -569,7 +569,7 @@ 675347641A4059B400A0A8C3 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0630; + LastUpgradeCheck = 0640; ORGANIZATIONNAME = maps.me; TargetAttributes = { 6753476B1A4059B400A0A8C3 = { @@ -578,7 +578,7 @@ }; }; buildConfigurationList = 675347671A4059B400A0A8C3 /* Build configuration list for PBXProject "graphics" */; - compatibilityVersion = "Xcode 6.3"; + compatibilityVersion = "Xcode 3.2"; developmentRegion = English; hasScannedForEncodings = 0; knownRegions = ( diff --git a/xcode/gui/gui.xcodeproj/project.pbxproj b/xcode/gui/gui.xcodeproj/project.pbxproj index b6d46a9f1a..a9c1defdff 100644 --- a/xcode/gui/gui.xcodeproj/project.pbxproj +++ b/xcode/gui/gui.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 47; + objectVersion = 46; objects = { /* Begin PBXBuildFile section */ @@ -135,7 +135,7 @@ 67534BB21A40952A00A0A8C3 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0630; + LastUpgradeCheck = 0640; ORGANIZATIONNAME = maps.me; TargetAttributes = { 67534BB91A40952A00A0A8C3 = { @@ -144,7 +144,7 @@ }; }; buildConfigurationList = 67534BB51A40952A00A0A8C3 /* Build configuration list for PBXProject "gui" */; - compatibilityVersion = "Xcode 6.3"; + compatibilityVersion = "Xcode 3.2"; developmentRegion = English; hasScannedForEncodings = 0; knownRegions = ( diff --git a/xcode/indexer/indexer.xcodeproj/project.pbxproj b/xcode/indexer/indexer.xcodeproj/project.pbxproj index 536c119cc0..539d6d5d63 100644 --- a/xcode/indexer/indexer.xcodeproj/project.pbxproj +++ b/xcode/indexer/indexer.xcodeproj/project.pbxproj @@ -35,7 +35,6 @@ 670C61481AB0675700C38A8C /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 670C61471AB0675700C38A8C /* CoreFoundation.framework */; }; 670C614A1AB0677200C38A8C /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 670C61491AB0677200C38A8C /* IOKit.framework */; }; 670C614C1AB067D300C38A8C /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 670C614B1AB067D200C38A8C /* Cocoa.framework */; }; - 670C614E1AB0682300C38A8C /* QtCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 670C614D1AB0682300C38A8C /* QtCore.framework */; }; 670C61501AB0684000C38A8C /* libprotobuf.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 670C614F1AB0684000C38A8C /* libprotobuf.a */; }; 670C61521AB0685E00C38A8C /* libtomcrypt.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 670C61511AB0685E00C38A8C /* libtomcrypt.a */; }; 670C61561AB0689F00C38A8C /* libgeometry.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 670C61551AB0689F00C38A8C /* libgeometry.a */; }; @@ -49,6 +48,9 @@ 670D04AD1B0BA8580013A7AC /* interval_index_101.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 670D04AA1B0BA8580013A7AC /* interval_index_101.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 */; }; + 674125141B4C02F100A3E828 /* map_style_reader.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 674125111B4C02F100A3E828 /* map_style_reader.hpp */; }; + 674125151B4C02F100A3E828 /* map_style.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 674125121B4C02F100A3E828 /* map_style.hpp */; }; 675340FD1A3F540F00A0A8C3 /* categories_holder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 675340A81A3F540F00A0A8C3 /* categories_holder.cpp */; }; 675340FE1A3F540F00A0A8C3 /* categories_holder.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675340A91A3F540F00A0A8C3 /* categories_holder.hpp */; }; 675340FF1A3F540F00A0A8C3 /* cell_coverer.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675340AA1A3F540F00A0A8C3 /* cell_coverer.hpp */; }; @@ -188,6 +190,9 @@ 670D05AB1B0E07040013A7AC /* defaults.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = defaults.xcconfig; path = ../defaults.xcconfig; sourceTree = ""; }; 6726C1CF1A49DAAC005EEA39 /* feature_meta.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = feature_meta.cpp; sourceTree = ""; }; 6726C1D01A49DAAC005EEA39 /* feature_meta.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = feature_meta.hpp; sourceTree = ""; }; + 674125101B4C02F100A3E828 /* map_style_reader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = map_style_reader.cpp; sourceTree = ""; }; + 674125111B4C02F100A3E828 /* map_style_reader.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = map_style_reader.hpp; sourceTree = ""; }; + 674125121B4C02F100A3E828 /* map_style.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = map_style.hpp; sourceTree = ""; }; 6753409A1A3F53CB00A0A8C3 /* libindexer.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libindexer.a; sourceTree = BUILT_PRODUCTS_DIR; }; 675340A81A3F540F00A0A8C3 /* categories_holder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = categories_holder.cpp; sourceTree = ""; }; 675340A91A3F540F00A0A8C3 /* categories_holder.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = categories_holder.hpp; sourceTree = ""; }; @@ -288,7 +293,6 @@ 670C61421AB0670700C38A8C /* libplatform.a in Frameworks */, 670C61561AB0689F00C38A8C /* libgeometry.a in Frameworks */, 670C61401AB066CD00C38A8C /* libindexer.a in Frameworks */, - 670C614E1AB0682300C38A8C /* QtCore.framework in Frameworks */, 670C61501AB0684000C38A8C /* libprotobuf.a in Frameworks */, 670C61521AB0685E00C38A8C /* libtomcrypt.a in Frameworks */, ); @@ -386,6 +390,9 @@ isa = PBXGroup; children = ( 670D04A71B0BA8410013A7AC /* old */, + 674125101B4C02F100A3E828 /* map_style_reader.cpp */, + 674125111B4C02F100A3E828 /* map_style_reader.hpp */, + 674125121B4C02F100A3E828 /* map_style.hpp */, 670C61581AB0691900C38A8C /* features_offsets_table.cpp */, 670C61591AB0691900C38A8C /* features_offsets_table.hpp */, 670C615A1AB0691900C38A8C /* string_file_values.hpp */, @@ -490,6 +497,7 @@ 6753414E1A3F540F00A0A8C3 /* types_mapping.hpp in Headers */, 6753411F1A3F540F00A0A8C3 /* feature_loader.hpp in Headers */, 675341151A3F540F00A0A8C3 /* feature_covering.hpp in Headers */, + 674125151B4C02F100A3E828 /* map_style.hpp in Headers */, 675341291A3F540F00A0A8C3 /* ftypes_matcher.hpp in Headers */, 675341201A3F540F00A0A8C3 /* feature_processor.hpp in Headers */, 675341341A3F540F00A0A8C3 /* interval_index.hpp in Headers */, @@ -526,6 +534,7 @@ 675341321A3F540F00A0A8C3 /* interval_index_builder.hpp in Headers */, 6753414B1A3F540F00A0A8C3 /* tesselator_decl.hpp in Headers */, 675341191A3F540F00A0A8C3 /* feature_decl.hpp in Headers */, + 674125141B4C02F100A3E828 /* map_style_reader.hpp in Headers */, 675341221A3F540F00A0A8C3 /* feature_utils.hpp in Headers */, 675341171A3F540F00A0A8C3 /* feature_data.hpp in Headers */, 6753410F1A3F540F00A0A8C3 /* drules_include.hpp in Headers */, @@ -673,6 +682,7 @@ 670C611A1AB065B100C38A8C /* sort_and_merge_intervals_test.cpp in Sources */, 670C61101AB065B100C38A8C /* features_offsets_table_test.cpp in Sources */, 670C611B1AB065B100C38A8C /* test_polylines.cpp in Sources */, + 674125131B4C02F100A3E828 /* map_style_reader.cpp in Sources */, 675341141A3F540F00A0A8C3 /* feature_covering.cpp in Sources */, 675341371A3F540F00A0A8C3 /* mwm_set.cpp in Sources */, 675341181A3F540F00A0A8C3 /* feature_decl.cpp in Sources */, @@ -700,6 +710,10 @@ ); HEADER_SEARCH_PATHS = "$(inherited)"; LIBRARY_SEARCH_PATHS = "$(inherited)"; + OTHER_LDFLAGS = ( + "-framework", + QtCore, + ); PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; @@ -710,6 +724,10 @@ FRAMEWORK_SEARCH_PATHS = "$(inherited)"; HEADER_SEARCH_PATHS = "$(inherited)"; LIBRARY_SEARCH_PATHS = "$(inherited)"; + OTHER_LDFLAGS = ( + "-framework", + QtCore, + ); PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; @@ -734,6 +752,7 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; COPY_PHASE_STRIP = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; + FRAMEWORK_SEARCH_PATHS = "$(QT_PATH)/lib"; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_DYNAMIC_NO_PIC = NO; GCC_OPTIMIZATION_LEVEL = 0; @@ -781,6 +800,7 @@ DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; + FRAMEWORK_SEARCH_PATHS = "$(QT_PATH)/lib"; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; diff --git a/xcode/map/map.xcodeproj/project.pbxproj b/xcode/map/map.xcodeproj/project.pbxproj index 638bda5dd5..977fb8f3e7 100644 --- a/xcode/map/map.xcodeproj/project.pbxproj +++ b/xcode/map/map.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 47; + objectVersion = 46; objects = { /* Begin PBXBuildFile section */ @@ -520,7 +520,7 @@ 675345B31A4054AD00A0A8C3 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0630; + LastUpgradeCheck = 0640; ORGANIZATIONNAME = maps.me; TargetAttributes = { 674A29DE1B26FD1C001A525C = { @@ -532,7 +532,7 @@ }; }; buildConfigurationList = 675345B61A4054AD00A0A8C3 /* Build configuration list for PBXProject "map" */; - compatibilityVersion = "Xcode 6.3"; + compatibilityVersion = "Xcode 3.2"; developmentRegion = English; hasScannedForEncodings = 0; knownRegions = ( @@ -785,6 +785,7 @@ 674A29E51B26FD1C001A525C /* Release */, ); defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; }; 675345B61A4054AD00A0A8C3 /* Build configuration list for PBXProject "map" */ = { isa = XCConfigurationList; diff --git a/xcode/osrm/osrm.xcodeproj/project.pbxproj b/xcode/osrm/osrm.xcodeproj/project.pbxproj index 3ba7ef6b1c..7572e83575 100644 --- a/xcode/osrm/osrm.xcodeproj/project.pbxproj +++ b/xcode/osrm/osrm.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 47; + objectVersion = 46; objects = { /* Begin PBXBuildFile section */ @@ -376,7 +376,7 @@ 67534D391A40B7ED00A0A8C3 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0630; + LastUpgradeCheck = 0640; ORGANIZATIONNAME = maps.me; TargetAttributes = { 67534D401A40B7ED00A0A8C3 = { @@ -385,7 +385,7 @@ }; }; buildConfigurationList = 67534D3C1A40B7ED00A0A8C3 /* Build configuration list for PBXProject "osrm" */; - compatibilityVersion = "Xcode 6.3"; + compatibilityVersion = "Xcode 3.2"; developmentRegion = English; hasScannedForEncodings = 0; knownRegions = ( diff --git a/xcode/platform/platform.xcodeproj/project.pbxproj b/xcode/platform/platform.xcodeproj/project.pbxproj index 73349307f3..35f6da4337 100644 --- a/xcode/platform/platform.xcodeproj/project.pbxproj +++ b/xcode/platform/platform.xcodeproj/project.pbxproj @@ -9,6 +9,14 @@ /* Begin PBXBuildFile section */ 671C62061AE9014C00076BD0 /* measurement_utils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 671C62041AE9014C00076BD0 /* measurement_utils.cpp */; }; 671C62071AE9014C00076BD0 /* measurement_utils.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 671C62051AE9014C00076BD0 /* measurement_utils.hpp */; }; + 674125081B4C00CC00A3E828 /* country_defines.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 674125001B4C00CC00A3E828 /* country_defines.cpp */; }; + 674125091B4C00CC00A3E828 /* country_defines.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 674125011B4C00CC00A3E828 /* country_defines.hpp */; }; + 6741250A1B4C00CC00A3E828 /* country_file.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 674125021B4C00CC00A3E828 /* country_file.cpp */; }; + 6741250B1B4C00CC00A3E828 /* country_file.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 674125031B4C00CC00A3E828 /* country_file.hpp */; }; + 6741250C1B4C00CC00A3E828 /* local_country_file_utils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 674125041B4C00CC00A3E828 /* local_country_file_utils.cpp */; }; + 6741250D1B4C00CC00A3E828 /* local_country_file_utils.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 674125051B4C00CC00A3E828 /* local_country_file_utils.hpp */; }; + 6741250E1B4C00CC00A3E828 /* local_country_file.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 674125061B4C00CC00A3E828 /* local_country_file.cpp */; }; + 6741250F1B4C00CC00A3E828 /* local_country_file.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 674125071B4C00CC00A3E828 /* local_country_file.hpp */; }; 675343B11A3F5D5A00A0A8C3 /* apple_location_service.mm in Sources */ = {isa = PBXBuildFile; fileRef = 675343861A3F5D5900A0A8C3 /* apple_location_service.mm */; }; 675343B21A3F5D5A00A0A8C3 /* apple_video_timer.mm in Sources */ = {isa = PBXBuildFile; fileRef = 675343871A3F5D5900A0A8C3 /* apple_video_timer.mm */; }; 675343B31A3F5D5A00A0A8C3 /* chunks_download_strategy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 675343881A3F5D5900A0A8C3 /* chunks_download_strategy.cpp */; }; @@ -48,6 +56,14 @@ 670D05A71B0E03BF0013A7AC /* defaults.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = defaults.xcconfig; path = ../defaults.xcconfig; sourceTree = ""; }; 671C62041AE9014C00076BD0 /* measurement_utils.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = measurement_utils.cpp; sourceTree = ""; }; 671C62051AE9014C00076BD0 /* measurement_utils.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = measurement_utils.hpp; sourceTree = ""; }; + 674125001B4C00CC00A3E828 /* country_defines.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = country_defines.cpp; sourceTree = ""; }; + 674125011B4C00CC00A3E828 /* country_defines.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = country_defines.hpp; sourceTree = ""; }; + 674125021B4C00CC00A3E828 /* country_file.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = country_file.cpp; sourceTree = ""; }; + 674125031B4C00CC00A3E828 /* country_file.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = country_file.hpp; sourceTree = ""; }; + 674125041B4C00CC00A3E828 /* local_country_file_utils.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = local_country_file_utils.cpp; sourceTree = ""; }; + 674125051B4C00CC00A3E828 /* local_country_file_utils.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = local_country_file_utils.hpp; sourceTree = ""; }; + 674125061B4C00CC00A3E828 /* local_country_file.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = local_country_file.cpp; sourceTree = ""; }; + 674125071B4C00CC00A3E828 /* local_country_file.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = local_country_file.hpp; sourceTree = ""; }; 675343781A3F5CF500A0A8C3 /* libplatform.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libplatform.a; sourceTree = BUILT_PRODUCTS_DIR; }; 675343861A3F5D5900A0A8C3 /* apple_location_service.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = apple_location_service.mm; sourceTree = ""; }; 675343871A3F5D5900A0A8C3 /* apple_video_timer.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = apple_video_timer.mm; sourceTree = ""; }; @@ -115,6 +131,14 @@ 6753437A1A3F5CF500A0A8C3 /* platform */ = { isa = PBXGroup; children = ( + 674125001B4C00CC00A3E828 /* country_defines.cpp */, + 674125011B4C00CC00A3E828 /* country_defines.hpp */, + 674125021B4C00CC00A3E828 /* country_file.cpp */, + 674125031B4C00CC00A3E828 /* country_file.hpp */, + 674125041B4C00CC00A3E828 /* local_country_file_utils.cpp */, + 674125051B4C00CC00A3E828 /* local_country_file_utils.hpp */, + 674125061B4C00CC00A3E828 /* local_country_file.cpp */, + 674125071B4C00CC00A3E828 /* local_country_file.hpp */, 671C62041AE9014C00076BD0 /* measurement_utils.cpp */, 671C62051AE9014C00076BD0 /* measurement_utils.hpp */, 675343861A3F5D5900A0A8C3 /* apple_location_service.mm */, @@ -163,6 +187,7 @@ buildActionMask = 2147483647; files = ( 675343B71A3F5D5A00A0A8C3 /* http_request.hpp in Headers */, + 6741250B1B4C00CC00A3E828 /* country_file.hpp in Headers */, 675343B81A3F5D5A00A0A8C3 /* http_thread_apple.h in Headers */, 675343C21A3F5D5A00A0A8C3 /* location.hpp in Headers */, 675343D41A3F5D5A00A0A8C3 /* settings.hpp in Headers */, @@ -172,9 +197,12 @@ 675343D21A3F5D5A00A0A8C3 /* servers_list.hpp in Headers */, 675343BA1A3F5D5A00A0A8C3 /* http_thread_callback.hpp in Headers */, 675343B41A3F5D5A00A0A8C3 /* chunks_download_strategy.hpp in Headers */, + 674125091B4C00CC00A3E828 /* country_defines.hpp in Headers */, 675343CD1A3F5D5A00A0A8C3 /* platform.hpp in Headers */, 675343D81A3F5D5A00A0A8C3 /* video_timer.hpp in Headers */, + 6741250F1B4C00CC00A3E828 /* local_country_file.hpp in Headers */, 675343CF1A3F5D5A00A0A8C3 /* preferred_languages.hpp in Headers */, + 6741250D1B4C00CC00A3E828 /* local_country_file_utils.hpp in Headers */, 675343DA1A3F5D5A00A0A8C3 /* wifi_info.hpp in Headers */, 671C62071AE9014C00076BD0 /* measurement_utils.hpp in Headers */, ); @@ -238,7 +266,11 @@ files = ( 675343D11A3F5D5A00A0A8C3 /* servers_list.cpp in Sources */, 675343C91A3F5D5A00A0A8C3 /* platform_unix_impl.cpp in Sources */, + 6741250A1B4C00CC00A3E828 /* country_file.cpp in Sources */, + 674125081B4C00CC00A3E828 /* country_defines.cpp in Sources */, + 6741250E1B4C00CC00A3E828 /* local_country_file.cpp in Sources */, 675343D91A3F5D5A00A0A8C3 /* wifi_info_windows.cpp in Sources */, + 6741250C1B4C00CC00A3E828 /* local_country_file_utils.cpp in Sources */, 675343B21A3F5D5A00A0A8C3 /* apple_video_timer.mm in Sources */, 671C62061AE9014C00076BD0 /* measurement_utils.cpp in Sources */, 675343B61A3F5D5A00A0A8C3 /* http_request.cpp in Sources */, diff --git a/xcode/protobuf/protobuf.xcodeproj/project.pbxproj b/xcode/protobuf/protobuf.xcodeproj/project.pbxproj index ac02f80cc9..ae62c038b0 100644 --- a/xcode/protobuf/protobuf.xcodeproj/project.pbxproj +++ b/xcode/protobuf/protobuf.xcodeproj/project.pbxproj @@ -116,7 +116,7 @@ 670D04C51B0BAC210013A7AC /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0630; + LastUpgradeCheck = 0640; ORGANIZATIONNAME = maps.me; TargetAttributes = { 670D04CC1B0BAC210013A7AC = { @@ -256,6 +256,7 @@ 670D04D91B0BAC210013A7AC /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + COMBINE_HIDPI_IMAGES = YES; EXECUTABLE_PREFIX = lib; GCC_ENABLE_CPP_EXCEPTIONS = YES; GCC_ENABLE_CPP_RTTI = YES; @@ -268,6 +269,7 @@ 670D04DA1B0BAC210013A7AC /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + COMBINE_HIDPI_IMAGES = YES; EXECUTABLE_PREFIX = lib; GCC_ENABLE_CPP_EXCEPTIONS = YES; GCC_ENABLE_CPP_RTTI = YES; diff --git a/xcode/render/render.xcodeproj/project.pbxproj b/xcode/render/render.xcodeproj/project.pbxproj index 4b95aafd20..e67716e85c 100644 --- a/xcode/render/render.xcodeproj/project.pbxproj +++ b/xcode/render/render.xcodeproj/project.pbxproj @@ -294,7 +294,7 @@ 674A29011B26EAAB001A525C /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0630; + LastUpgradeCheck = 0640; ORGANIZATIONNAME = maps.me; TargetAttributes = { 674A29081B26EAAB001A525C = { @@ -452,6 +452,7 @@ 674A29151B26EAAB001A525C /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + COMBINE_HIDPI_IMAGES = YES; EXECUTABLE_PREFIX = lib; GCC_ENABLE_CPP_EXCEPTIONS = YES; GCC_ENABLE_CPP_RTTI = YES; @@ -463,6 +464,7 @@ 674A29161B26EAAB001A525C /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + COMBINE_HIDPI_IMAGES = YES; EXECUTABLE_PREFIX = lib; GCC_ENABLE_CPP_EXCEPTIONS = YES; GCC_ENABLE_CPP_RTTI = YES; @@ -490,6 +492,7 @@ 674A29161B26EAAB001A525C /* Release */, ); defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; }; /* End XCConfigurationList section */ }; diff --git a/xcode/search/search.xcodeproj/project.pbxproj b/xcode/search/search.xcodeproj/project.pbxproj index ce2fb4bf9a..32dd3a6f13 100644 --- a/xcode/search/search.xcodeproj/project.pbxproj +++ b/xcode/search/search.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 47; + objectVersion = 46; objects = { /* Begin PBXBuildFile section */ @@ -316,7 +316,7 @@ 675346A81A4055CF00A0A8C3 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0630; + LastUpgradeCheck = 0640; ORGANIZATIONNAME = maps.me; TargetAttributes = { 671C620B1AE9225100076BD0 = { @@ -328,7 +328,7 @@ }; }; buildConfigurationList = 675346AB1A4055CF00A0A8C3 /* Build configuration list for PBXProject "search" */; - compatibilityVersion = "Xcode 6.3"; + compatibilityVersion = "Xcode 3.2"; developmentRegion = English; hasScannedForEncodings = 0; knownRegions = ( diff --git a/xcode/storage/storage.xcodeproj/project.pbxproj b/xcode/storage/storage.xcodeproj/project.pbxproj index 8b63f2c8d2..adaa420b56 100644 --- a/xcode/storage/storage.xcodeproj/project.pbxproj +++ b/xcode/storage/storage.xcodeproj/project.pbxproj @@ -7,6 +7,12 @@ objects = { /* Begin PBXBuildFile section */ + 6741251E1B4C05FA00A3E828 /* http_map_files_downloader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 674125181B4C05FA00A3E828 /* http_map_files_downloader.cpp */; }; + 6741251F1B4C05FA00A3E828 /* http_map_files_downloader.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 674125191B4C05FA00A3E828 /* http_map_files_downloader.hpp */; }; + 674125201B4C05FA00A3E828 /* map_files_downloader.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 6741251A1B4C05FA00A3E828 /* map_files_downloader.hpp */; }; + 674125211B4C05FA00A3E828 /* queued_country.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6741251B1B4C05FA00A3E828 /* queued_country.cpp */; }; + 674125221B4C05FA00A3E828 /* queued_country.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 6741251C1B4C05FA00A3E828 /* queued_country.hpp */; }; + 674125231B4C05FA00A3E828 /* storage_defines.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6741251D1B4C05FA00A3E828 /* storage_defines.cpp */; }; 675343091A3F5A2600A0A8C3 /* country_decl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 675342F21A3F5A2600A0A8C3 /* country_decl.cpp */; }; 6753430A1A3F5A2600A0A8C3 /* country_decl.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675342F31A3F5A2600A0A8C3 /* country_decl.hpp */; }; 6753430B1A3F5A2600A0A8C3 /* country_info.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 675342F41A3F5A2600A0A8C3 /* country_info.cpp */; }; @@ -24,6 +30,12 @@ /* Begin PBXFileReference section */ 670D05A81B0E04450013A7AC /* defaults.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = defaults.xcconfig; path = ../defaults.xcconfig; sourceTree = ""; }; + 674125181B4C05FA00A3E828 /* http_map_files_downloader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = http_map_files_downloader.cpp; sourceTree = ""; }; + 674125191B4C05FA00A3E828 /* http_map_files_downloader.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = http_map_files_downloader.hpp; sourceTree = ""; }; + 6741251A1B4C05FA00A3E828 /* map_files_downloader.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = map_files_downloader.hpp; sourceTree = ""; }; + 6741251B1B4C05FA00A3E828 /* queued_country.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = queued_country.cpp; sourceTree = ""; }; + 6741251C1B4C05FA00A3E828 /* queued_country.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = queued_country.hpp; sourceTree = ""; }; + 6741251D1B4C05FA00A3E828 /* storage_defines.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = storage_defines.cpp; sourceTree = ""; }; 675342E01A3F59EF00A0A8C3 /* libstorage.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libstorage.a; sourceTree = BUILT_PRODUCTS_DIR; }; 675342F21A3F5A2600A0A8C3 /* country_decl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = country_decl.cpp; sourceTree = ""; }; 675342F31A3F5A2600A0A8C3 /* country_decl.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = country_decl.hpp; sourceTree = ""; }; @@ -71,6 +83,12 @@ 675342E21A3F59EF00A0A8C3 /* storage */ = { isa = PBXGroup; children = ( + 674125181B4C05FA00A3E828 /* http_map_files_downloader.cpp */, + 674125191B4C05FA00A3E828 /* http_map_files_downloader.hpp */, + 6741251A1B4C05FA00A3E828 /* map_files_downloader.hpp */, + 6741251B1B4C05FA00A3E828 /* queued_country.cpp */, + 6741251C1B4C05FA00A3E828 /* queued_country.hpp */, + 6741251D1B4C05FA00A3E828 /* storage_defines.cpp */, 675342F21A3F5A2600A0A8C3 /* country_decl.cpp */, 675342F31A3F5A2600A0A8C3 /* country_decl.hpp */, 675342F41A3F5A2600A0A8C3 /* country_info.cpp */, @@ -96,12 +114,15 @@ isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( + 674125201B4C05FA00A3E828 /* map_files_downloader.hpp in Headers */, 6753430D1A3F5A2600A0A8C3 /* country_polygon.hpp in Headers */, 6753430C1A3F5A2600A0A8C3 /* country_info.hpp in Headers */, + 6741251F1B4C05FA00A3E828 /* http_map_files_downloader.hpp in Headers */, 675343191A3F5A2600A0A8C3 /* storage_defines.hpp in Headers */, 6753430F1A3F5A2600A0A8C3 /* country.hpp in Headers */, 675343181A3F5A2600A0A8C3 /* simple_tree.hpp in Headers */, 6753430A1A3F5A2600A0A8C3 /* country_decl.hpp in Headers */, + 674125221B4C05FA00A3E828 /* queued_country.hpp in Headers */, 6753431B1A3F5A2600A0A8C3 /* storage.hpp in Headers */, 675343171A3F5A2600A0A8C3 /* index.hpp in Headers */, ); @@ -166,8 +187,11 @@ 6753430B1A3F5A2600A0A8C3 /* country_info.cpp in Sources */, 6753430E1A3F5A2600A0A8C3 /* country.cpp in Sources */, 675343091A3F5A2600A0A8C3 /* country_decl.cpp in Sources */, + 674125211B4C05FA00A3E828 /* queued_country.cpp in Sources */, 6753431A1A3F5A2600A0A8C3 /* storage.cpp in Sources */, 675343161A3F5A2600A0A8C3 /* index.cpp in Sources */, + 674125231B4C05FA00A3E828 /* storage_defines.cpp in Sources */, + 6741251E1B4C05FA00A3E828 /* http_map_files_downloader.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/xcode/succinct/succinct.xcodeproj/project.pbxproj b/xcode/succinct/succinct.xcodeproj/project.pbxproj index d28811bc63..8d2718b122 100644 --- a/xcode/succinct/succinct.xcodeproj/project.pbxproj +++ b/xcode/succinct/succinct.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 47; + objectVersion = 46; objects = { /* Begin PBXBuildFile section */ @@ -180,7 +180,7 @@ 67B52B631AD3CA7F00664C17 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0630; + LastUpgradeCheck = 0640; ORGANIZATIONNAME = maps.me; TargetAttributes = { 67B52B6A1AD3CA7F00664C17 = { @@ -189,7 +189,7 @@ }; }; buildConfigurationList = 67B52B661AD3CA7F00664C17 /* Build configuration list for PBXProject "succinct" */; - compatibilityVersion = "Xcode 6.3"; + compatibilityVersion = "Xcode 3.2"; developmentRegion = English; hasScannedForEncodings = 0; knownRegions = ( diff --git a/xcode/zlib/zlib.xcodeproj/project.pbxproj b/xcode/zlib/zlib.xcodeproj/project.pbxproj index 9bc9fddcdd..5c3bf86d93 100644 --- a/xcode/zlib/zlib.xcodeproj/project.pbxproj +++ b/xcode/zlib/zlib.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 47; + objectVersion = 46; objects = { /* Begin PBXBuildFile section */ @@ -205,7 +205,7 @@ 67534CB41A409A8E00A0A8C3 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0630; + LastUpgradeCheck = 0640; ORGANIZATIONNAME = maps.me; TargetAttributes = { 67534CBB1A409A8E00A0A8C3 = { @@ -214,7 +214,7 @@ }; }; buildConfigurationList = 67534CB71A409A8E00A0A8C3 /* Build configuration list for PBXProject "zlib" */; - compatibilityVersion = "Xcode 6.3"; + compatibilityVersion = "Xcode 3.2"; developmentRegion = English; hasScannedForEncodings = 0; knownRegions = (