diff options
28 files changed, 124 insertions, 27 deletions
diff --git a/xcode/MapsMe/MapsMe.xcodeproj/project.pbxproj b/xcode/MapsMe/MapsMe.xcodeproj/project.pbxproj index 6993c83638..a964d6bcab 100644 --- a/xcode/MapsMe/MapsMe.xcodeproj/project.pbxproj +++ b/xcode/MapsMe/MapsMe.xcodeproj/project.pbxproj @@ -228,10 +228,6 @@ 675345781A404CB200A0A8C3 /* preferences_dialog.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = preferences_dialog.hpp; sourceTree = "<group>"; }; 675345791A404CB200A0A8C3 /* proxystyle.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = proxystyle.cpp; sourceTree = "<group>"; }; 6753457A1A404CB200A0A8C3 /* proxystyle.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = proxystyle.hpp; sourceTree = "<group>"; }; - 6753457B1A404CB200A0A8C3 /* qtoglcontext.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = qtoglcontext.cpp; sourceTree = "<group>"; }; - 6753457C1A404CB200A0A8C3 /* qtoglcontext.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = qtoglcontext.hpp; sourceTree = "<group>"; }; - 6753457D1A404CB200A0A8C3 /* qtoglcontextfactory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = qtoglcontextfactory.cpp; sourceTree = "<group>"; }; - 6753457E1A404CB200A0A8C3 /* qtoglcontextfactory.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = qtoglcontextfactory.hpp; sourceTree = "<group>"; }; 6753457F1A404CB200A0A8C3 /* search_panel.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = search_panel.cpp; sourceTree = "<group>"; }; 675345801A404CB200A0A8C3 /* search_panel.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = search_panel.hpp; sourceTree = "<group>"; }; 675345811A404CB200A0A8C3 /* slider_ctrl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = slider_ctrl.cpp; sourceTree = "<group>"; }; @@ -411,10 +407,6 @@ 675345781A404CB200A0A8C3 /* preferences_dialog.hpp */, 675345791A404CB200A0A8C3 /* proxystyle.cpp */, 6753457A1A404CB200A0A8C3 /* proxystyle.hpp */, - 6753457B1A404CB200A0A8C3 /* qtoglcontext.cpp */, - 6753457C1A404CB200A0A8C3 /* qtoglcontext.hpp */, - 6753457D1A404CB200A0A8C3 /* qtoglcontextfactory.cpp */, - 6753457E1A404CB200A0A8C3 /* qtoglcontextfactory.hpp */, 6753457F1A404CB200A0A8C3 /* search_panel.cpp */, 675345801A404CB200A0A8C3 /* search_panel.hpp */, 675345811A404CB200A0A8C3 /* slider_ctrl.cpp */, diff --git a/xcode/alohalitics/alohalitics.xcodeproj/project.pbxproj b/xcode/alohalitics/alohalitics.xcodeproj/project.pbxproj index 4359ccc164..185a2397c0 100644 --- a/xcode/alohalitics/alohalitics.xcodeproj/project.pbxproj +++ b/xcode/alohalitics/alohalitics.xcodeproj/project.pbxproj @@ -187,6 +187,7 @@ MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = macosx; + SUPPORTED_PLATFORMS = "macosx iphonesimulator iphoneos"; }; name = Debug; }; @@ -224,6 +225,7 @@ MACOSX_DEPLOYMENT_TARGET = 10.10; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = macosx; + SUPPORTED_PLATFORMS = "macosx iphonesimulator iphoneos"; }; name = Release; }; diff --git a/xcode/anim/anim.xcodeproj/project.pbxproj b/xcode/anim/anim.xcodeproj/project.pbxproj index 1f566025f7..07d22507a1 100644 --- a/xcode/anim/anim.xcodeproj/project.pbxproj +++ b/xcode/anim/anim.xcodeproj/project.pbxproj @@ -209,6 +209,7 @@ MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = macosx; + SUPPORTED_PLATFORMS = "macosx iphonesimulator iphoneos"; }; name = Debug; }; @@ -245,6 +246,7 @@ MACOSX_DEPLOYMENT_TARGET = 10.10; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = macosx; + SUPPORTED_PLATFORMS = "macosx iphonesimulator iphoneos"; }; name = Release; }; diff --git a/xcode/api/api.xcodeproj/project.pbxproj b/xcode/api/api.xcodeproj/project.pbxproj index 70efb84e86..7b4b84a3e5 100644 --- a/xcode/api/api.xcodeproj/project.pbxproj +++ b/xcode/api/api.xcodeproj/project.pbxproj @@ -105,7 +105,7 @@ 6753470F1A40577A00A0A8C3 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0640; + LastUpgradeCheck = 0700; ORGANIZATIONNAME = maps.me; TargetAttributes = { 675347161A40577A00A0A8C3 = { @@ -162,6 +162,7 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; COPY_PHASE_STRIP = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_DYNAMIC_NO_PIC = NO; GCC_OPTIMIZATION_LEVEL = 0; @@ -181,6 +182,7 @@ MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = macosx; + SUPPORTED_PLATFORMS = "macosx iphonesimulator iphoneos"; }; name = Debug; }; @@ -217,6 +219,7 @@ MACOSX_DEPLOYMENT_TARGET = 10.10; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = macosx; + SUPPORTED_PLATFORMS = "macosx iphonesimulator iphoneos"; }; name = Release; }; diff --git a/xcode/base/base.xcodeproj/project.pbxproj b/xcode/base/base.xcodeproj/project.pbxproj index 3dd0ab1315..b30ef70463 100644 --- a/xcode/base/base.xcodeproj/project.pbxproj +++ b/xcode/base/base.xcodeproj/project.pbxproj @@ -449,6 +449,7 @@ MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = macosx; + SUPPORTED_PLATFORMS = "macosx iphonesimulator iphoneos"; }; name = Debug; }; @@ -485,6 +486,7 @@ MACOSX_DEPLOYMENT_TARGET = 10.10; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = macosx; + SUPPORTED_PLATFORMS = "macosx iphonesimulator iphoneos"; }; name = Release; }; diff --git a/xcode/coding/coding.xcodeproj/project.pbxproj b/xcode/coding/coding.xcodeproj/project.pbxproj index 58cf1321df..d500d63321 100644 --- a/xcode/coding/coding.xcodeproj/project.pbxproj +++ b/xcode/coding/coding.xcodeproj/project.pbxproj @@ -780,6 +780,7 @@ MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = macosx; + SUPPORTED_PLATFORMS = "macosx iphonesimulator iphoneos"; }; name = Debug; }; @@ -820,6 +821,7 @@ MACOSX_DEPLOYMENT_TARGET = 10.10; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = macosx; + SUPPORTED_PLATFORMS = "macosx iphonesimulator iphoneos"; }; name = Release; }; @@ -859,6 +861,7 @@ 394916951BAC3A5F002A8C4F /* Release */, ); defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; }; 675342161A3F586300A0A8C3 /* Build configuration list for PBXProject "coding" */ = { isa = XCConfigurationList; diff --git a/xcode/defaults.xcconfig b/xcode/defaults.xcconfig index 9d41266c57..05ebb1b104 100644 --- a/xcode/defaults.xcconfig +++ b/xcode/defaults.xcconfig @@ -5,3 +5,5 @@ QT_PATH=/usr/local/opt/qt5 BOOST_ROOT=$(OMIM_ROOT)/3party/boost HEADER_SEARCH_PATHS=$(OMIM_ROOT) $(BOOST_ROOT) + +IPHONEOS_DEPLOYMENT_TARGET=7.0 diff --git a/xcode/expat/expat.xcodeproj/project.pbxproj b/xcode/expat/expat.xcodeproj/project.pbxproj index b563c5364f..31a106f6be 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 = 0640; + LastUpgradeCheck = 0700; ORGANIZATIONNAME = maps.me; TargetAttributes = { 670D04F71B0BAEE50013A7AC = { @@ -163,6 +163,7 @@ COPY_PHASE_STRIP = NO; DEBUG_INFORMATION_FORMAT = dwarf; ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_DYNAMIC_NO_PIC = NO; GCC_NO_COMMON_BLOCKS = YES; @@ -185,6 +186,7 @@ MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = macosx; + SUPPORTED_PLATFORMS = "macosx iphonesimulator iphoneos"; }; name = Debug; }; @@ -224,6 +226,7 @@ MACOSX_DEPLOYMENT_TARGET = 10.10; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = macosx; + SUPPORTED_PLATFORMS = "macosx iphonesimulator iphoneos"; }; name = Release; }; diff --git a/xcode/freetype/freetype.xcodeproj/project.pbxproj b/xcode/freetype/freetype.xcodeproj/project.pbxproj index b2d7e325d3..f2891f6325 100644 --- a/xcode/freetype/freetype.xcodeproj/project.pbxproj +++ b/xcode/freetype/freetype.xcodeproj/project.pbxproj @@ -72,7 +72,6 @@ 67534A5C1A408E8000A0A8C3 /* ftgxval.c in Sources */ = {isa = PBXBuildFile; fileRef = 675348911A408E8000A0A8C3 /* ftgxval.c */; }; 67534A5D1A408E8000A0A8C3 /* ftinit.c in Sources */ = {isa = PBXBuildFile; fileRef = 675348921A408E8000A0A8C3 /* ftinit.c */; }; 67534A5E1A408E8000A0A8C3 /* ftlcdfil.c in Sources */ = {isa = PBXBuildFile; fileRef = 675348931A408E8000A0A8C3 /* ftlcdfil.c */; }; - 67534A5F1A408E8000A0A8C3 /* ftmac.c in Sources */ = {isa = PBXBuildFile; fileRef = 675348941A408E8000A0A8C3 /* ftmac.c */; }; 67534A601A408E8000A0A8C3 /* ftmm.c in Sources */ = {isa = PBXBuildFile; fileRef = 675348951A408E8000A0A8C3 /* ftmm.c */; }; 67534A611A408E8000A0A8C3 /* ftobjs.c in Sources */ = {isa = PBXBuildFile; fileRef = 675348961A408E8000A0A8C3 /* ftobjs.c */; }; 67534A621A408E8000A0A8C3 /* ftotval.c in Sources */ = {isa = PBXBuildFile; fileRef = 675348971A408E8000A0A8C3 /* ftotval.c */; }; @@ -434,7 +433,6 @@ 675348911A408E8000A0A8C3 /* ftgxval.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ftgxval.c; sourceTree = "<group>"; }; 675348921A408E8000A0A8C3 /* ftinit.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ftinit.c; sourceTree = "<group>"; }; 675348931A408E8000A0A8C3 /* ftlcdfil.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ftlcdfil.c; sourceTree = "<group>"; }; - 675348941A408E8000A0A8C3 /* ftmac.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ftmac.c; sourceTree = "<group>"; }; 675348951A408E8000A0A8C3 /* ftmm.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ftmm.c; sourceTree = "<group>"; }; 675348961A408E8000A0A8C3 /* ftobjs.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ftobjs.c; sourceTree = "<group>"; }; 675348971A408E8000A0A8C3 /* ftotval.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ftotval.c; sourceTree = "<group>"; }; @@ -944,7 +942,6 @@ 675348911A408E8000A0A8C3 /* ftgxval.c */, 675348921A408E8000A0A8C3 /* ftinit.c */, 675348931A408E8000A0A8C3 /* ftlcdfil.c */, - 675348941A408E8000A0A8C3 /* ftmac.c */, 675348951A408E8000A0A8C3 /* ftmm.c */, 675348961A408E8000A0A8C3 /* ftobjs.c */, 675348971A408E8000A0A8C3 /* ftotval.c */, @@ -1769,7 +1766,6 @@ 67534AE11A408E8000A0A8C3 /* gxvmorx4.c in Sources */, 67534A951A408E8000A0A8C3 /* cf2error.c in Sources */, 67534A691A408E8000A0A8C3 /* ftstream.c in Sources */, - 67534A5F1A408E8000A0A8C3 /* ftmac.c in Sources */, 67534AE41A408E8000A0A8C3 /* gxvprop.c in Sources */, 67534A511A408E8000A0A8C3 /* ftbbox.c in Sources */, 67534A751A408E8000A0A8C3 /* bdf.c in Sources */, @@ -1970,6 +1966,7 @@ ONLY_ACTIVE_ARCH = YES; OTHER_CFLAGS = ""; SDKROOT = macosx; + SUPPORTED_PLATFORMS = "macosx iphonesimulator iphoneos"; WARNING_CFLAGS = ( "-Wno-implicit-function-declaration", "-Wno-absolute-value", @@ -2015,6 +2012,7 @@ MTL_ENABLE_DEBUG_INFO = NO; OTHER_CFLAGS = ""; SDKROOT = macosx; + SUPPORTED_PLATFORMS = "macosx iphonesimulator iphoneos"; WARNING_CFLAGS = ( "-Wno-implicit-function-declaration", "-Wno-absolute-value", diff --git a/xcode/fribidi/fribidi.xcodeproj/project.pbxproj b/xcode/fribidi/fribidi.xcodeproj/project.pbxproj index 91e5f0ed45..e0dbee26c9 100644 --- a/xcode/fribidi/fribidi.xcodeproj/project.pbxproj +++ b/xcode/fribidi/fribidi.xcodeproj/project.pbxproj @@ -310,6 +310,7 @@ MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = macosx; + SUPPORTED_PLATFORMS = "macosx iphonesimulator iphoneos"; WARNING_CFLAGS = "-w"; }; name = Debug; @@ -350,6 +351,7 @@ MACOSX_DEPLOYMENT_TARGET = 10.10; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = macosx; + SUPPORTED_PLATFORMS = "macosx iphonesimulator iphoneos"; WARNING_CFLAGS = "-w"; }; name = Release; diff --git a/xcode/geometry/geometry.xcodeproj/project.pbxproj b/xcode/geometry/geometry.xcodeproj/project.pbxproj index e518de1d24..290cc0c0a1 100644 --- a/xcode/geometry/geometry.xcodeproj/project.pbxproj +++ b/xcode/geometry/geometry.xcodeproj/project.pbxproj @@ -505,6 +505,7 @@ MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = macosx; + SUPPORTED_PLATFORMS = "macosx iphonesimulator iphoneos"; }; name = Debug; }; @@ -542,6 +543,7 @@ MACOSX_DEPLOYMENT_TARGET = 10.10; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = macosx; + SUPPORTED_PLATFORMS = "macosx iphonesimulator iphoneos"; }; name = Release; }; diff --git a/xcode/graphics/graphics.xcodeproj/project.pbxproj b/xcode/graphics/graphics.xcodeproj/project.pbxproj index 3c7ed0d9c2..6a09ddb0ef 100644 --- a/xcode/graphics/graphics.xcodeproj/project.pbxproj +++ b/xcode/graphics/graphics.xcodeproj/project.pbxproj @@ -7,6 +7,7 @@ objects = { /* Begin PBXBuildFile section */ + 670E8C3A1BB30CCE00094197 /* opengl_es2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670E8C391BB30CCE00094197 /* opengl_es2.cpp */; settings = {ASSET_TAGS = (); }; }; 675347DE1A4059DD00A0A8C3 /* agg_traits.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 6753477A1A4059DD00A0A8C3 /* agg_traits.hpp */; }; 675347DF1A4059DD00A0A8C3 /* area_renderer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6753477B1A4059DD00A0A8C3 /* area_renderer.cpp */; }; 675347E01A4059DD00A0A8C3 /* area_renderer.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 6753477C1A4059DD00A0A8C3 /* area_renderer.hpp */; }; @@ -147,6 +148,7 @@ /* Begin PBXFileReference section */ 670D05A01B0DF2060013A7AC /* defaults.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = defaults.xcconfig; path = ../defaults.xcconfig; sourceTree = "<group>"; }; + 670E8C391BB30CCE00094197 /* opengl_es2.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = opengl_es2.cpp; sourceTree = "<group>"; }; 6753476C1A4059B400A0A8C3 /* libgraphics.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libgraphics.a; sourceTree = BUILT_PRODUCTS_DIR; }; 6753477A1A4059DD00A0A8C3 /* agg_traits.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = agg_traits.hpp; sourceTree = "<group>"; }; 6753477B1A4059DD00A0A8C3 /* area_renderer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = area_renderer.cpp; sourceTree = "<group>"; }; @@ -426,6 +428,7 @@ 67534BE81A40963C00A0A8C3 /* opengl */ = { isa = PBXGroup; children = ( + 670E8C391BB30CCE00094197 /* opengl_es2.cpp */, 67AB92F41B7B3F2200AB5194 /* route_vertex.cpp */, 67AB92F51B7B3F2200AB5194 /* route_vertex.hpp */, 67534BE91A40965900A0A8C3 /* base_texture.cpp */, @@ -663,6 +666,7 @@ 6753482D1A4059DD00A0A8C3 /* shape_renderer.cpp in Sources */, 675348161A4059DD00A0A8C3 /* path_renderer.cpp in Sources */, 675347FC1A4059DD00A0A8C3 /* geometry_batcher.cpp in Sources */, + 670E8C3A1BB30CCE00094197 /* opengl_es2.cpp in Sources */, 675348261A4059DD00A0A8C3 /* resource_cache.cpp in Sources */, 6753480E1A4059DD00A0A8C3 /* overlay_element.cpp in Sources */, 67534C331A40965900A0A8C3 /* renderbuffer.cpp in Sources */, @@ -696,6 +700,10 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; COPY_PHASE_STRIP = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; + EXCLUDED_SOURCE_FILE_NAMES = ""; + "EXCLUDED_SOURCE_FILE_NAMES[sdk=iphoneos*]" = opengl_ext.cpp; + "EXCLUDED_SOURCE_FILE_NAMES[sdk=iphonesimulator*]" = opengl_ext.cpp; + "EXCLUDED_SOURCE_FILE_NAMES[sdk=macosx*]" = opengl_es2.cpp; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_DYNAMIC_NO_PIC = NO; GCC_OPTIMIZATION_LEVEL = 0; @@ -715,11 +723,13 @@ "$(inherited)", "$(OMIM_ROOT)/3party/agg", "$(OMIM_ROOT)/3party/freetype/include", + "$(OMIM_ROOT)/3party/expat/lib", ); MACOSX_DEPLOYMENT_TARGET = 10.10; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = macosx; + SUPPORTED_PLATFORMS = "macosx iphonesimulator iphoneos"; }; name = Debug; }; @@ -745,6 +755,10 @@ DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; + EXCLUDED_SOURCE_FILE_NAMES = ""; + "EXCLUDED_SOURCE_FILE_NAMES[sdk=iphoneos*]" = opengl_ext.cpp; + "EXCLUDED_SOURCE_FILE_NAMES[sdk=iphonesimulator*]" = opengl_ext.cpp; + "EXCLUDED_SOURCE_FILE_NAMES[sdk=macosx*]" = opengl_es2.cpp; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; @@ -757,10 +771,12 @@ "$(inherited)", "$(OMIM_ROOT)/3party/agg", "$(OMIM_ROOT)/3party/freetype/include", + "$(OMIM_ROOT)/3party/expat/lib", ); MACOSX_DEPLOYMENT_TARGET = 10.10; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = macosx; + SUPPORTED_PLATFORMS = "macosx iphonesimulator iphoneos"; }; name = Release; }; diff --git a/xcode/gui/gui.xcodeproj/project.pbxproj b/xcode/gui/gui.xcodeproj/project.pbxproj index a9c1defdff..0df2a32bb5 100644 --- a/xcode/gui/gui.xcodeproj/project.pbxproj +++ b/xcode/gui/gui.xcodeproj/project.pbxproj @@ -217,6 +217,7 @@ MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = macosx; + SUPPORTED_PLATFORMS = "macosx iphonesimulator iphoneos"; }; name = Debug; }; @@ -253,6 +254,7 @@ MACOSX_DEPLOYMENT_TARGET = 10.10; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = macosx; + SUPPORTED_PLATFORMS = "macosx iphonesimulator iphoneos"; }; name = Release; }; diff --git a/xcode/indexer/indexer.xcodeproj/project.pbxproj b/xcode/indexer/indexer.xcodeproj/project.pbxproj index 29463c70aa..098c52a48a 100644 --- a/xcode/indexer/indexer.xcodeproj/project.pbxproj +++ b/xcode/indexer/indexer.xcodeproj/project.pbxproj @@ -321,6 +321,10 @@ 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 */, @@ -793,6 +797,7 @@ MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = macosx; + SUPPORTED_PLATFORMS = "macosx iphonesimulator iphoneos"; }; name = Debug; }; @@ -833,6 +838,7 @@ MACOSX_DEPLOYMENT_TARGET = 10.10; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = macosx; + SUPPORTED_PLATFORMS = "macosx iphonesimulator iphoneos"; }; name = Release; }; diff --git a/xcode/jansson/jansson.xcodeproj/project.pbxproj b/xcode/jansson/jansson.xcodeproj/project.pbxproj index f7996d9835..ac217fa198 100644 --- a/xcode/jansson/jansson.xcodeproj/project.pbxproj +++ b/xcode/jansson/jansson.xcodeproj/project.pbxproj @@ -248,6 +248,7 @@ MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = macosx; + SUPPORTED_PLATFORMS = "macosx iphonesimulator iphoneos"; WARNING_CFLAGS = "-w"; }; name = Debug; @@ -288,6 +289,7 @@ MACOSX_DEPLOYMENT_TARGET = 10.10; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = macosx; + SUPPORTED_PLATFORMS = "macosx iphonesimulator iphoneos"; WARNING_CFLAGS = "-w"; }; name = Release; diff --git a/xcode/map/map.xcodeproj/project.pbxproj b/xcode/map/map.xcodeproj/project.pbxproj index ca5b7354dd..8be4ba2fff 100644 --- a/xcode/map/map.xcodeproj/project.pbxproj +++ b/xcode/map/map.xcodeproj/project.pbxproj @@ -87,7 +87,6 @@ 675346771A4054E800A0A8C3 /* navigator.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675346081A4054E800A0A8C3 /* navigator.hpp */; }; 675346791A4054E800A0A8C3 /* pin_click_manager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6753460A1A4054E800A0A8C3 /* pin_click_manager.cpp */; }; 6753467A1A4054E800A0A8C3 /* pin_click_manager.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 6753460B1A4054E800A0A8C3 /* pin_click_manager.hpp */; }; - 6753467D1A4054E800A0A8C3 /* qgl_render_context.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6753460E1A4054E800A0A8C3 /* qgl_render_context.cpp */; }; 6753467E1A4054E800A0A8C3 /* qgl_render_context.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 6753460F1A4054E800A0A8C3 /* qgl_render_context.hpp */; }; 675346831A4054E800A0A8C3 /* rotate_screen_task.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 675346141A4054E800A0A8C3 /* rotate_screen_task.cpp */; }; 675346841A4054E800A0A8C3 /* rotate_screen_task.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675346151A4054E800A0A8C3 /* rotate_screen_task.hpp */; }; @@ -100,6 +99,7 @@ 6753469F1A4054E800A0A8C3 /* user_mark_dl_cache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 675346301A4054E800A0A8C3 /* user_mark_dl_cache.cpp */; }; 675346A01A4054E800A0A8C3 /* user_mark_dl_cache.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675346311A4054E800A0A8C3 /* user_mark_dl_cache.hpp */; }; 675346A21A4054E800A0A8C3 /* user_mark.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675346331A4054E800A0A8C3 /* user_mark.hpp */; }; + 67A2526C1BB42E4B0063F8A8 /* qgl_render_context.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6753460E1A4054E800A0A8C3 /* qgl_render_context.cpp */; settings = {ASSET_TAGS = (); }; }; /* End PBXBuildFile section */ /* Begin PBXCopyFilesBuildPhase section */ @@ -503,7 +503,7 @@ 675345B31A4054AD00A0A8C3 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0640; + LastUpgradeCheck = 0700; ORGANIZATIONNAME = maps.me; TargetAttributes = { 674A29DE1B26FD1C001A525C = { @@ -571,8 +571,8 @@ 6753466A1A4054E800A0A8C3 /* geourl_process.cpp in Sources */, 675346461A4054E800A0A8C3 /* benchmark_provider.cpp in Sources */, 675346661A4054E800A0A8C3 /* ge0_parser.cpp in Sources */, - 6753467D1A4054E800A0A8C3 /* qgl_render_context.cpp in Sources */, 6753463A1A4054E800A0A8C3 /* address_finder.cpp in Sources */, + 67A2526C1BB42E4B0063F8A8 /* qgl_render_context.cpp in Sources */, 675346381A4054E800A0A8C3 /* active_maps_layout.cpp in Sources */, 675346721A4054E800A0A8C3 /* move_screen_task.cpp in Sources */, 6753464A1A4054E800A0A8C3 /* bookmark.cpp in Sources */, @@ -660,6 +660,10 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; COPY_PHASE_STRIP = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; + EXCLUDED_SOURCE_FILE_NAMES = ""; + "EXCLUDED_SOURCE_FILE_NAMES[sdk=iphoneos*]" = "qgl_render_context.*"; + "EXCLUDED_SOURCE_FILE_NAMES[sdk=iphonesimulator*]" = "qgl_render_context.*"; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_DYNAMIC_NO_PIC = NO; GCC_OPTIMIZATION_LEVEL = 0; @@ -678,11 +682,13 @@ "$(inherited)", "$(QT_PATH)/include", "$(OMIM_ROOT)/3party/freetype/include", + "$(OMIM_ROOT)/3party/expat/lib", ); MACOSX_DEPLOYMENT_TARGET = 10.10; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = macosx; + SUPPORTED_PLATFORMS = "macosx iphonesimulator iphoneos"; }; name = Debug; }; @@ -708,6 +714,9 @@ DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; + EXCLUDED_SOURCE_FILE_NAMES = ""; + "EXCLUDED_SOURCE_FILE_NAMES[sdk=iphoneos*]" = "qgl_render_context.*"; + "EXCLUDED_SOURCE_FILE_NAMES[sdk=iphonesimulator*]" = "qgl_render_context.*"; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; @@ -719,10 +728,12 @@ "$(inherited)", "$(QT_PATH)/include", "$(OMIM_ROOT)/3party/freetype/include", + "$(OMIM_ROOT)/3party/expat/lib", ); MACOSX_DEPLOYMENT_TARGET = 10.10; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = macosx; + SUPPORTED_PLATFORMS = "macosx iphonesimulator iphoneos"; }; name = Release; }; diff --git a/xcode/minizip/minizip.xcodeproj/project.pbxproj b/xcode/minizip/minizip.xcodeproj/project.pbxproj index 28cca701fb..0cdbf43e1c 100644 --- a/xcode/minizip/minizip.xcodeproj/project.pbxproj +++ b/xcode/minizip/minizip.xcodeproj/project.pbxproj @@ -202,6 +202,7 @@ MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = macosx; + SUPPORTED_PLATFORMS = "macosx iphonesimulator iphoneos"; }; name = Debug; }; @@ -239,6 +240,7 @@ MACOSX_DEPLOYMENT_TARGET = 10.10; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = macosx; + SUPPORTED_PLATFORMS = "macosx iphonesimulator iphoneos"; }; name = Release; }; diff --git a/xcode/opening_hours/opening_hours.xcodeproj/project.pbxproj b/xcode/opening_hours/opening_hours.xcodeproj/project.pbxproj index f894e2543f..2da278f87b 100644 --- a/xcode/opening_hours/opening_hours.xcodeproj/project.pbxproj +++ b/xcode/opening_hours/opening_hours.xcodeproj/project.pbxproj @@ -224,6 +224,7 @@ MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = macosx; + SUPPORTED_PLATFORMS = "macosx iphonesimulator iphoneos"; }; name = Debug; }; @@ -260,6 +261,7 @@ MACOSX_DEPLOYMENT_TARGET = 10.10; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = macosx; + SUPPORTED_PLATFORMS = "macosx iphonesimulator iphoneos"; }; name = Release; }; diff --git a/xcode/osrm/osrm.xcodeproj/project.pbxproj b/xcode/osrm/osrm.xcodeproj/project.pbxproj index 7572e83575..7b4c43afba 100644 --- a/xcode/osrm/osrm.xcodeproj/project.pbxproj +++ b/xcode/osrm/osrm.xcodeproj/project.pbxproj @@ -487,6 +487,7 @@ MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = macosx; + SUPPORTED_PLATFORMS = "macosx iphonesimulator iphoneos"; }; name = Debug; }; @@ -527,6 +528,7 @@ MACOSX_DEPLOYMENT_TARGET = 10.10; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = macosx; + SUPPORTED_PLATFORMS = "macosx iphonesimulator iphoneos"; }; name = Release; }; diff --git a/xcode/platform/platform.xcodeproj/project.pbxproj b/xcode/platform/platform.xcodeproj/project.pbxproj index f01b82ce5b..da6dae110c 100644 --- a/xcode/platform/platform.xcodeproj/project.pbxproj +++ b/xcode/platform/platform.xcodeproj/project.pbxproj @@ -7,6 +7,9 @@ objects = { /* Begin PBXBuildFile section */ + 670E8C751BB318AB00094197 /* platform_ios.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 670E8C731BB318AB00094197 /* platform_ios.hpp */; settings = {ASSET_TAGS = (); }; }; + 670E8C761BB318AB00094197 /* platform_ios.mm in Sources */ = {isa = PBXBuildFile; fileRef = 670E8C741BB318AB00094197 /* platform_ios.mm */; settings = {ASSET_TAGS = (); }; }; + 670E8C911BB31A2F00094197 /* ios_video_timer.mm in Sources */ = {isa = PBXBuildFile; fileRef = 670E8C901BB31A2F00094197 /* ios_video_timer.mm */; settings = {ASSET_TAGS = (); }; }; 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 */; }; @@ -18,7 +21,6 @@ 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 */; }; 675343B41A3F5D5A00A0A8C3 /* chunks_download_strategy.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675343891A3F5D5900A0A8C3 /* chunks_download_strategy.hpp */; }; 675343B51A3F5D5A00A0A8C3 /* constants.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 6753438A1A3F5D5900A0A8C3 /* constants.hpp */; }; @@ -30,10 +32,6 @@ 675343C01A3F5D5A00A0A8C3 /* location_service.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 675343951A3F5D5A00A0A8C3 /* location_service.cpp */; }; 675343C11A3F5D5A00A0A8C3 /* location_service.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675343961A3F5D5A00A0A8C3 /* location_service.hpp */; }; 675343C21A3F5D5A00A0A8C3 /* location.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675343971A3F5D5A00A0A8C3 /* location.hpp */; }; - 675343C31A3F5D5A00A0A8C3 /* platform_android.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 675343981A3F5D5A00A0A8C3 /* platform_android.cpp */; }; - 675343C51A3F5D5A00A0A8C3 /* platform_linux.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6753439A1A3F5D5A00A0A8C3 /* platform_linux.cpp */; }; - 675343C61A3F5D5A00A0A8C3 /* platform_mac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 6753439B1A3F5D5A00A0A8C3 /* platform_mac.mm */; }; - 675343C71A3F5D5A00A0A8C3 /* platform_qt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6753439C1A3F5D5A00A0A8C3 /* platform_qt.cpp */; }; 675343C91A3F5D5A00A0A8C3 /* platform_unix_impl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6753439E1A3F5D5A00A0A8C3 /* platform_unix_impl.cpp */; }; 675343CA1A3F5D5A00A0A8C3 /* platform_unix_impl.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 6753439F1A3F5D5A00A0A8C3 /* platform_unix_impl.hpp */; }; 675343CC1A3F5D5A00A0A8C3 /* platform.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 675343A11A3F5D5A00A0A8C3 /* platform.cpp */; }; @@ -50,6 +48,8 @@ 675343D91A3F5D5A00A0A8C3 /* wifi_info_windows.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 675343AE1A3F5D5A00A0A8C3 /* wifi_info_windows.cpp */; }; 675343DA1A3F5D5A00A0A8C3 /* wifi_info.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675343AF1A3F5D5A00A0A8C3 /* wifi_info.hpp */; }; 675343DB1A3F5D5A00A0A8C3 /* wifi_location_service.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 675343B01A3F5D5A00A0A8C3 /* wifi_location_service.cpp */; }; + 67A2526A1BB40E100063F8A8 /* platform_qt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6753439C1A3F5D5A00A0A8C3 /* platform_qt.cpp */; settings = {ASSET_TAGS = (); }; }; + 67A2526B1BB40E520063F8A8 /* platform_mac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 6753439B1A3F5D5A00A0A8C3 /* platform_mac.mm */; settings = {ASSET_TAGS = (); }; }; 67AB92DC1B7B3D7300AB5194 /* mwm_version.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 67AB92DA1B7B3D7300AB5194 /* mwm_version.cpp */; }; 67AB92DD1B7B3D7300AB5194 /* mwm_version.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 67AB92DB1B7B3D7300AB5194 /* mwm_version.hpp */; }; 67AB92EA1B7B3E9100AB5194 /* get_text_by_id.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 67AB92E81B7B3E9100AB5194 /* get_text_by_id.cpp */; }; @@ -58,6 +58,9 @@ /* Begin PBXFileReference section */ 670D05A71B0E03BF0013A7AC /* defaults.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = defaults.xcconfig; path = ../defaults.xcconfig; sourceTree = "<group>"; }; + 670E8C731BB318AB00094197 /* platform_ios.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = platform_ios.hpp; sourceTree = "<group>"; }; + 670E8C741BB318AB00094197 /* platform_ios.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = platform_ios.mm; sourceTree = "<group>"; }; + 670E8C901BB31A2F00094197 /* ios_video_timer.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ios_video_timer.mm; sourceTree = "<group>"; }; 671C62041AE9014C00076BD0 /* measurement_utils.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = measurement_utils.cpp; sourceTree = "<group>"; }; 671C62051AE9014C00076BD0 /* measurement_utils.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = measurement_utils.hpp; sourceTree = "<group>"; }; 674125001B4C00CC00A3E828 /* country_defines.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = country_defines.cpp; sourceTree = "<group>"; }; @@ -139,6 +142,7 @@ 6753437A1A3F5CF500A0A8C3 /* platform */ = { isa = PBXGroup; children = ( + 670E8C901BB31A2F00094197 /* ios_video_timer.mm */, 67AB92E81B7B3E9100AB5194 /* get_text_by_id.cpp */, 67AB92E91B7B3E9100AB5194 /* get_text_by_id.hpp */, 67AB92DA1B7B3D7300AB5194 /* mwm_version.cpp */, @@ -168,6 +172,8 @@ 675343971A3F5D5A00A0A8C3 /* location.hpp */, 675343981A3F5D5A00A0A8C3 /* platform_android.cpp */, 6753439A1A3F5D5A00A0A8C3 /* platform_linux.cpp */, + 670E8C731BB318AB00094197 /* platform_ios.hpp */, + 670E8C741BB318AB00094197 /* platform_ios.mm */, 6753439B1A3F5D5A00A0A8C3 /* platform_mac.mm */, 6753439C1A3F5D5A00A0A8C3 /* platform_qt.cpp */, 6753439E1A3F5D5A00A0A8C3 /* platform_unix_impl.cpp */, @@ -219,6 +225,7 @@ 6741250D1B4C00CC00A3E828 /* local_country_file_utils.hpp in Headers */, 675343DA1A3F5D5A00A0A8C3 /* wifi_info.hpp in Headers */, 671C62071AE9014C00076BD0 /* measurement_utils.hpp in Headers */, + 670E8C751BB318AB00094197 /* platform_ios.hpp in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -281,28 +288,27 @@ 675343D11A3F5D5A00A0A8C3 /* servers_list.cpp in Sources */, 675343C91A3F5D5A00A0A8C3 /* platform_unix_impl.cpp in Sources */, 67AB92DC1B7B3D7300AB5194 /* mwm_version.cpp in Sources */, + 67A2526B1BB40E520063F8A8 /* platform_mac.mm in Sources */, 6741250A1B4C00CC00A3E828 /* country_file.cpp in Sources */, 674125081B4C00CC00A3E828 /* country_defines.cpp in Sources */, 6741250E1B4C00CC00A3E828 /* local_country_file.cpp in Sources */, + 670E8C761BB318AB00094197 /* platform_ios.mm in Sources */, + 67A2526A1BB40E100063F8A8 /* platform_qt.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 */, 67AB92EA1B7B3E9100AB5194 /* get_text_by_id.cpp in Sources */, 671C62061AE9014C00076BD0 /* measurement_utils.cpp in Sources */, 675343B61A3F5D5A00A0A8C3 /* http_request.cpp in Sources */, 675343CC1A3F5D5A00A0A8C3 /* platform.cpp in Sources */, - 675343C61A3F5D5A00A0A8C3 /* platform_mac.mm in Sources */, 675343DB1A3F5D5A00A0A8C3 /* wifi_location_service.cpp in Sources */, - 675343C31A3F5D5A00A0A8C3 /* platform_android.cpp in Sources */, 675343D01A3F5D5A00A0A8C3 /* pthread_video_timer.cpp in Sources */, 675343B11A3F5D5A00A0A8C3 /* apple_location_service.mm in Sources */, 675343B31A3F5D5A00A0A8C3 /* chunks_download_strategy.cpp in Sources */, - 675343C51A3F5D5A00A0A8C3 /* platform_linux.cpp in Sources */, + 670E8C911BB31A2F00094197 /* ios_video_timer.mm in Sources */, 675343D71A3F5D5A00A0A8C3 /* video_timer.cpp in Sources */, 675343C01A3F5D5A00A0A8C3 /* location_service.cpp in Sources */, 675343D31A3F5D5A00A0A8C3 /* settings.cpp in Sources */, 675343CE1A3F5D5A00A0A8C3 /* preferred_languages.cpp in Sources */, - 675343C71A3F5D5A00A0A8C3 /* platform_qt.cpp in Sources */, 675343B91A3F5D5A00A0A8C3 /* http_thread_apple.mm in Sources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -330,6 +336,13 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; COPY_PHASE_STRIP = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; + EXCLUDED_SOURCE_FILE_NAMES = ""; + "EXCLUDED_SOURCE_FILE_NAMES[sdk=iphoneos*]" = platform_mac.mm; + "EXCLUDED_SOURCE_FILE_NAMES[sdk=iphonesimulator*]" = platform_mac.mm; + "EXCLUDED_SOURCE_FILE_NAMES[sdk=macosx*]" = ( + "ios_*", + platform_ios.mm, + ); GCC_C_LANGUAGE_STANDARD = gnu99; GCC_DYNAMIC_NO_PIC = NO; GCC_OPTIMIZATION_LEVEL = 0; @@ -353,6 +366,7 @@ MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = macosx; + SUPPORTED_PLATFORMS = "macosx iphonesimulator iphoneos"; }; name = Debug; }; @@ -378,6 +392,13 @@ DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; + EXCLUDED_SOURCE_FILE_NAMES = ""; + "EXCLUDED_SOURCE_FILE_NAMES[sdk=iphoneos*]" = platform_mac.mm; + "EXCLUDED_SOURCE_FILE_NAMES[sdk=iphonesimulator*]" = platform_mac.mm; + "EXCLUDED_SOURCE_FILE_NAMES[sdk=macosx*]" = ( + "ios_*", + platform_ios.mm, + ); GCC_C_LANGUAGE_STANDARD = gnu99; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; @@ -393,6 +414,7 @@ MACOSX_DEPLOYMENT_TARGET = 10.10; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = macosx; + SUPPORTED_PLATFORMS = "macosx iphonesimulator iphoneos"; }; name = Release; }; diff --git a/xcode/protobuf/protobuf.xcodeproj/project.pbxproj b/xcode/protobuf/protobuf.xcodeproj/project.pbxproj index ae62c038b0..881176e5de 100644 --- a/xcode/protobuf/protobuf.xcodeproj/project.pbxproj +++ b/xcode/protobuf/protobuf.xcodeproj/project.pbxproj @@ -208,6 +208,7 @@ MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = macosx; + SUPPORTED_PLATFORMS = "macosx iphonesimulator iphoneos"; }; name = Debug; }; @@ -250,6 +251,7 @@ MACOSX_DEPLOYMENT_TARGET = 10.10; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = macosx; + SUPPORTED_PLATFORMS = "macosx iphonesimulator iphoneos"; }; name = Release; }; diff --git a/xcode/render/render.xcodeproj/project.pbxproj b/xcode/render/render.xcodeproj/project.pbxproj index ed583f3c1f..7891e8d3fc 100644 --- a/xcode/render/render.xcodeproj/project.pbxproj +++ b/xcode/render/render.xcodeproj/project.pbxproj @@ -416,11 +416,13 @@ "$(BOOST_ROOT)", "$(OMIM_ROOT)/3party/freetype/include", "$(OMIM_ROOT)/3party/protobuf/src", + "$(OMIM_ROOT)/3party/expat/lib", ); MACOSX_DEPLOYMENT_TARGET = 10.10; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = macosx; + SUPPORTED_PLATFORMS = "macosx iphonesimulator iphoneos"; }; name = Debug; }; @@ -460,10 +462,12 @@ "$(BOOST_ROOT)", "$(OMIM_ROOT)/3party/freetype/include", "$(OMIM_ROOT)/3party/protobuf/src", + "$(OMIM_ROOT)/3party/expat/lib", ); MACOSX_DEPLOYMENT_TARGET = 10.10; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = macosx; + SUPPORTED_PLATFORMS = "macosx iphonesimulator iphoneos"; }; name = Release; }; diff --git a/xcode/routing/routing.xcodeproj/project.pbxproj b/xcode/routing/routing.xcodeproj/project.pbxproj index e0106af664..c604234f33 100644 --- a/xcode/routing/routing.xcodeproj/project.pbxproj +++ b/xcode/routing/routing.xcodeproj/project.pbxproj @@ -426,6 +426,7 @@ MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = macosx; + SUPPORTED_PLATFORMS = "macosx iphonesimulator iphoneos"; }; name = Debug; }; @@ -467,6 +468,7 @@ MACOSX_DEPLOYMENT_TARGET = 10.10; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = macosx; + SUPPORTED_PLATFORMS = "macosx iphonesimulator iphoneos"; }; name = Release; }; diff --git a/xcode/search/search.xcodeproj/project.pbxproj b/xcode/search/search.xcodeproj/project.pbxproj index 322d234d56..5a4e34f319 100644 --- a/xcode/search/search.xcodeproj/project.pbxproj +++ b/xcode/search/search.xcodeproj/project.pbxproj @@ -494,6 +494,7 @@ MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = macosx; + SUPPORTED_PLATFORMS = "macosx iphonesimulator iphoneos"; }; name = Debug; }; @@ -530,6 +531,7 @@ MACOSX_DEPLOYMENT_TARGET = 10.10; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = macosx; + SUPPORTED_PLATFORMS = "macosx iphonesimulator iphoneos"; }; name = Release; }; diff --git a/xcode/storage/storage.xcodeproj/project.pbxproj b/xcode/storage/storage.xcodeproj/project.pbxproj index adaa420b56..2dcc6ede41 100644 --- a/xcode/storage/storage.xcodeproj/project.pbxproj +++ b/xcode/storage/storage.xcodeproj/project.pbxproj @@ -291,7 +291,9 @@ GCC_ENABLE_CPP_RTTI = YES; GCC_SYMBOLS_PRIVATE_EXTERN = NO; HEADER_SEARCH_PATHS = "$(inherited)"; + ONLY_ACTIVE_ARCH = NO; PRODUCT_NAME = "$(TARGET_NAME)"; + SUPPORTED_PLATFORMS = "macosx iphonesimulator iphoneos"; }; name = Debug; }; @@ -306,6 +308,7 @@ GCC_SYMBOLS_PRIVATE_EXTERN = NO; HEADER_SEARCH_PATHS = "$(inherited)"; PRODUCT_NAME = "$(TARGET_NAME)"; + SUPPORTED_PLATFORMS = "macosx iphonesimulator iphoneos"; }; name = Release; }; diff --git a/xcode/succinct/succinct.xcodeproj/project.pbxproj b/xcode/succinct/succinct.xcodeproj/project.pbxproj index 8d2718b122..cf11a72b90 100644 --- a/xcode/succinct/succinct.xcodeproj/project.pbxproj +++ b/xcode/succinct/succinct.xcodeproj/project.pbxproj @@ -257,6 +257,7 @@ MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = macosx; + SUPPORTED_PLATFORMS = "macosx iphonesimulator iphoneos"; }; name = Debug; }; @@ -293,6 +294,7 @@ MACOSX_DEPLOYMENT_TARGET = 10.10; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = macosx; + SUPPORTED_PLATFORMS = "macosx iphonesimulator iphoneos"; }; name = Release; }; diff --git a/xcode/tess2/tess2.xcodeproj/project.pbxproj b/xcode/tess2/tess2.xcodeproj/project.pbxproj index 55deab98bf..7ec33af49b 100644 --- a/xcode/tess2/tess2.xcodeproj/project.pbxproj +++ b/xcode/tess2/tess2.xcodeproj/project.pbxproj @@ -223,6 +223,7 @@ MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = macosx; + SUPPORTED_PLATFORMS = "macosx iphonesimulator"; }; name = Debug; }; @@ -264,6 +265,7 @@ MACOSX_DEPLOYMENT_TARGET = 10.10; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = macosx; + SUPPORTED_PLATFORMS = "macosx iphonesimulator"; }; name = Release; }; @@ -272,6 +274,7 @@ buildSettings = { EXECUTABLE_PREFIX = lib; PRODUCT_NAME = "$(TARGET_NAME)"; + SUPPORTED_PLATFORMS = "macosx iphonesimulator iphoneos"; }; name = Debug; }; @@ -280,6 +283,7 @@ buildSettings = { EXECUTABLE_PREFIX = lib; PRODUCT_NAME = "$(TARGET_NAME)"; + SUPPORTED_PLATFORMS = "macosx iphonesimulator iphoneos"; }; name = Release; }; diff --git a/xcode/tomcrypt/tomcrypt.xcodeproj/project.pbxproj b/xcode/tomcrypt/tomcrypt.xcodeproj/project.pbxproj index 36da524414..b56e9d6b08 100644 --- a/xcode/tomcrypt/tomcrypt.xcodeproj/project.pbxproj +++ b/xcode/tomcrypt/tomcrypt.xcodeproj/project.pbxproj @@ -180,6 +180,7 @@ MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = macosx; + SUPPORTED_PLATFORMS = "macosx iphonesimulator iphoneos"; }; name = Debug; }; @@ -219,6 +220,7 @@ MACOSX_DEPLOYMENT_TARGET = 10.10; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = macosx; + SUPPORTED_PLATFORMS = "macosx iphonesimulator iphoneos"; }; name = Release; }; |