diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2018-10-06 12:42:08 +0530 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2018-10-06 12:44:17 +0530 |
| commit | 2f3298477eaf26eb724474f1ad943a50fee148b2 (patch) | |
| tree | ad83e8b49e2cc72ad734d019efa2a4b69aff1a2a | |
| parent | 3e28e2e2f97d5b9242953a28abab2f0c321287fd (diff) | |
openh264.recipe: Use libc++ as the C++ stdlib1.14.4
Starting with XCode 10.12, this is mandatory. Targetting iOS 7.0 as
the minimum version is also required.
| -rw-r--r-- | recipes/openh264.recipe | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/recipes/openh264.recipe b/recipes/openh264.recipe index 2b696e42..cab945bd 100644 --- a/recipes/openh264.recipe +++ b/recipes/openh264.recipe @@ -89,11 +89,19 @@ class Recipe(recipe.Recipe): # ships with {'ASM = nasm': "ASM = yasm"}) - if self.config.target_platform == Platform.IOS and self.config.target_arch in [Architecture.X86, Architecture.X86_64]: + if self.config.target_platform == Platform.IOS: + shell.replace(os.path.join(self.build_dir, 'Makefile'), + # Use correct compiler flag for iOS simulator + {'STATIC_LDFLAGS=-lstdc++': 'STATIC_LDFLAGS=-lc++'}) shell.replace(os.path.join(self.build_dir, 'build', 'platform-ios.mk'), # Use correct compiler flag for iOS simulator - {'-miphoneos-version-min': '-mios-simulator-version-min'}) + {'SDK_MIN = 5.1': 'SDK_MIN = 7.0'}) + if self.config.target_arch in [Architecture.X86, Architecture.X86_64]: + shell.replace(os.path.join(self.build_dir, 'build', + 'platform-ios.mk'), + # Use correct compiler flag for iOS simulator + {'-miphoneos-version-min': '-mios-simulator-version-min'}) fix_android_ndk16_cxx (self.config, self.make_dir) @@ -102,10 +110,8 @@ class Recipe(recipe.Recipe): def post_install(self): # XXX: Don't forget to keep this in sync with the library version! dependency_libs=[] - if self.config.target_platform == Platform.IOS: + if self.config.platform == Platform.DARWIN: dependency_libs += ['-lc++'] - elif self.config.target_platform == Platform.DARWIN: - dependency_libs += ['-lstdc++'] elif self.config.target_platform == Platform.ANDROID: dependency_libs += ['gnustl', '-lm'] elif self.config.target_platform in [Platform.WINDOWS, Platform.LINUX]: |