witine/linphone-ios
1
0
Fork 0
forked from mirrors/linphone-iphone
Code Pull requests Activity

Build video support on x86 platform.

Browse source
This commit is contained in:
Ghislain MARY 2013-09-23 13:50:34 +02:00
parent b050b22924
commit 4c34a2c798
3 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
build/android/Android-no-neon.mk
View file

@ -23,6 +23,7 @@ LOCAL_PATH:= $(call my-dir)/../../coreapi
include $(CLEAR_VARS)
ifeq ($(TARGET_ARCH), arm)
include $(linphone-root-dir)/submodules/linphone/build/android/common.mk
ifeq ($(_BUILD_VIDEO),1)
@ -32,6 +33,7 @@ LOCAL_SHARED_LIBRARIES += \
liblinavcore \
liblinavutil
endif
endif
LOCAL_MODULE := liblinphonenoneon
ifeq ($(TARGET_ARCH_ABI),armeabi)
@ -40,9 +42,6 @@ endif
ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
LOCAL_MODULE_FILENAME := liblinphonearmv7noneon
endif
ifeq ($(TARGET_ARCH_ABI),x86)
LOCAL_MODULE_FILENAME := liblinphonex86
endif
include $(BUILD_SHARED_LIBRARY)

3
build/android/Android.mk
View file

@ -37,6 +37,9 @@ LOCAL_MODULE := liblinphone
ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
LOCAL_MODULE_FILENAME := liblinphonearmv7
endif
ifeq ($(TARGET_ARCH_ABI),x86)
LOCAL_MODULE_FILENAME := liblinphonex86
endif
include $(BUILD_SHARED_LIBRARY)

12
build/android/common.mk
View file

@ -184,6 +184,7 @@ LOCAL_C_INCLUDES += $(LIBLINPHONE_EXTENDED_C_INCLUDES)
LOCAL_WHOLE_STATIC_LIBRARIES += $(LIBLINPHONE_EXTENDED_STATIC_LIBS)
LOCAL_SRC_FILES += $(LIBLINPHONE_EXTENDED_SRC_FILES)
ifeq ($(TARGET_ARCH), arm)
ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
ifeq ($(BUILD_GPLV3_ZRTP),1)
LOCAL_SHARED_LIBRARIES += liblinssl liblincrypto
@ -207,6 +208,17 @@ else
LOCAL_STATIC_LIBRARIES += libsrtp-static
endif
endif
endif
ifeq ($(TARGET_ARCH), x86)
ifeq ($(BUILD_GPLV3_ZRTP),1)
LOCAL_SHARED_LIBRARIES += liblinssl liblincrypto
LOCAL_SHARED_LIBRARIES += libzrtpcpp
endif
ifeq ($(BUILD_SRTP),1)
LOCAL_SHARED_LIBRARIES += libsrtp
endif
endif
ifeq ($(BUILD_REMOTE_PROVISIONING),1)
LOCAL_SRC_FILES += ../tools/xml2lpc.c \