RedAuburn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[build-fix] [ios] Build fix.

Browse source
This commit is contained in:
Ilya Grechuhin 2017-04-14 13:13:15 +03:00 • committed by Sergey Yershov
parent 9046058f42
commit d7db317267
3 changed files with 94 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

96
iphone/Maps/3party/MoPubSDK/Mopub.xcodeproj/project.pbxproj
View file

@ -1357,11 +1357,92 @@
/* End PBXSourcesBuildPhase section */
/* Begin XCBuildConfiguration section */
341EF4731EA0C459001FC0AA /* AdHoc */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 34F4098F1E9E27DB00E57AC0 /* common-release.xcconfig */;
buildSettings = {
GCC_WARN_INHIBIT_ALL_WARNINGS = YES;
MACH_O_TYPE = staticlib;
ONLY_ACTIVE_ARCH = NO;
};
name = AdHoc;
};
341EF4741EA0C459001FC0AA /* AdHoc */ = {
isa = XCBuildConfiguration;
buildSettings = {
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/AdNetworkSupport/Facebook/SDK",
);
PRODUCT_NAME = "$(TARGET_NAME)";
};
name = AdHoc;
};
341EF4751EA0C482001FC0AA /* Production Full */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 34F4098F1E9E27DB00E57AC0 /* common-release.xcconfig */;
buildSettings = {
GCC_WARN_INHIBIT_ALL_WARNINGS = YES;
MACH_O_TYPE = staticlib;
ONLY_ACTIVE_ARCH = NO;
};
name = "Production Full";
};
341EF4761EA0C482001FC0AA /* Production Full */ = {
isa = XCBuildConfiguration;
buildSettings = {
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/AdNetworkSupport/Facebook/SDK",
);
PRODUCT_NAME = "$(TARGET_NAME)";
};
name = "Production Full";
};
341EF4771EA0C49B001FC0AA /* Simulator Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 34F4098F1E9E27DB00E57AC0 /* common-release.xcconfig */;
buildSettings = {
GCC_WARN_INHIBIT_ALL_WARNINGS = YES;
MACH_O_TYPE = staticlib;
};
name = "Simulator Release";
};
341EF4781EA0C49B001FC0AA /* Simulator Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/AdNetworkSupport/Facebook/SDK",
);
PRODUCT_NAME = "$(TARGET_NAME)";
};
name = "Simulator Release";
};
341EF4791EA0C4A3001FC0AA /* Simulator */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 34F4098E1E9E27DB00E57AC0 /* common-debug.xcconfig */;
buildSettings = {
GCC_WARN_INHIBIT_ALL_WARNINGS = YES;
MACH_O_TYPE = staticlib;
};
name = Simulator;
};
341EF47A1EA0C4A3001FC0AA /* Simulator */ = {
isa = XCBuildConfiguration;
buildSettings = {
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/AdNetworkSupport/Facebook/SDK",
);
PRODUCT_NAME = "$(TARGET_NAME)";
};
name = Simulator;
};
34F407531E9E1D3500E57AC0 /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 34F4098E1E9E27DB00E57AC0 /* common-debug.xcconfig */;
buildSettings = {
BUILD_DIR = "$(OMIM_ROOT)/../../../omim-build/xcode";
GCC_WARN_INHIBIT_ALL_WARNINGS = YES;
MACH_O_TYPE = staticlib;
};
@ -1371,7 +1452,6 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 34F4098F1E9E27DB00E57AC0 /* common-release.xcconfig */;
buildSettings = {
BUILD_DIR = "$(OMIM_ROOT)/../../../omim-build/xcode";
GCC_WARN_INHIBIT_ALL_WARNINGS = YES;
MACH_O_TYPE = staticlib;
};
@ -1406,19 +1486,27 @@
isa = XCConfigurationList;
buildConfigurations = (
34F407531E9E1D3500E57AC0 /* Debug */,
341EF4791EA0C4A3001FC0AA /* Simulator */,
34F407541E9E1D3500E57AC0 /* Release */,
341EF4771EA0C49B001FC0AA /* Simulator Release */,
341EF4751EA0C482001FC0AA /* Production Full */,
341EF4731EA0C459001FC0AA /* AdHoc */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
defaultConfigurationName = AdHoc;
};
34F407551E9E1D3500E57AC0 /* Build configuration list for PBXNativeTarget "Mopub" */ = {
isa = XCConfigurationList;
buildConfigurations = (
34F407561E9E1D3500E57AC0 /* Debug */,
341EF47A1EA0C4A3001FC0AA /* Simulator */,
34F407571E9E1D3500E57AC0 /* Release */,
341EF4781EA0C49B001FC0AA /* Simulator Release */,
341EF4761EA0C482001FC0AA /* Production Full */,
341EF4741EA0C459001FC0AA /* AdHoc */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
defaultConfigurationName = AdHoc;
};
/* End XCConfigurationList section */
};

