Remove static build; LOG_DOMAIN; extended parameters.

This commit is contained in:
Guillaume Beraudo 2011-04-05 12:43:28 +02:00
parent 1b5b482753
commit e6beefcc7e

View file

@ -22,10 +22,11 @@
LOCAL_PATH:= $(call my-dir)/../../coreapi
include $(CLEAR_VARS)
MY_LOCAL_CPP_EXTENSION := .cc
LOCAL_CPP_EXTENSION := .cc
MY_LOCAL_SRC_FILES := \
LOCAL_SRC_FILES := \
linphonecore.c \
misc.c \
enum.c \
@ -48,15 +49,19 @@ MY_LOCAL_SRC_FILES := \
linphonecall.c \
ec-calibrator.c
MY_LOCAL_CFLAGS += \
ifndef MY_LOG_DOMAIN
MY_LOG_DOMAIN = \"Linphone\"
endif
LOCAL_CFLAGS += \
-D_BYTE_ORDER=_LITTLE_ENDIAN \
-DORTP_INET6 \
-DENABLE_TRACE \
-DLINPHONE_VERSION=\"3.4.0\" \
-DLINPHONE_PLUGINS_DIR=\"\\tmp\" \
-DLOG_DOMAIN=\"Linphone\"
-DLOG_DOMAIN=$(MY_LOG_DOMAIN)
MY_LOCAL_CFLAGS += -DIN_LINPHONE
LOCAL_CFLAGS += -DIN_LINPHONE
ifeq ($(LINPHONE_VIDEO),1)
@ -65,7 +70,7 @@ ifeq ($(BUILD_X264),1)
LOCAL_CFLAGS += -DHAVE_X264
endif
endif
MY_LOCAL_C_INCLUDES += \
LOCAL_C_INCLUDES += \
$(LOCAL_PATH) \
$(LOCAL_PATH)/include \
$(LOCAL_PATH)/../oRTP/include \
@ -73,11 +78,11 @@ MY_LOCAL_C_INCLUDES += \
$(LOCAL_PATH)/../../externals/exosip/include \
$(LOCAL_PATH)/../../externals/osip/include
MY_LOCAL_LDLIBS += -llog -ldl
LOCAL_LDLIBS += -llog -ldl
MY_LOCAL_STATIC_LIBRARIES := \
LOCAL_STATIC_LIBRARIES := \
libmediastreamer2 \
libortp \
libeXosip2 \
@ -87,49 +92,30 @@ MY_LOCAL_STATIC_LIBRARIES := \
ifeq ($(LINPHONE_VIDEO),1)
ifeq ($(BUILD_X264),1)
MY_LOCAL_STATIC_LIBRARIES += \
LOCAL_STATIC_LIBRARIES += \
libmsx264 \
libx264
endif
MY_LOCAL_SHARED_LIBRARIES += \
LOCAL_SHARED_LIBRARIES += \
libavcodec \
libswscale \
libavcore \
libavutil
endif
MY_LOCAL_STATIC_LIBRARIES += libspeex
LOCAL_STATIC_LIBRARIES += libspeex
ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
MY_LOCAL_CFLAGS += -DHAVE_ILBC=1
MY_LOCAL_STATIC_LIBRARIES += libmsilbc
LOCAL_CFLAGS += -DHAVE_ILBC=1
LOCAL_STATIC_LIBRARIES += libmsilbc
else
LOCAL_STATIC_LIBRARIES += $(LIBLINPHONE_EXTENDED_STATIC_LIBS)
LOCAL_SRC_FILES += $(LIBLINPHONE_EXTENDED_SRC_FILES)
LOCAL_C_INCLUDES += $(LIBLINPHONE_EXTENDED_C_INCLUDES) \
endif
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)