diff options
| -rw-r--r-- | Makefile | 10 | ||||
| -rw-r--r-- | mbgl.gypi | 1 | ||||
| -rw-r--r-- | platform/ios/ios.xcodeproj/project.pbxproj | 4 | ||||
| -rw-r--r-- | platform/ios/platform.gyp | 8 |
4 files changed, 18 insertions, 5 deletions
@@ -125,23 +125,23 @@ test-ios: ios -workspace $(IOS_WORK_PATH) -scheme CI test $(XCPRETTY) ipackage: $(IOS_PROJ_PATH) - BITCODE=$(BITCODE) FORMAT=$(FORMAT) BUILD_DEVICE=$(BUILD_DEVICE) SYMBOLS=$(SYMBOLS) \ + FORMAT=$(FORMAT) BUILD_DEVICE=$(BUILD_DEVICE) SYMBOLS=$(SYMBOLS) \ ./platform/ios/scripts/package.sh ipackage-strip: $(IOS_PROJ_PATH) - BITCODE=$(BITCODE) FORMAT=$(FORMAT) BUILD_DEVICE=$(BUILD_DEVICE) SYMBOLS=NO \ + FORMAT=$(FORMAT) BUILD_DEVICE=$(BUILD_DEVICE) SYMBOLS=NO \ ./platform/ios/scripts/package.sh ipackage-sim: $(IOS_PROJ_PATH) - BUILDTYPE=Debug BITCODE=$(BITCODE) FORMAT=dynamic BUILD_DEVICE=false SYMBOLS=$(SYMBOLS) \ + BUILDTYPE=Debug FORMAT=dynamic BUILD_DEVICE=false SYMBOLS=$(SYMBOLS) \ ./platform/ios/scripts/package.sh iframework: $(IOS_PROJ_PATH) - BITCODE=$(BITCODE) FORMAT=dynamic BUILD_DEVICE=$(BUILD_DEVICE) SYMBOLS=$(SYMBOLS) \ + FORMAT=dynamic BUILD_DEVICE=$(BUILD_DEVICE) SYMBOLS=$(SYMBOLS) \ ./platform/ios/scripts/package.sh ifabric: $(IOS_PROJ_PATH) - BITCODE=$(BITCODE) FORMAT=static BUILD_DEVICE=$(BUILD_DEVICE) SYMBOLS=NO SELF_CONTAINED=YES \ + FORMAT=static BUILD_DEVICE=$(BUILD_DEVICE) SYMBOLS=NO SELF_CONTAINED=YES \ ./platform/ios/scripts/package.sh idocument: @@ -199,6 +199,7 @@ 'xcode_settings': { 'OTHER_CPLUSPLUSFLAGS': [ '<@(cflags_cc)' ], 'OTHER_CFLAGS': [ '<@(cflags)' ], + 'BITCODE_GENERATION_MODE': 'bitcode', }, }, { 'cflags_cc': [ '<@(cflags_cc)' ], diff --git a/platform/ios/ios.xcodeproj/project.pbxproj b/platform/ios/ios.xcodeproj/project.pbxproj index bdc0fbd900..83ae3e6406 100644 --- a/platform/ios/ios.xcodeproj/project.pbxproj +++ b/platform/ios/ios.xcodeproj/project.pbxproj @@ -1729,6 +1729,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = DAC07C961CBB2CD6000CB309 /* mbgl.xcconfig */; buildSettings = { + BITCODE_GENERATION_MODE = bitcode; CURRENT_PROJECT_VERSION = 1; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; @@ -1769,6 +1770,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = DAC07C961CBB2CD6000CB309 /* mbgl.xcconfig */; buildSettings = { + BITCODE_GENERATION_MODE = bitcode; CURRENT_PROJECT_VERSION = 1; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; @@ -1831,6 +1833,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = DAC07C961CBB2CD6000CB309 /* mbgl.xcconfig */; buildSettings = { + BITCODE_GENERATION_MODE = bitcode; HEADER_SEARCH_PATHS = ( ../default, ../../include, @@ -1861,6 +1864,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = DAC07C961CBB2CD6000CB309 /* mbgl.xcconfig */; buildSettings = { + BITCODE_GENERATION_MODE = bitcode; HEADER_SEARCH_PATHS = ( ../default, ../../include, diff --git a/platform/ios/platform.gyp b/platform/ios/platform.gyp index e4abff27e3..4cb26091d4 100644 --- a/platform/ios/platform.gyp +++ b/platform/ios/platform.gyp @@ -129,6 +129,14 @@ 'CLANG_ENABLE_OBJC_ARC': 'YES', 'CLANG_ENABLE_MODULES': 'YES', }, + + 'conditions': [ + ['OS == "mac"', { + 'xcode_settings': { + 'BITCODE_GENERATION_MODE': 'bitcode', + }, + },], + ], 'link_settings': { 'libraries': [ '<@(libraries)' ], |