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

video compilation ok

Browse source
This commit is contained in:
Simon Morlat 2010-10-08 15:33:27 +02:00
parent 28b51c7130
commit 1243fa1491
8 changed files with 34 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
jni/Android.mk
View file

@ -1,5 +1,9 @@
root-dir:=$(APP_PROJECT_PATH)
ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
LINPHONE_VIDEO=1
endif
include $(root-dir)/submodules/externals/build/speex/Android.mk
include $(root-dir)/submodules/externals/build/gsm/Android.mk

2
jni/Application.mk
View file

@ -3,7 +3,7 @@ APP_MODULES :=libspeex libgsm libortp libosip2 libeXosip2 libmediastreamer2
ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
APP_MODULES +=libmsilbc libavutil libavcodec libswscale
APP_MODULES +=libmsilbc libavutil libavcore libavcodec libswscale
endif
APP_BUILD_SCRIPT:=$(call my-dir)/Android.mk
APP_PLATFORM := android-3

BIN
libs/armeabi-v7a/liblinphone.so
View file

Binary file not shown.

4
submodules/externals/build/ffmpeg/Android.mk vendored
View file

@ -1,3 +1,5 @@
include $(root-dir)/submodules/externals/build/ffmpeg/Android_libavutil.mk
include $(root-dir)/submodules/externals/build/ffmpeg/Android_libavcodec.mk
include $(root-dir)/submodules/externals/build/ffmpeg/Android_libswscale.mk
include $(root-dir)/submodules/externals/build/ffmpeg/Android_libswscale.mk
include $(root-dir)/submodules/externals/build/ffmpeg/Android_libavcore.mk

4
submodules/externals/build/ffmpeg/Android_libavcodec.mk vendored
View file

@ -14,6 +14,7 @@ LOCAL_SRC_FILES = \
libavcodec/arm/dsputil_init_neon.c \
libavcodec/arm/dsputil_init_vfp.c \
libavcodec/arm/dsputil_neon.S.neon \
libavcodec/arm/dsputil_vfp.S.neon \
libavcodec/arm/fft_init_arm.c \
libavcodec/arm/h264dsp_init_arm.c \
libavcodec/arm/h264dsp_neon.S.neon \
@ -80,7 +81,8 @@ LOCAL_SRC_FILES = \
libavcodec/resample.c \
libavcodec/resample2.c \
libavcodec/simple_idct.c \
libavcodec/utils.c
libavcodec/utils.c \
libavcodec/pthread.c
#LOCAL_CFLAGS += -DHAVE_AV_CONFIG_H -Wa,-I$(LOCAL_PATH)/libavcodec/arm

21
submodules/externals/build/ffmpeg/Android_libavcore.mk vendored Normal file
View file

@ -0,0 +1,21 @@
LOCAL_PATH:= $(call my-dir)/../../ffmpeg/
include $(CLEAR_VARS)
LOCAL_MODULE := libavcore
LOCAL_SRC_FILES := \
libavcore/imgutils.c \
libavcore/parseutils.c \
libavcore/utils.c
LOCAL_CFLAGS += -DHAVE_AV_CONFIG_H
#for including config.h:
LOCAL_C_INCLUDES += $(LOCAL_PATH)/../build/ffmpeg $(LOCAL_PATH)/
include $(BUILD_STATIC_LIBRARY)

2
submodules/externals/build/ffmpeg/config.h vendored
View file

@ -109,7 +109,7 @@
#define HAVE_MEMALIGN 1
#define HAVE_MKSTEMP 1
#define HAVE_PLD 1
#define HAVE_POSIX_MEMALIGN 1
#define HAVE_POSIX_MEMALIGN 0
#define HAVE_ROUND 1
#define HAVE_ROUNDF 1
#define HAVE_SDL 0

2
submodules/linphone

@ -1 +1 @@
Subproject commit f3db122cd03bf836afbdbb3cecf17e648a0ceb13
Subproject commit dea7a7661cbf7e95e476a7ddd9bf5449e3093c40