Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix some compilation issues

Browse source
This commit is contained in:
Sylvain Berfini 2012-03-29 15:59:31 +02:00
parent bd4838a155
commit 270e894752
4 changed files with 17 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
prepare_sources.sh
View file

@ -17,7 +17,7 @@ fi
cd $topdir/submodules/libilbc-rfc3951 && ./autogen.sh && ./configure && make || ( echo "iLBC prepare stage failed" ; exit 1 )
cd $topdir/submodules/externals/build/libvpx && ./configure --target=armv7-android-gcc --sdk-path=$1 && make asm_com_offsets.asm || ( echo "VP8 prepare stage failed." ; exit 1 )
cd $topdir/submodules/externals/libvpx && ./configure --target=armv7-android-gcc --sdk-path=$1 && make asm_com_offsets.asm || ( echo "VP8 prepare stage failed." ; exit 1 )
cd $topdir/submodules/mssilk && ./autogen.sh && ./configure --host=arm-linux MEDIASTREAMER_CFLAGS=" " MEDIASTREAMER_LIBS=" " && cd sdk && make extract-sources || ( echo "SILK audio plugin prepare state failed." ; exit 1 )

1
submodules/externals/build/libvpx/Android.mk vendored
View file

@ -25,7 +25,6 @@ SCALE_SRCS += vpx_scale/arm/scalesystemdependent.c
#neon
SCALE_SRCS += vpx_scale/arm/neon/vp8_vpxyv12_copy_y_neon$(ASM).neon
SCALE_SRCS += vpx_scale/arm/neon/vp8_vpxyv12_copyframe_func_neon$(ASM).neon
SCALE_SRCS += vpx_scale/arm/neon/vp8_vpxyv12_copyframeyonly_neon$(ASM).neon
SCALE_SRCS += vpx_scale/arm/neon/vp8_vpxyv12_copysrcframe_func_neon$(ASM).neon
SCALE_SRCS += vpx_scale/arm/neon/vp8_vpxyv12_extendframeborders_neon$(ASM).neon
SCALE_SRCS += vpx_scale/arm/neon/yv12extend_arm.c

13
submodules/externals/build/libvpx/vpx_config.h vendored
View file

@ -1,3 +1,10 @@
/* Copyright (c) 2011 The WebM project authors. All Rights Reserved. */
/* */
/* Use of this source code is governed by a BSD-style license */
/* that can be found in the LICENSE file in the root of the source */
/* tree. An additional intellectual property rights grant can be found */
/* in the file PATENTS. All contributing project authors may */
/* be found in the AUTHORS file in the root of the source tree. */
/* This file automatically generated by configure. Do not edit! */
#ifndef VPX_CONFIG_H
#define VPX_CONFIG_H
@ -11,8 +18,6 @@
#define HAVE_ARMV5TE 1
#define HAVE_ARMV6 1
#define HAVE_ARMV7 1
#define HAVE_IWMMXT 0
#define HAVE_IWMMXT2 0
#define HAVE_MIPS32 0
#define HAVE_MMX 0
#define HAVE_SSE 0
@ -61,10 +66,12 @@
#define CONFIG_STATIC_MSVCRT 0
#define CONFIG_SPATIAL_RESAMPLING 1
#define CONFIG_REALTIME_ONLY 1
#define CONFIG_ERROR_CONCEALMENT 1
#define CONFIG_ERROR_CONCEALMENT 0
#define CONFIG_SHARED 0
#define CONFIG_STATIC 1
#define CONFIG_SMALL 0
#define CONFIG_POSTPROC_VISUALIZER 0
#define CONFIG_OS_SUPPORT 1
#define CONFIG_UNIT_TESTS 0
#define CONFIG_MULTI_RES_ENCODING 0
#endif /* VPX_CONFIG_H */

12
submodules/externals/build/libvpx/vpx_version.h vendored
View file

@ -1,7 +1,7 @@
#define VERSION_MAJOR 0
#define VERSION_MINOR 9
#define VERSION_PATCH 7
#define VERSION_EXTRA "p1-55-g6f9457e"
#define VERSION_MAJOR 1
#define VERSION_MINOR 0
#define VERSION_PATCH 0
#define VERSION_EXTRA ""
#define VERSION_PACKED ((VERSION_MAJOR<<16)|(VERSION_MINOR<<8)|(VERSION_PATCH))
#define VERSION_STRING_NOSP "v0.9.7-p1-55-g6f9457e"
#define VERSION_STRING " v0.9.7-p1-55-g6f9457e"
#define VERSION_STRING_NOSP "v1.0.0"
#define VERSION_STRING " v1.0.0"