Commit 47ffa3a8 authored by jehan's avatar jehan
Browse files

Merge branch 'master' of git.savannah.nongnu.org:/srv/git/linphone

parents 39677907 1b5b4827
......@@ -20,13 +20,12 @@
##
LOCAL_PATH:= $(call my-dir)/../../coreapi
include $(CLEAR_VARS)
LOCAL_MODULE := liblinphone
LOCAL_CPP_EXTENSION := .cc
LOCAL_SRC_FILES = \
MY_LOCAL_CPP_EXTENSION := .cc
MY_LOCAL_SRC_FILES := \
linphonecore.c \
misc.c \
enum.c \
......@@ -49,7 +48,7 @@ LOCAL_SRC_FILES = \
linphonecall.c \
ec-calibrator.c
LOCAL_CFLAGS += \
MY_LOCAL_CFLAGS += \
-D_BYTE_ORDER=_LITTLE_ENDIAN \
-DORTP_INET6 \
-DENABLE_TRACE \
......@@ -57,7 +56,7 @@ LOCAL_CFLAGS += \
-DLINPHONE_PLUGINS_DIR=\"\\tmp\" \
-DLOG_DOMAIN=\"Linphone\"
LOCAL_CFLAGS += -DIN_LINPHONE
MY_LOCAL_CFLAGS += -DIN_LINPHONE
ifeq ($(LINPHONE_VIDEO),1)
......@@ -66,7 +65,7 @@ ifeq ($(BUILD_X264),1)
LOCAL_CFLAGS += -DHAVE_X264
endif
endif
LOCAL_C_INCLUDES += \
MY_LOCAL_C_INCLUDES += \
$(LOCAL_PATH) \
$(LOCAL_PATH)/include \
$(LOCAL_PATH)/../oRTP/include \
......@@ -74,11 +73,11 @@ LOCAL_C_INCLUDES += \
$(LOCAL_PATH)/../../externals/exosip/include \
$(LOCAL_PATH)/../../externals/osip/include
LOCAL_LDLIBS += -llog -ldl
MY_LOCAL_LDLIBS += -llog -ldl
LOCAL_STATIC_LIBRARIES := \
MY_LOCAL_STATIC_LIBRARIES := \
libmediastreamer2 \
libortp \
libeXosip2 \
......@@ -88,30 +87,49 @@ LOCAL_STATIC_LIBRARIES := \
ifeq ($(LINPHONE_VIDEO),1)
ifeq ($(BUILD_X264),1)
LOCAL_STATIC_LIBRARIES += \
MY_LOCAL_STATIC_LIBRARIES += \
libmsx264 \
libx264
endif
LOCAL_SHARED_LIBRARIES += \
MY_LOCAL_SHARED_LIBRARIES += \
libavcodec \
libswscale \
libavcore \
libavutil
endif
LOCAL_STATIC_LIBRARIES += libspeex
MY_LOCAL_STATIC_LIBRARIES += libspeex
ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
LOCAL_CFLAGS += -DHAVE_ILBC=1
LOCAL_STATIC_LIBRARIES += libmsilbc
MY_LOCAL_CFLAGS += -DHAVE_ILBC=1
MY_LOCAL_STATIC_LIBRARIES += libmsilbc
endif
LOCAL_MODULE_CLASS = SHARED_LIBRARIES
include $(CLEAR_VARS)
LOCAL_STATIC_LIBRARIES += $(MY_LOCAL_STATIC_LIBRARIES)
LOCAL_CFLAGS += $(MY_LOCAL_CFLAGS)
LOCAL_SHARED_LIBRARIES += $(MY_LOCAL_SHARED_LIBRARIES)
LOCAL_LDLIBS += $(MY_LOCAL_LDLIBS)
LOCAL_C_INCLUDES += $(MY_LOCAL_C_INCLUDES)
LOCAL_SRC_FILES += $(MY_LOCAL_SRC_FILES)
LOCAL_CPP_EXTENSION += $(MY_LOCAL_CPP_EXTENSION)
LOCAL_MODULE := liblinphone
include $(BUILD_SHARED_LIBRARY)
include $(CLEAR_VARS)
LOCAL_STATIC_LIBRARIES += $(MY_LOCAL_STATIC_LIBRARIES)
LOCAL_CFLAGS += $(MY_LOCAL_CFLAGS)
LOCAL_SHARED_LIBRARIES += $(MY_LOCAL_SHARED_LIBRARIES)
LOCAL_LDLIBS += $(MY_LOCAL_LDLIBS)
LOCAL_C_INCLUDES += $(MY_LOCAL_C_INCLUDES)
LOCAL_SRC_FILES += $(MY_LOCAL_SRC_FILES)
LOCAL_CPP_EXTENSION += $(MY_LOCAL_CPP_EXTENSION)
LOCAL_MODULE := liblinphone-static
include $(BUILD_STATIC_LIBRARY)
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