From 10a82811f846d0e89929a516a1daa82ac6529be4 Mon Sep 17 00:00:00 2001 From: Timur Bernikowich Date: Wed, 26 Nov 2014 13:44:44 +0300 Subject: [PATCH] [ios] Required libs for MRGS have been added. --- iphone/Maps/MainWindow.xib | 2 +- iphone/Maps/Maps.xcodeproj/project.pbxproj | 19 +++++++++++++++++-- .../Maps/Resources-iPad/MainWindow-iPad.xib | 2 +- 3 files changed, 19 insertions(+), 4 deletions(-) diff --git a/iphone/Maps/MainWindow.xib b/iphone/Maps/MainWindow.xib index 2e296d5aa6..3c22080582 100644 --- a/iphone/Maps/MainWindow.xib +++ b/iphone/Maps/MainWindow.xib @@ -1,5 +1,5 @@ - + diff --git a/iphone/Maps/Maps.xcodeproj/project.pbxproj b/iphone/Maps/Maps.xcodeproj/project.pbxproj index 633f1355a7..b2c18b6a60 100644 --- a/iphone/Maps/Maps.xcodeproj/project.pbxproj +++ b/iphone/Maps/Maps.xcodeproj/project.pbxproj @@ -188,6 +188,13 @@ B00511021A1101E000A61AA4 /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 97C98655186C734000AF7E9E /* AVFoundation.framework */; }; B00511041A1101F600A61AA4 /* CoreData.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B00511031A1101F600A61AA4 /* CoreData.framework */; }; B00511061A1101FC00A61AA4 /* CoreMedia.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B00511051A1101FC00A61AA4 /* CoreMedia.framework */; }; + B08AA8D01A25E53600810B1C /* CoreMedia.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B00511051A1101FC00A61AA4 /* CoreMedia.framework */; }; + B08AA8D11A25E54800810B1C /* CoreData.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B00511031A1101F600A61AA4 /* CoreData.framework */; }; + B08AA8D21A25E55800810B1C /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = B00511001A1101AA00A61AA4 /* libz.dylib */; }; + B08AA8D31A25E56300810B1C /* libxml2.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = B00510FE1A1101A000A61AA4 /* libxml2.dylib */; }; + B08AA8D41A25E56B00810B1C /* libsqlite3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = B00510FC1A11019400A61AA4 /* libsqlite3.dylib */; }; + B08AA8D51A25E58500810B1C /* PassKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 97C9864F186C5EDE00AF7E9E /* PassKit.framework */; }; + B08AA8D61A25E58C00810B1C /* Social.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 97C9864D186C5ED300AF7E9E /* Social.framework */; }; CB252D6F16FF82C9001E41E9 /* Statistics.mm in Sources */ = {isa = PBXBuildFile; fileRef = CB252D6C16FF82C8001E41E9 /* Statistics.mm */; }; CB252D7016FF82C9001E41E9 /* Statistics.mm in Sources */ = {isa = PBXBuildFile; fileRef = CB252D6C16FF82C8001E41E9 /* Statistics.mm */; }; ED48BBB517C267F5003E7E92 /* ColorPickerView.mm in Sources */ = {isa = PBXBuildFile; fileRef = ED48BBB417C267F5003E7E92 /* ColorPickerView.mm */; }; @@ -2160,6 +2167,8 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + B08AA8D61A25E58C00810B1C /* Social.framework in Frameworks */, + B08AA8D51A25E58500810B1C /* PassKit.framework in Frameworks */, 6B948E1D1A25533C00229BD5 /* libGoogleAnalyticsServices.a in Frameworks */, 6B948E1E1A25533C00229BD5 /* libAdIdAccess.a in Frameworks */, 6B948E1F1A25533C00229BD5 /* libAppsFlyerLib.a in Frameworks */, @@ -2197,6 +2206,11 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + B08AA8D41A25E56B00810B1C /* libsqlite3.dylib in Frameworks */, + B08AA8D31A25E56300810B1C /* libxml2.dylib in Frameworks */, + B08AA8D21A25E55800810B1C /* libz.dylib in Frameworks */, + B08AA8D11A25E54800810B1C /* CoreData.framework in Frameworks */, + B08AA8D01A25E53600810B1C /* CoreMedia.framework in Frameworks */, 6B948E211A25536200229BD5 /* libGoogleAnalyticsServices.a in Frameworks */, 6B948E221A25536200229BD5 /* libAdIdAccess.a in Frameworks */, 6B948E231A25536200229BD5 /* libAppsFlyerLib.a in Frameworks */, @@ -3288,7 +3302,7 @@ isa = PBXNativeTarget; buildConfigurationList = FAFB0913151215EE0041901D /* Build configuration list for PBXNativeTarget "MapsWithMe Lite" */; buildPhases = ( - FA78191C15C5F673009E0278 /* ShellScript */, + FA78191C15C5F673009E0278 /* Run Script */, FAFB06AA151215EE0041901D /* Resources */, FAFB08E8151215EE0041901D /* Sources */, FAFB08FA151215EE0041901D /* Frameworks */, @@ -4524,13 +4538,14 @@ shellPath = /bin/bash; shellScript = "LOWERED_CONFIG=`echo $CONFIGURATION | tr [A-Z] [a-z]`\nCONF=\"simulator\"\nDRAPE_CONF=\"old_renderer\"\nif [[ \"$LOWERED_CONFIG\" == *production* || \"$LOWERED_CONFIG\" == *adhoc* ]]; then\n CONF=\"production\"\nelif [[ \"$LOWERED_CONFIG\" == *debug* ]]; then\n CONF=\"debug\"\nelif [[ \"$LOWERED_CONFIG\" == *release* ]]; then\n if [[ \"$LOWERED_CONFIG\" == *simulator* ]]; then\n CONF=\"simulator-release\"\n else\n CONF=\"release\"\n fi\nfi\n\nif [[ \"$LOWERED_CONFIG\" == *drape* ]]; then\n echo \"Drape renderer building\"\n DRAPE_CONF=\"drape\"\nfi\n\necho \"Building $CONF configuration\"\nbash \"$SRCROOT/../../tools/autobuild/ios.sh\" $CONF $DRAPE_CONF"; }; - FA78191C15C5F673009E0278 /* ShellScript */ = { + FA78191C15C5F673009E0278 /* Run Script */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( ); + name = "Run Script"; outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; diff --git a/iphone/Maps/Resources-iPad/MainWindow-iPad.xib b/iphone/Maps/Resources-iPad/MainWindow-iPad.xib index 49f246fe00..93faa84e61 100644 --- a/iphone/Maps/Resources-iPad/MainWindow-iPad.xib +++ b/iphone/Maps/Resources-iPad/MainWindow-iPad.xib @@ -1,5 +1,5 @@ - +