Commit dea7a766 authored by Simon Morlat's avatar Simon Morlat
Browse files

update ms2 and Android compilation

parent f3db122c
......@@ -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
......
mediastreamer2 @ 20da8f41
Subproject commit 6701e074484fd6725b789b2854a2be5bd2784ef5
Subproject commit 20da8f413994f0959ab81b391894defa70eaa1f6
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment