From 746039fd95d19273536ef789a012b0305063b30e Mon Sep 17 00:00:00 2001 From: Sergey Yershov Date: Fri, 21 Aug 2015 16:08:38 +0300 Subject: [PATCH] Fix Xcode build --- xcode/MapsMe/MapsMe.xcodeproj/project.pbxproj | 18 +- .../minizip/minizip.xcodeproj/project.pbxproj | 284 ++++++++++++++++++ .../omim.xcworkspace/contents.xcworkspacedata | 6 +- xcode/zlib/zlib.xcodeproj/project.pbxproj | 267 ---------------- 4 files changed, 299 insertions(+), 276 deletions(-) create mode 100644 xcode/minizip/minizip.xcodeproj/project.pbxproj delete mode 100644 xcode/zlib/zlib.xcodeproj/project.pbxproj diff --git a/xcode/MapsMe/MapsMe.xcodeproj/project.pbxproj b/xcode/MapsMe/MapsMe.xcodeproj/project.pbxproj index f13d240b3d..bbbada0342 100644 --- a/xcode/MapsMe/MapsMe.xcodeproj/project.pbxproj +++ b/xcode/MapsMe/MapsMe.xcodeproj/project.pbxproj @@ -17,6 +17,8 @@ 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 */; }; + 671F59021B8755FE0032311E /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 671F59011B8755FE0032311E /* libz.dylib */; }; + 671F59301B8759460032311E /* libminizip.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 671F592F1B8759460032311E /* libminizip.a */; }; 6729A5C11A693014007D5872 /* categories.txt in CopyFiles */ = {isa = PBXBuildFile; fileRef = 6729A5B91A693013007D5872 /* categories.txt */; }; 6729A5C21A693014007D5872 /* classificator.txt in CopyFiles */ = {isa = PBXBuildFile; fileRef = 6729A5BA1A693013007D5872 /* classificator.txt */; }; 6729A5C31A693014007D5872 /* countries.txt in CopyFiles */ = {isa = PBXBuildFile; fileRef = 6729A5BB1A693013007D5872 /* countries.txt */; }; @@ -33,7 +35,6 @@ 6729A5D71A69319F007D5872 /* fonts_whitelist.txt in CopyFiles */ = {isa = PBXBuildFile; fileRef = 6729A5D51A69319F007D5872 /* fonts_whitelist.txt */; }; 6729A5DF1A6931CE007D5872 /* 00_roboto_regular.ttf in CopyFiles */ = {isa = PBXBuildFile; fileRef = 6729A5D81A6931CD007D5872 /* 00_roboto_regular.ttf */; }; 6729A5E01A6931CE007D5872 /* 01_dejavusans.ttf in CopyFiles */ = {isa = PBXBuildFile; fileRef = 6729A5D91A6931CD007D5872 /* 01_dejavusans.ttf */; }; - 9D4AD1DD1B7388CD00EBDD27 /* 02_droidsans-fallback.ttf in CopyFiles */ = {isa = PBXBuildFile; fileRef = 9DF792621B73884F00AF2D19 /* 02_droidsans-fallback.ttf */; }; 6729A5E21A6931CE007D5872 /* 03_jomolhari-id-a3d.ttf in CopyFiles */ = {isa = PBXBuildFile; fileRef = 6729A5DB1A6931CD007D5872 /* 03_jomolhari-id-a3d.ttf */; }; 6729A5E31A6931CE007D5872 /* 04_padauk.ttf in CopyFiles */ = {isa = PBXBuildFile; fileRef = 6729A5DC1A6931CE007D5872 /* 04_padauk.ttf */; }; 6729A5E41A6931CE007D5872 /* 05_khmeros.ttf in CopyFiles */ = {isa = PBXBuildFile; fileRef = 6729A5DD1A6931CE007D5872 /* 05_khmeros.ttf */; }; @@ -73,7 +74,6 @@ 674A29C21B26F0AE001A525C /* libstorage.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 674A29A71B26F0AE001A525C /* libstorage.a */; }; 674A29C31B26F0AE001A525C /* libsuccinct.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 674A29A81B26F0AE001A525C /* libsuccinct.a */; }; 674A29C41B26F0AE001A525C /* libtomcrypt.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 674A29A91B26F0AE001A525C /* libtomcrypt.a */; }; - 674A29C51B26F0AE001A525C /* libzlib.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 674A29AA1B26F0AE001A525C /* libzlib.a */; }; 675345861A404CB200A0A8C3 /* about.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6753456C1A404CB200A0A8C3 /* about.cpp */; }; 675345881A404CB200A0A8C3 /* draw_widget.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 675345701A404CB200A0A8C3 /* draw_widget.cpp */; }; 675345891A404CB200A0A8C3 /* info_dialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 675345721A404CB200A0A8C3 /* info_dialog.cpp */; }; @@ -91,6 +91,7 @@ 675345A81A40535E00A0A8C3 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 675345A71A40535E00A0A8C3 /* Cocoa.framework */; }; 67534C421A4097D000A0A8C3 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 67534C411A4097D000A0A8C3 /* OpenGL.framework */; }; 67534D271A40AA4300A0A8C3 /* CoreLocation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 67534D261A40AA4300A0A8C3 /* CoreLocation.framework */; }; + 9D4AD1DD1B7388CD00EBDD27 /* 02_droidsans-fallback.ttf in CopyFiles */ = {isa = PBXBuildFile; fileRef = 9DF792621B73884F00AF2D19 /* 02_droidsans-fallback.ttf */; }; /* End PBXBuildFile section */ /* Begin PBXBuildRule section */ @@ -159,6 +160,8 @@ /* Begin PBXFileReference section */ 670D05BC1B0E10640013A7AC /* defaults.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = defaults.xcconfig; path = ../defaults.xcconfig; sourceTree = ""; }; + 671F59011B8755FE0032311E /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; }; + 671F592F1B8759460032311E /* libminizip.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libminizip.a; path = "/Volumes/AltHD/omim/xcode/minizip/../../../omim-xcode-build/Debug/libminizip.a"; sourceTree = ""; }; 6729A5B91A693013007D5872 /* categories.txt */ = {isa = PBXFileReference; lastKnownFileType = text; path = categories.txt; sourceTree = ""; }; 6729A5BA1A693013007D5872 /* classificator.txt */ = {isa = PBXFileReference; lastKnownFileType = text; path = classificator.txt; sourceTree = ""; }; 6729A5BB1A693013007D5872 /* countries.txt */ = {isa = PBXFileReference; lastKnownFileType = text; path = countries.txt; sourceTree = ""; }; @@ -175,7 +178,6 @@ 6729A5D51A69319F007D5872 /* fonts_whitelist.txt */ = {isa = PBXFileReference; lastKnownFileType = text; path = fonts_whitelist.txt; sourceTree = ""; }; 6729A5D81A6931CD007D5872 /* 00_roboto_regular.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = 00_roboto_regular.ttf; sourceTree = ""; }; 6729A5D91A6931CD007D5872 /* 01_dejavusans.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = 01_dejavusans.ttf; sourceTree = ""; }; - 9DF792621B73884F00AF2D19 /* 02_droidsans-fallback.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "02_droidsans-fallback.ttf"; sourceTree = ""; }; 6729A5DB1A6931CD007D5872 /* 03_jomolhari-id-a3d.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "03_jomolhari-id-a3d.ttf"; sourceTree = ""; }; 6729A5DC1A6931CE007D5872 /* 04_padauk.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = 04_padauk.ttf; sourceTree = ""; }; 6729A5DD1A6931CE007D5872 /* 05_khmeros.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = 05_khmeros.ttf; sourceTree = ""; }; @@ -246,6 +248,7 @@ 675345A71A40535E00A0A8C3 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; }; 67534C411A4097D000A0A8C3 /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = System/Library/Frameworks/OpenGL.framework; sourceTree = SDKROOT; }; 67534D261A40AA4300A0A8C3 /* CoreLocation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreLocation.framework; path = System/Library/Frameworks/CoreLocation.framework; sourceTree = SDKROOT; }; + 9DF792621B73884F00AF2D19 /* 02_droidsans-fallback.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "02_droidsans-fallback.ttf"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -253,6 +256,8 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 671F59301B8759460032311E /* libminizip.a in Frameworks */, + 671F59021B8755FE0032311E /* libz.dylib in Frameworks */, 674A29AB1B26F0AE001A525C /* libalohalitics.a in Frameworks */, 674A29AC1B26F0AE001A525C /* libanim.a in Frameworks */, 674A29AD1B26F0AE001A525C /* libapi.a in Frameworks */, @@ -279,7 +284,6 @@ 674A29C21B26F0AE001A525C /* libstorage.a in Frameworks */, 674A29C31B26F0AE001A525C /* libsuccinct.a in Frameworks */, 674A29C41B26F0AE001A525C /* libtomcrypt.a in Frameworks */, - 674A29C51B26F0AE001A525C /* libzlib.a in Frameworks */, 674A298F1B26EB5D001A525C /* librender.a in Frameworks */, 67534D271A40AA4300A0A8C3 /* CoreLocation.framework in Frameworks */, 67534C421A4097D000A0A8C3 /* OpenGL.framework in Frameworks */, @@ -378,6 +382,8 @@ 675345401A404C6100A0A8C3 = { isa = PBXGroup; children = ( + 671F592F1B8759460032311E /* libminizip.a */, + 671F59011B8755FE0032311E /* libz.dylib */, 670D05BC1B0E10640013A7AC /* defaults.xcconfig */, 6729A5C91A693045007D5872 /* Resources */, 6729A4591A684401007D5872 /* Libs */, @@ -667,7 +673,7 @@ HEADER_SEARCH_PATHS = "$(inherited)"; INFOPLIST_FILE = MapsMe/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks"; - LIBRARY_SEARCH_PATHS = ""; + LIBRARY_SEARCH_PATHS = "/Volumes/AltHD/omim/xcode/minizip/../../../omim-xcode-build/Debug"; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; @@ -686,7 +692,7 @@ HEADER_SEARCH_PATHS = "$(inherited)"; INFOPLIST_FILE = MapsMe/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks"; - LIBRARY_SEARCH_PATHS = ""; + LIBRARY_SEARCH_PATHS = "/Volumes/AltHD/omim/xcode/minizip/../../../omim-xcode-build/Debug"; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; diff --git a/xcode/minizip/minizip.xcodeproj/project.pbxproj b/xcode/minizip/minizip.xcodeproj/project.pbxproj new file mode 100644 index 0000000000..5f9a30346e --- /dev/null +++ b/xcode/minizip/minizip.xcodeproj/project.pbxproj @@ -0,0 +1,284 @@ +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 46; + objects = { + +/* Begin PBXBuildFile section */ + 671F59221B8759350032311E /* crypt.h in Headers */ = {isa = PBXBuildFile; fileRef = 671F59151B8759350032311E /* crypt.h */; }; + 671F59231B8759350032311E /* ioapi.c in Sources */ = {isa = PBXBuildFile; fileRef = 671F59161B8759350032311E /* ioapi.c */; }; + 671F59241B8759350032311E /* ioapi.h in Headers */ = {isa = PBXBuildFile; fileRef = 671F59171B8759350032311E /* ioapi.h */; }; + 671F59281B8759350032311E /* minizip.c in Sources */ = {isa = PBXBuildFile; fileRef = 671F591B1B8759350032311E /* minizip.c */; }; + 671F59291B8759350032311E /* mztools.c in Sources */ = {isa = PBXBuildFile; fileRef = 671F591C1B8759350032311E /* mztools.c */; }; + 671F592A1B8759350032311E /* mztools.h in Headers */ = {isa = PBXBuildFile; fileRef = 671F591D1B8759350032311E /* mztools.h */; }; + 671F592B1B8759350032311E /* unzip.c in Sources */ = {isa = PBXBuildFile; fileRef = 671F591E1B8759350032311E /* unzip.c */; }; + 671F592C1B8759350032311E /* unzip.h in Headers */ = {isa = PBXBuildFile; fileRef = 671F591F1B8759350032311E /* unzip.h */; }; + 671F592D1B8759350032311E /* zip.c in Sources */ = {isa = PBXBuildFile; fileRef = 671F59201B8759350032311E /* zip.c */; }; + 671F592E1B8759350032311E /* zip.h in Headers */ = {isa = PBXBuildFile; fileRef = 671F59211B8759350032311E /* zip.h */; }; +/* End PBXBuildFile section */ + +/* Begin PBXFileReference section */ + 671F590C1B87568D0032311E /* libminizip.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libminizip.a; sourceTree = BUILT_PRODUCTS_DIR; }; + 671F59141B8756AC0032311E /* defaults.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = defaults.xcconfig; path = ../defaults.xcconfig; sourceTree = ""; }; + 671F59151B8759350032311E /* crypt.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypt.h; sourceTree = ""; }; + 671F59161B8759350032311E /* ioapi.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ioapi.c; sourceTree = ""; }; + 671F59171B8759350032311E /* ioapi.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ioapi.h; sourceTree = ""; }; + 671F591B1B8759350032311E /* minizip.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = minizip.c; sourceTree = ""; }; + 671F591C1B8759350032311E /* mztools.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mztools.c; sourceTree = ""; }; + 671F591D1B8759350032311E /* mztools.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mztools.h; sourceTree = ""; }; + 671F591E1B8759350032311E /* unzip.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = unzip.c; sourceTree = ""; }; + 671F591F1B8759350032311E /* unzip.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = unzip.h; sourceTree = ""; }; + 671F59201B8759350032311E /* zip.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = zip.c; sourceTree = ""; }; + 671F59211B8759350032311E /* zip.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = zip.h; sourceTree = ""; }; +/* End PBXFileReference section */ + +/* Begin PBXFrameworksBuildPhase section */ + 671F59091B87568D0032311E /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXFrameworksBuildPhase section */ + +/* Begin PBXGroup section */ + 671F59031B87568D0032311E = { + isa = PBXGroup; + children = ( + 671F59141B8756AC0032311E /* defaults.xcconfig */, + 671F59131B8756990032311E /* minizip */, + 671F590D1B87568D0032311E /* Products */, + ); + sourceTree = ""; + }; + 671F590D1B87568D0032311E /* Products */ = { + isa = PBXGroup; + children = ( + 671F590C1B87568D0032311E /* libminizip.a */, + ); + name = Products; + sourceTree = ""; + }; + 671F59131B8756990032311E /* minizip */ = { + isa = PBXGroup; + children = ( + 671F59151B8759350032311E /* crypt.h */, + 671F59161B8759350032311E /* ioapi.c */, + 671F59171B8759350032311E /* ioapi.h */, + 671F591B1B8759350032311E /* minizip.c */, + 671F591C1B8759350032311E /* mztools.c */, + 671F591D1B8759350032311E /* mztools.h */, + 671F591E1B8759350032311E /* unzip.c */, + 671F591F1B8759350032311E /* unzip.h */, + 671F59201B8759350032311E /* zip.c */, + 671F59211B8759350032311E /* zip.h */, + ); + name = minizip; + path = ../../3party/minizip; + sourceTree = ""; + }; +/* End PBXGroup section */ + +/* Begin PBXHeadersBuildPhase section */ + 671F590A1B87568D0032311E /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + 671F592E1B8759350032311E /* zip.h in Headers */, + 671F59221B8759350032311E /* crypt.h in Headers */, + 671F592C1B8759350032311E /* unzip.h in Headers */, + 671F59241B8759350032311E /* ioapi.h in Headers */, + 671F592A1B8759350032311E /* mztools.h in Headers */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXHeadersBuildPhase section */ + +/* Begin PBXNativeTarget section */ + 671F590B1B87568D0032311E /* minizip */ = { + isa = PBXNativeTarget; + buildConfigurationList = 671F59101B87568D0032311E /* Build configuration list for PBXNativeTarget "minizip" */; + buildPhases = ( + 671F59081B87568D0032311E /* Sources */, + 671F59091B87568D0032311E /* Frameworks */, + 671F590A1B87568D0032311E /* Headers */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = minizip; + productName = minizip; + productReference = 671F590C1B87568D0032311E /* libminizip.a */; + productType = "com.apple.product-type.library.static"; + }; +/* End PBXNativeTarget section */ + +/* Begin PBXProject section */ + 671F59041B87568D0032311E /* Project object */ = { + isa = PBXProject; + attributes = { + LastUpgradeCheck = 0640; + ORGANIZATIONNAME = maps.me; + TargetAttributes = { + 671F590B1B87568D0032311E = { + CreatedOnToolsVersion = 6.4; + }; + }; + }; + buildConfigurationList = 671F59071B87568D0032311E /* Build configuration list for PBXProject "minizip" */; + compatibilityVersion = "Xcode 3.2"; + developmentRegion = English; + hasScannedForEncodings = 0; + knownRegions = ( + en, + ); + mainGroup = 671F59031B87568D0032311E; + productRefGroup = 671F590D1B87568D0032311E /* Products */; + projectDirPath = ""; + projectRoot = ""; + targets = ( + 671F590B1B87568D0032311E /* minizip */, + ); + }; +/* End PBXProject section */ + +/* Begin PBXSourcesBuildPhase section */ + 671F59081B87568D0032311E /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 671F592B1B8759350032311E /* unzip.c in Sources */, + 671F59231B8759350032311E /* ioapi.c in Sources */, + 671F59281B8759350032311E /* minizip.c in Sources */, + 671F592D1B8759350032311E /* zip.c in Sources */, + 671F59291B8759350032311E /* mztools.c in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXSourcesBuildPhase section */ + +/* Begin XCBuildConfiguration section */ + 671F590E1B87568D0032311E /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 671F59141B8756AC0032311E /* defaults.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; + DEBUG_INFORMATION_FORMAT = dwarf; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_DYNAMIC_NO_PIC = NO; + GCC_NO_COMMON_BLOCKS = YES; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREPROCESSOR_DEFINITIONS = ( + "NOCRYPT=1", + "DEBUG=1", + ); + 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; + MACOSX_DEPLOYMENT_TARGET = 10.10; + MTL_ENABLE_DEBUG_INFO = YES; + ONLY_ACTIVE_ARCH = YES; + SDKROOT = macosx; + }; + name = Debug; + }; + 671F590F1B87568D0032311E /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 671F59141B8756AC0032311E /* defaults.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; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_NO_COMMON_BLOCKS = YES; + GCC_PREPROCESSOR_DEFINITIONS = "NOCRYPT=1"; + 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; + MACOSX_DEPLOYMENT_TARGET = 10.10; + MTL_ENABLE_DEBUG_INFO = NO; + SDKROOT = macosx; + }; + name = Release; + }; + 671F59111B87568D0032311E /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + EXECUTABLE_PREFIX = lib; + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Debug; + }; + 671F59121B87568D0032311E /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + EXECUTABLE_PREFIX = lib; + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Release; + }; +/* End XCBuildConfiguration section */ + +/* Begin XCConfigurationList section */ + 671F59071B87568D0032311E /* Build configuration list for PBXProject "minizip" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 671F590E1B87568D0032311E /* Debug */, + 671F590F1B87568D0032311E /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 671F59101B87568D0032311E /* Build configuration list for PBXNativeTarget "minizip" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 671F59111B87568D0032311E /* Debug */, + 671F59121B87568D0032311E /* Release */, + ); + defaultConfigurationIsVisible = 0; + }; +/* End XCConfigurationList section */ + }; + rootObject = 671F59041B87568D0032311E /* Project object */; +} diff --git a/xcode/omim.xcworkspace/contents.xcworkspacedata b/xcode/omim.xcworkspace/contents.xcworkspacedata index 3a0202f155..b2793de53f 100644 --- a/xcode/omim.xcworkspace/contents.xcworkspacedata +++ b/xcode/omim.xcworkspace/contents.xcworkspacedata @@ -25,9 +25,6 @@ - - @@ -46,6 +43,9 @@ + + diff --git a/xcode/zlib/zlib.xcodeproj/project.pbxproj b/xcode/zlib/zlib.xcodeproj/project.pbxproj deleted file mode 100644 index 96fdc40b8a..0000000000 --- a/xcode/zlib/zlib.xcodeproj/project.pbxproj +++ /dev/null @@ -1,267 +0,0 @@ -// !$*UTF8*$! -{ - archiveVersion = 1; - classes = { - }; - objectVersion = 46; - objects = { - -/* Begin PBXFileReference section */ - 670D05B41B0E0B150013A7AC /* defaults.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = defaults.xcconfig; path = ../defaults.xcconfig; sourceTree = ""; }; - 67534CBC1A409A8E00A0A8C3 /* libzlib.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libzlib.a; sourceTree = BUILT_PRODUCTS_DIR; }; -/* End PBXFileReference section */ - -/* Begin PBXFrameworksBuildPhase section */ - 67534CB91A409A8E00A0A8C3 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXFrameworksBuildPhase section */ - -/* Begin PBXGroup section */ - 67534CB31A409A8E00A0A8C3 = { - isa = PBXGroup; - children = ( - 670D05B41B0E0B150013A7AC /* defaults.xcconfig */, - 67534CBE1A409A8E00A0A8C3 /* zlib */, - 67534CBD1A409A8E00A0A8C3 /* Products */, - ); - sourceTree = ""; - }; - 67534CBD1A409A8E00A0A8C3 /* Products */ = { - isa = PBXGroup; - children = ( - 67534CBC1A409A8E00A0A8C3 /* libzlib.a */, - ); - name = Products; - sourceTree = ""; - }; - 67534CBE1A409A8E00A0A8C3 /* zlib */ = { - isa = PBXGroup; - children = ( - ); - name = zlib; - path = ../../3party/zlib; - sourceTree = SOURCE_ROOT; - }; -/* End PBXGroup section */ - -/* Begin PBXHeadersBuildPhase section */ - 67534CBA1A409A8E00A0A8C3 /* Headers */ = { - isa = PBXHeadersBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXHeadersBuildPhase section */ - -/* Begin PBXNativeTarget section */ - 67534CBB1A409A8E00A0A8C3 /* zlib */ = { - isa = PBXNativeTarget; - buildConfigurationList = 67534CC71A409A8E00A0A8C3 /* Build configuration list for PBXNativeTarget "zlib" */; - buildPhases = ( - 67534CB81A409A8E00A0A8C3 /* Sources */, - 67534CB91A409A8E00A0A8C3 /* Frameworks */, - 67534CBA1A409A8E00A0A8C3 /* Headers */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = zlib; - productName = zlib; - productReference = 67534CBC1A409A8E00A0A8C3 /* libzlib.a */; - productType = "com.apple.product-type.library.static"; - }; -/* End PBXNativeTarget section */ - -/* Begin PBXProject section */ - 67534CB41A409A8E00A0A8C3 /* Project object */ = { - isa = PBXProject; - attributes = { - LastUpgradeCheck = 0640; - ORGANIZATIONNAME = maps.me; - TargetAttributes = { - 67534CBB1A409A8E00A0A8C3 = { - CreatedOnToolsVersion = 6.1; - }; - }; - }; - buildConfigurationList = 67534CB71A409A8E00A0A8C3 /* Build configuration list for PBXProject "zlib" */; - compatibilityVersion = "Xcode 3.2"; - developmentRegion = English; - hasScannedForEncodings = 0; - knownRegions = ( - en, - ); - mainGroup = 67534CB31A409A8E00A0A8C3; - productRefGroup = 67534CBD1A409A8E00A0A8C3 /* Products */; - projectDirPath = ""; - projectRoot = ""; - targets = ( - 67534CBB1A409A8E00A0A8C3 /* zlib */, - ); - }; -/* End PBXProject section */ - -/* Begin PBXSourcesBuildPhase section */ - 67534CB81A409A8E00A0A8C3 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXSourcesBuildPhase section */ - -/* Begin XCBuildConfiguration section */ - 67534CC51A409A8E00A0A8C3 /* Debug */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 670D05B41B0E0B150013A7AC /* defaults.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)", - "$(OMIM_ROOT)/3party/zlib", - ); - MACOSX_DEPLOYMENT_TARGET = 10.10; - MTL_ENABLE_DEBUG_INFO = YES; - ONLY_ACTIVE_ARCH = YES; - SDKROOT = macosx; - WARNING_CFLAGS = "-w"; - }; - name = Debug; - }; - 67534CC61A409A8E00A0A8C3 /* Release */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 670D05B41B0E0B150013A7AC /* defaults.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)", - "$(OMIM_ROOT)/3party/zlib", - ); - MACOSX_DEPLOYMENT_TARGET = 10.10; - MTL_ENABLE_DEBUG_INFO = NO; - SDKROOT = macosx; - WARNING_CFLAGS = "-w"; - }; - name = Release; - }; - 67534CC81A409A8E00A0A8C3 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - COMBINE_HIDPI_IMAGES = YES; - EXECUTABLE_PREFIX = lib; - GCC_C_LANGUAGE_STANDARD = c99; - GCC_ENABLE_CPP_EXCEPTIONS = YES; - GCC_ENABLE_CPP_RTTI = YES; - GCC_INPUT_FILETYPE = automatic; - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", - ); - GCC_SYMBOLS_PRIVATE_EXTERN = NO; - HEADER_SEARCH_PATHS = "$(inherited)"; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = Debug; - }; - 67534CC91A409A8E00A0A8C3 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - COMBINE_HIDPI_IMAGES = YES; - EXECUTABLE_PREFIX = lib; - GCC_C_LANGUAGE_STANDARD = c99; - GCC_ENABLE_CPP_EXCEPTIONS = YES; - GCC_ENABLE_CPP_RTTI = YES; - GCC_INPUT_FILETYPE = automatic; - GCC_PREPROCESSOR_DEFINITIONS = ""; - GCC_SYMBOLS_PRIVATE_EXTERN = NO; - HEADER_SEARCH_PATHS = "$(inherited)"; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = Release; - }; -/* End XCBuildConfiguration section */ - -/* Begin XCConfigurationList section */ - 67534CB71A409A8E00A0A8C3 /* Build configuration list for PBXProject "zlib" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 67534CC51A409A8E00A0A8C3 /* Debug */, - 67534CC61A409A8E00A0A8C3 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 67534CC71A409A8E00A0A8C3 /* Build configuration list for PBXNativeTarget "zlib" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 67534CC81A409A8E00A0A8C3 /* Debug */, - 67534CC91A409A8E00A0A8C3 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; -/* End XCConfigurationList section */ - }; - rootObject = 67534CB41A409A8E00A0A8C3 /* Project object */; -}