mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-01-17 19:18:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

update ms2 and Android compilation

Browse source
This commit is contained in:
Simon Morlat 2010-10-08 15:31:52 +02:00
parent f3db122cd0
commit dea7a7661c
2 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
build/android/Android.mk
View file

@ -57,7 +57,10 @@ LOCAL_CFLAGS += \
-DLOG_DOMAIN=\"Linphone\"
LOCAL_CFLAGS += -DIN_LINPHONE
#LOCAL_CFLAGS += -DVIDEO_ENABLED -DIN_LINPHONE
ifeq ($(LINPHONE_VIDEO),1)
LOCAL_CFLAGS += -DVIDEO_ENABLED
endif
LOCAL_C_INCLUDES += \
$(LOCAL_PATH) \
@ -76,6 +79,15 @@ LOCAL_STATIC_LIBRARIES := \
libeXosip2 \
libosip2 \
libgsm
ifeq ($(LINPHONE_VIDEO),1)
LOCAL_STATIC_LIBRARIES += \
libavcodec \
libswscale \
libavcore \
libavutil
endif
ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
LOCAL_CFLAGS += -DHAVE_ILBC=1
LOCAL_STATIC_LIBRARIES += libmsilbc

2
mediastreamer2

@ -1 +1 @@
Subproject commit 6701e074484fd6725b789b2854a2be5bd2784ef5
Subproject commit 20da8f413994f0959ab81b391894defa70eaa1f6