summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--recipes/libvpx.recipe5
1 files changed, 4 insertions, 1 deletions
diff --git a/recipes/libvpx.recipe b/recipes/libvpx.recipe
index 8ae7db8..958df47 100644
--- a/recipes/libvpx.recipe
+++ b/recipes/libvpx.recipe
@@ -52,6 +52,9 @@ class Recipe(recipe.Recipe):
elif self.config.target_platform == Platform.ANDROID:
if self.config.target_arch == Architecture.ARM:
arch = 'armv5te'
+ # Fix compiler error with -mthumb
+ self.new_env['CFLAGS'] = os.environ['CFLAGS'].replace('-mthumb', '')
+ self.new_env['CFLAGS'] = self.new_env['CFLAGS'] + " -Dandroid_getCpuFamily=vpx_android_getCpuFamily -Dandroid_getCpuFeatures=vpx_android_getCpuFeatures -Dandroid_getCpuCount=vpx_android_getCpuCount "
elif self.config.target_arch == Architecture.ARMv7:
arch = 'armv7'
self.new_env['CFLAGS'] = os.environ['CFLAGS'] + " -Dandroid_getCpuFamily=vpx_android_getCpuFamily -Dandroid_getCpuFeatures=vpx_android_getCpuFeatures -Dandroid_getCpuCount=vpx_android_getCpuCount "
@@ -60,7 +63,7 @@ class Recipe(recipe.Recipe):
platform = 'android'
self.config_sh = 'LD=$CC ./configure'
self.configure_options.replace('--as=yasm', '')
- self.configure_options += ' --disable-runtime-cpu-detect --sdk-path=%s ' % self.config.toolchain_prefix
+ self.configure_options += ' --sdk-path=%s ' % self.config.toolchain_prefix
else:
self.configure_options += '--enable-shared '
platform = 'linux'