diff --git a/xcode/base/base.xcodeproj/project.pbxproj b/xcode/base/base.xcodeproj/project.pbxproj index dff395b65f..bbae97da91 100644 --- a/xcode/base/base.xcodeproj/project.pbxproj +++ b/xcode/base/base.xcodeproj/project.pbxproj @@ -37,10 +37,6 @@ 39FD27391CC65AD000AFF551 /* timer_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 39FD26E31CC65A0E00AFF551 /* timer_test.cpp */; }; 39FD273A1CC65AD000AFF551 /* worker_thread_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 39FD26E41CC65A0E00AFF551 /* worker_thread_test.cpp */; }; 39FD273B1CC65B1000AFF551 /* libbase.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 675341771A3F57BF00A0A8C3 /* libbase.a */; }; - 39FD273E1CC65B1000AFF551 /* libplatform_tests_support.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 39FD273C1CC65B1000AFF551 /* libplatform_tests_support.a */; }; - 39FD273F1CC65B1000AFF551 /* libplatform.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 39FD273D1CC65B1000AFF551 /* libplatform.a */; }; - 39FD27431CC65B4800AFF551 /* libcoding.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 39FD27421CC65B4800AFF551 /* libcoding.a */; }; - 39FD27451CC65B5C00AFF551 /* libtomcrypt.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 39FD27441CC65B5C00AFF551 /* libtomcrypt.a */; }; 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 */; }; 671182F01C807C0A00CB8177 /* gmtime.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 671182EE1C807C0A00CB8177 /* gmtime.cpp */; }; @@ -110,6 +106,8 @@ /* End PBXBuildFile section */ /* Begin PBXFileReference section */ + 34BA2D6A1DBE169E00FAB345 /* common-debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = "common-debug.xcconfig"; path = "../common-debug.xcconfig"; sourceTree = ""; }; + 34BA2D6B1DBE169E00FAB345 /* common-release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = "common-release.xcconfig"; path = "../common-release.xcconfig"; sourceTree = ""; }; 39FD26C81CC65A0E00AFF551 /* assert_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = assert_test.cpp; sourceTree = ""; }; 39FD26CA1CC65A0E00AFF551 /* bits_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = bits_test.cpp; sourceTree = ""; }; 39FD26CB1CC65A0E00AFF551 /* buffer_vector_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = buffer_vector_test.cpp; sourceTree = ""; }; @@ -145,7 +143,6 @@ 39FD27401CC65B2800AFF551 /* libindexer.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libindexer.a; path = "../../../omim-xcode-build/Debug/libindexer.a"; sourceTree = ""; }; 39FD27421CC65B4800AFF551 /* libcoding.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libcoding.a; path = "../../../omim-xcode-build/Debug/libcoding.a"; sourceTree = ""; }; 39FD27441CC65B5C00AFF551 /* libtomcrypt.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libtomcrypt.a; path = "../../../omim-xcode-build/Debug/libtomcrypt.a"; sourceTree = ""; }; - 670D05AA1B0E057B0013A7AC /* defaults.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = defaults.xcconfig; path = ../defaults.xcconfig; sourceTree = ""; }; 670E39421C46C76900E9C0A6 /* sunrise_sunset.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = sunrise_sunset.cpp; sourceTree = ""; }; 670E39431C46C76900E9C0A6 /* sunrise_sunset.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = sunrise_sunset.hpp; sourceTree = ""; }; 671182EE1C807C0A00CB8177 /* gmtime.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = gmtime.cpp; sourceTree = ""; }; @@ -220,10 +217,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 39FD27451CC65B5C00AFF551 /* libtomcrypt.a in Frameworks */, - 39FD27431CC65B4800AFF551 /* libcoding.a in Frameworks */, - 39FD273E1CC65B1000AFF551 /* libplatform_tests_support.a in Frameworks */, - 39FD273F1CC65B1000AFF551 /* libplatform.a in Frameworks */, 39FD273B1CC65B1000AFF551 /* libbase.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -278,7 +271,8 @@ 6753416E1A3F57BF00A0A8C3 = { isa = PBXGroup; children = ( - 670D05AA1B0E057B0013A7AC /* defaults.xcconfig */, + 34BA2D6A1DBE169E00FAB345 /* common-debug.xcconfig */, + 34BA2D6B1DBE169E00FAB345 /* common-release.xcconfig */, 678850931D084AF6004201E1 /* libs */, 675341791A3F57BF00A0A8C3 /* base */, 39FD26C71CC659D200AFF551 /* base_tests */, @@ -599,128 +593,51 @@ 39FD271C1CC65A7100AFF551 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; DEBUG_INFORMATION_FORMAT = dwarf; ENABLE_TESTABILITY = YES; - GCC_NO_COMMON_BLOCKS = YES; + GCC_PREPROCESSOR_DEFINITIONS = ( + "$(inherited)", + "OMIM_UNIT_TEST_DISABLE_PLATFORM_INIT=1", + ); INFOPLIST_FILE = "$(OMIM_ROOT)/iphone/Maps/MAPSME.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 9.2; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "maps.me.base-tests"; PRODUCT_NAME = "$(TARGET_NAME)"; - SDKROOT = iphoneos; - TARGETED_DEVICE_FAMILY = "1,2"; }; name = Debug; }; 39FD271D1CC65A7100AFF551 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COPY_PHASE_STRIP = NO; - GCC_NO_COMMON_BLOCKS = YES; + GCC_PREPROCESSOR_DEFINITIONS = ( + "$(inherited)", + "OMIM_UNIT_TEST_DISABLE_PLATFORM_INIT=1", + ); INFOPLIST_FILE = "$(OMIM_ROOT)/iphone/Maps/MAPSME.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 9.2; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "maps.me.base-tests"; PRODUCT_NAME = "$(TARGET_NAME)"; - SDKROOT = iphoneos; - TARGETED_DEVICE_FAMILY = "1,2"; VALIDATE_PRODUCT = YES; }; name = Release; }; 675341801A3F57BF00A0A8C3 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 670D05AA1B0E057B0013A7AC /* defaults.xcconfig */; + baseConfigurationReference = 34BA2D6A1DBE169E00FAB345 /* common-debug.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; - COPY_PHASE_STRIP = NO; - ENABLE_STRICT_OBJC_MSGSEND = YES; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_DYNAMIC_NO_PIC = NO; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", - ); - GCC_SYMBOLS_PRIVATE_EXTERN = NO; - 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; - HEADER_SEARCH_PATHS = "$(inherited)"; - MACOSX_DEPLOYMENT_TARGET = 10.10; - MTL_ENABLE_DEBUG_INFO = YES; - ONLY_ACTIVE_ARCH = YES; - SDKROOT = macosx; - SUPPORTED_PLATFORMS = "macosx iphonesimulator iphoneos"; }; name = Debug; }; 675341811A3F57BF00A0A8C3 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 670D05AA1B0E057B0013A7AC /* defaults.xcconfig */; + baseConfigurationReference = 34BA2D6B1DBE169E00FAB345 /* common-release.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; - COPY_PHASE_STRIP = YES; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - ENABLE_NS_ASSERTIONS = NO; - ENABLE_STRICT_OBJC_MSGSEND = YES; - GCC_C_LANGUAGE_STANDARD = gnu99; - 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; - HEADER_SEARCH_PATHS = "$(inherited)"; - MACOSX_DEPLOYMENT_TARGET = 10.10; - MTL_ENABLE_DEBUG_INFO = NO; - SDKROOT = macosx; - SUPPORTED_PLATFORMS = "macosx iphonesimulator iphoneos"; }; name = Release; }; 675341831A3F57BF00A0A8C3 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - COMBINE_HIDPI_IMAGES = YES; EXECUTABLE_PREFIX = lib; - GCC_ENABLE_CPP_EXCEPTIONS = YES; - GCC_ENABLE_CPP_RTTI = YES; - GCC_SYMBOLS_PRIVATE_EXTERN = NO; - HEADER_SEARCH_PATHS = "$(inherited)"; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; @@ -728,13 +645,7 @@ 675341841A3F57BF00A0A8C3 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - COMBINE_HIDPI_IMAGES = YES; EXECUTABLE_PREFIX = lib; - GCC_ENABLE_CPP_EXCEPTIONS = YES; - GCC_ENABLE_CPP_RTTI = YES; - GCC_PREPROCESSOR_DEFINITIONS = "RELEASE=1"; - GCC_SYMBOLS_PRIVATE_EXTERN = NO; - HEADER_SEARCH_PATHS = "$(inherited)"; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; diff --git a/xcode/common-debug.xcconfig b/xcode/common-debug.xcconfig new file mode 100644 index 0000000000..408f570a9b --- /dev/null +++ b/xcode/common-debug.xcconfig @@ -0,0 +1,7 @@ +#include "common.xcconfig" + +COPY_PHASE_STRIP = NO +GCC_OPTIMIZATION_LEVEL = 0 +ENABLE_NS_ASSERTIONS = YES +GCC_PREPROCESSOR_DEFINITIONS = $(inherited) DEBUG=1 +MTL_ENABLE_DEBUG_INFO = YES diff --git a/xcode/common-release.xcconfig b/xcode/common-release.xcconfig new file mode 100644 index 0000000000..d574ab8ee7 --- /dev/null +++ b/xcode/common-release.xcconfig @@ -0,0 +1,7 @@ +#include "common.xcconfig" + +COPY_PHASE_STRIP = YES +GCC_OPTIMIZATION_LEVEL = 3 +ENABLE_NS_ASSERTIONS = NO +GCC_PREPROCESSOR_DEFINITIONS = $(inherited) RELEASE=1 +MTL_ENABLE_DEBUG_INFO = NO diff --git a/xcode/common.xcconfig b/xcode/common.xcconfig new file mode 100644 index 0000000000..53ef61a36b --- /dev/null +++ b/xcode/common.xcconfig @@ -0,0 +1,48 @@ +// Paths +OMIM_ROOT=$(PROJECT_DIR)/../.. +BUILD_DIR=$(OMIM_ROOT)/../omim-xcode-build +QT_PATH=/usr/local/opt/qt5 +BOOST_ROOT=$(OMIM_ROOT)/3party/boost + +HEADER_SEARCH_PATHS = $(inherited) $(OMIM_ROOT) $(BOOST_ROOT) +LD_RUNPATH_SEARCH_PATHS = $(inherited) @executable_path/Frameworks +FRAMEWORK_SEARCH_PATHS[sdk=macosx*] = $(QT_PATH)/lib + +// Deployment target +IPHONEOS_DEPLOYMENT_TARGET = 8.0 +MACOSX_DEPLOYMENT_TARGET = 10.10 + +// Supported platforms +SUPPORTED_PLATFORMS = macosx iphonesimulator iphoneos + +// Linked frameworks +OTHER_LDFLAGS[sdk=macosx*] = -framework Cocoa -framework IOKit -framework OpenGL -framework QtCore -framework QtGui -framework QtNetwork -framework QtOpenGL -framework QtWidgets -framework SystemConfiguration +OTHER_LDFLAGS[sdk=iphone*] = -framework AdSupport -framework CoreGraphics -framework Foundation -framework IOKit -framework OpenGLES -framework SystemConfiguration -framework UIKit + +// Warnings settings +CLANG_WARN__DUPLICATE_METHOD_MATCH = 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 +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 + +// Build options +CLANG_CXX_LANGUAGE_STANDARD = c++0x +CLANG_ENABLE_MODULES = YES +CLANG_ENABLE_OBJC_ARC = YES +CODE_SIGN_IDENTITY[sdk=iphoneos*] = iPhone Developer +DEBUG_INFORMATION_FORMAT = dwarf-with-dsym +ENABLE_STRICT_OBJC_MSGSEND = YES +GCC_NO_COMMON_BLOCKS = YES +ONLY_ACTIVE_ARCH = YES +PRODUCT_NAME = $(TARGET_NAME) diff --git a/xcode/omim.xcworkspace/contents.xcworkspacedata b/xcode/omim.xcworkspace/contents.xcworkspacedata index ff631c349c..69ffb8b52b 100644 --- a/xcode/omim.xcworkspace/contents.xcworkspacedata +++ b/xcode/omim.xcworkspace/contents.xcworkspacedata @@ -4,6 +4,15 @@ + + + + + +