16
iphone/Maps/Maps.xcodeproj/project.pbxproj
View file

@ -4296,7 +4296,7 @@
ORGANIZATIONNAME = MapsWithMe;
TargetAttributes = {
1D6058900D05DD3D006BFB54 = {
DevelopmentTeam = 3T6FSDE8C7;
DevelopmentTeam = L2QFT5NA2Q;
LastSwiftMigration = 0820;
ProvisioningStyle = Automatic;
SystemCapabilities = {
@ -6065,7 +6065,6 @@
849CF79D1DE842290024A8A5 /* Simulator */ = {
isa = XCBuildConfiguration;
buildSettings = {
BUILD_DIR = "$(BUILD_ROOT)";
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/3party/MoPubSDK/AdNetworkSupport/Facebook/SDK",
@ -6115,7 +6114,6 @@
849CF79E1DE842290024A8A5 /* Simulator Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
BUILD_DIR = "$(BUILD_ROOT)";
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/3party/MoPubSDK/AdNetworkSupport/Facebook/SDK",
@ -6165,7 +6163,6 @@
849CF79F1DE842290024A8A5 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
BUILD_DIR = "$(BUILD_ROOT)";
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/3party/MoPubSDK/AdNetworkSupport/Facebook/SDK",
@ -6215,7 +6212,6 @@
849CF7A01DE842290024A8A5 /* AdHoc */ = {
isa = XCBuildConfiguration;
buildSettings = {
BUILD_DIR = "$(BUILD_ROOT)";
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/3party/MoPubSDK/AdNetworkSupport/Facebook/SDK",
@ -6265,7 +6261,6 @@
849CF7A11DE842290024A8A5 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
BUILD_DIR = "$(BUILD_ROOT)";
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/3party/MoPubSDK/AdNetworkSupport/Facebook/SDK",
@ -6315,7 +6310,6 @@
849CF7A21DE842290024A8A5 /* Production Full */ = {
isa = XCBuildConfiguration;
buildSettings = {
BUILD_DIR = "$(BUILD_ROOT)";
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/3party/MoPubSDK/AdNetworkSupport/Facebook/SDK",
@ -6409,7 +6403,7 @@
SUPPORTED_PLATFORMS = "iphonesimulator iphoneos";
SWIFT_OBJC_BRIDGING_HEADER = "Bridging-Header.h";
SWIFT_OBJC_INTERFACE_HEADER_NAME = SwiftBridge.h;
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 3.0;
TARGETED_DEVICE_FAMILY = "1,2";
VALID_ARCHS = "i386 x86_64";
@ -6420,7 +6414,6 @@
FAAB411A149BA83500C245B1 /* Simulator */ = {
isa = XCBuildConfiguration;
buildSettings = {
BUILD_DIR = "$(BUILD_ROOT)";
CLANG_ENABLE_MODULES = YES;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
@ -6524,7 +6517,6 @@
FAAB411C149BA84700C245B1 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
BUILD_DIR = "$(BUILD_ROOT)";
CLANG_ENABLE_MODULES = YES;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
@ -6631,7 +6623,6 @@
FAAB411E149BA85500C245B1 /* AdHoc */ = {
isa = XCBuildConfiguration;
buildSettings = {
BUILD_DIR = "$(BUILD_ROOT)";
CLANG_ENABLE_MODULES = YES;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
@ -6738,7 +6729,6 @@
FAAB4120149BA86000C245B1 /* Production Full */ = {
isa = XCBuildConfiguration;
buildSettings = {
BUILD_DIR = "$(BUILD_ROOT)";
CLANG_ENABLE_MODULES = YES;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
@ -6845,7 +6835,6 @@
FABB561F149CD957006969C0 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
BUILD_DIR = "$(BUILD_ROOT)";
CLANG_ENABLE_MODULES = YES;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
@ -6953,7 +6942,6 @@
FACFE54515F8F35600CE8B20 /* Simulator Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
BUILD_DIR = "$(BUILD_ROOT)";
CLANG_ENABLE_MODULES = YES;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",

1
xcode/common.xcconfig
View file

@ -2,7 +2,6 @@ CURRENT_PROJECT_VERSION = 7.2.4
// Paths
OMIM_ROOT = $(PROJECT_DIR)/../..
BUILD_DIR = $(OMIM_ROOT)/../omim-build/xcode
QT_PATH = /usr/local/opt/qt5
BOOST_ROOT = $(OMIM_ROOT)/3party/boost