From 5a38c2dd80f9f70bcb8ca2ff3dbbbe84229e7dfb Mon Sep 17 00:00:00 2001 From: Sergey Yershov Date: Mon, 8 Feb 2016 20:13:23 +0300 Subject: [PATCH] [new downloader] Fix Xcode projects --- xcode/MapsMe/MapsMe.xcodeproj/project.pbxproj | 4 ++-- xcode/base/base.xcodeproj/project.pbxproj | 4 ---- xcode/geometry/geometry.xcodeproj/project.pbxproj | 4 ---- xcode/search/search.xcodeproj/project.pbxproj | 6 ------ xcode/storage/storage.xcodeproj/project.pbxproj | 1 + 5 files changed, 3 insertions(+), 16 deletions(-) diff --git a/xcode/MapsMe/MapsMe.xcodeproj/project.pbxproj b/xcode/MapsMe/MapsMe.xcodeproj/project.pbxproj index 13fbe41051..be858db0b0 100644 --- a/xcode/MapsMe/MapsMe.xcodeproj/project.pbxproj +++ b/xcode/MapsMe/MapsMe.xcodeproj/project.pbxproj @@ -629,7 +629,7 @@ COPY_PHASE_STRIP = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; - FRAMEWORK_SEARCH_PATHS = "$(QT_PATH)/lib"; + FRAMEWORK_SEARCH_PATHS = "$(inherited)"; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_DYNAMIC_NO_PIC = NO; GCC_OPTIMIZATION_LEVEL = 0; @@ -695,7 +695,7 @@ DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; - FRAMEWORK_SEARCH_PATHS = "$(QT_PATH)/lib"; + FRAMEWORK_SEARCH_PATHS = "$(inherited)"; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_PREPROCESSOR_DEFINITIONS = "RELEASE=1"; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; diff --git a/xcode/base/base.xcodeproj/project.pbxproj b/xcode/base/base.xcodeproj/project.pbxproj index 506416a848..701c3718fc 100644 --- a/xcode/base/base.xcodeproj/project.pbxproj +++ b/xcode/base/base.xcodeproj/project.pbxproj @@ -9,10 +9,6 @@ /* Begin PBXBuildFile section */ 670E39441C46C76900E9C0A6 /* sunrise_sunset.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670E39421C46C76900E9C0A6 /* sunrise_sunset.cpp */; }; 670E39451C46C76900E9C0A6 /* sunrise_sunset.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 670E39431C46C76900E9C0A6 /* sunrise_sunset.hpp */; }; - 34CB447E1C0C34C50061F6A0 /* timegm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 34CB447C1C0C34C50061F6A0 /* timegm.cpp */; }; - 34CB447F1C0C34C50061F6A0 /* timegm.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 34CB447D1C0C34C50061F6A0 /* timegm.hpp */; }; - 674A28AD1B160437001A525C /* deferred_task.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 674A28AB1B160437001A525C /* deferred_task.cpp */; }; - 674A28AE1B160437001A525C /* deferred_task.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 674A28AC1B160437001A525C /* deferred_task.hpp */; }; 674A7E2E1C0DB03D003D48E1 /* timegm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 674A7E2C1C0DB03D003D48E1 /* timegm.cpp */; }; 674A7E2F1C0DB03D003D48E1 /* timegm.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 674A7E2D1C0DB03D003D48E1 /* timegm.hpp */; }; 675341CB1A3F57E400A0A8C3 /* array_adapters.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675341851A3F57E400A0A8C3 /* array_adapters.hpp */; }; diff --git a/xcode/geometry/geometry.xcodeproj/project.pbxproj b/xcode/geometry/geometry.xcodeproj/project.pbxproj index a97da73f8e..ed711807b0 100644 --- a/xcode/geometry/geometry.xcodeproj/project.pbxproj +++ b/xcode/geometry/geometry.xcodeproj/project.pbxproj @@ -77,8 +77,6 @@ 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 */; }; - 676C842A1C64CE9500DC9603 /* segment2d.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 676C84281C64CE9500DC9603 /* segment2d.cpp */; }; - 676C842B1C64CE9500DC9603 /* segment2d.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 676C84291C64CE9500DC9603 /* segment2d.hpp */; }; E92D8BD11C15AF9100A98D17 /* mercator_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E92D8BD01C15AF9100A98D17 /* mercator_test.cpp */; }; E92D8BD41C15AFAA00A98D17 /* mercator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E92D8BD21C15AFAA00A98D17 /* mercator.cpp */; }; E92D8BD51C15AFAA00A98D17 /* mercator.hpp in Headers */ = {isa = PBXBuildFile; fileRef = E92D8BD31C15AFAA00A98D17 /* mercator.hpp */; }; @@ -169,8 +167,6 @@ 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 = ""; }; - 676C84281C64CE9500DC9603 /* segment2d.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = segment2d.cpp; sourceTree = ""; }; - 676C84291C64CE9500DC9603 /* segment2d.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = segment2d.hpp; sourceTree = ""; }; E92D8BD01C15AF9100A98D17 /* mercator_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mercator_test.cpp; sourceTree = ""; }; E92D8BD21C15AFAA00A98D17 /* mercator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mercator.cpp; sourceTree = ""; }; E92D8BD31C15AFAA00A98D17 /* mercator.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = mercator.hpp; sourceTree = ""; }; diff --git a/xcode/search/search.xcodeproj/project.pbxproj b/xcode/search/search.xcodeproj/project.pbxproj index 8ce9cdc17c..9e58974f21 100644 --- a/xcode/search/search.xcodeproj/project.pbxproj +++ b/xcode/search/search.xcodeproj/project.pbxproj @@ -111,9 +111,6 @@ 675346F61A40560D00A0A8C3 /* search_query.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 675346D81A40560D00A0A8C3 /* search_query.cpp */; }; 675346F71A40560D00A0A8C3 /* search_query.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675346D91A40560D00A0A8C3 /* search_query.hpp */; }; 675346F81A40560D00A0A8C3 /* search_string_intersection.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675346DA1A40560D00A0A8C3 /* search_string_intersection.hpp */; }; - 676C84251C64CE6C00DC9603 /* locality_scorer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 676C84221C64CE6C00DC9603 /* locality_scorer.cpp */; }; - 676C84261C64CE6C00DC9603 /* locality_scorer.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 676C84231C64CE6C00DC9603 /* locality_scorer.hpp */; }; - 676C84271C64CE6C00DC9603 /* stats_cache.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 676C84241C64CE6C00DC9603 /* stats_cache.hpp */; }; A1347D511B8758C3009050FF /* query_saver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A1347D4F1B8758C3009050FF /* query_saver.cpp */; }; A1347D521B8758C3009050FF /* query_saver.hpp in Headers */ = {isa = PBXBuildFile; fileRef = A1347D501B8758C3009050FF /* query_saver.hpp */; }; A1347D551B8758E9009050FF /* query_saver_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A1347D541B8758E9009050FF /* query_saver_tests.cpp */; }; @@ -239,9 +236,6 @@ 675346D81A40560D00A0A8C3 /* search_query.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = search_query.cpp; sourceTree = ""; }; 675346D91A40560D00A0A8C3 /* search_query.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = search_query.hpp; sourceTree = ""; }; 675346DA1A40560D00A0A8C3 /* search_string_intersection.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = search_string_intersection.hpp; sourceTree = ""; }; - 676C84221C64CE6C00DC9603 /* locality_scorer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = locality_scorer.cpp; sourceTree = ""; }; - 676C84231C64CE6C00DC9603 /* locality_scorer.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = locality_scorer.hpp; sourceTree = ""; }; - 676C84241C64CE6C00DC9603 /* stats_cache.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = stats_cache.hpp; sourceTree = ""; }; A1347D4F1B8758C3009050FF /* query_saver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = query_saver.cpp; sourceTree = ""; }; A1347D501B8758C3009050FF /* query_saver.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = query_saver.hpp; sourceTree = ""; }; A1347D541B8758E9009050FF /* query_saver_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = query_saver_tests.cpp; sourceTree = ""; }; diff --git a/xcode/storage/storage.xcodeproj/project.pbxproj b/xcode/storage/storage.xcodeproj/project.pbxproj index 2d9fbcf4e1..9ba0a3d498 100644 --- a/xcode/storage/storage.xcodeproj/project.pbxproj +++ b/xcode/storage/storage.xcodeproj/project.pbxproj @@ -1105,6 +1105,7 @@ 676C83BA1C637A4300DC9603 /* Release */, ); defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; }; /* End XCConfigurationList section */ };