android: enable feature match for soft stitcher
diff --git a/Android.mk b/Android.mk
index 07e1611..e94e4a4 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,10 +1,16 @@
LOCAL_PATH:= $(call my-dir)
XCAM_CFLAGS := -fPIC -W -Wall -D_REENTRANT -Wformat -Wno-unused-parameter -Wformat-security -fstack-protector
+XCAM_CFLAGS += -DANDROID
+
ifeq ($(ENABLE_DEBUG), 1)
XCAM_CFLAGS += -DDEBUG
endif
+ifeq ($(ENABLE_OPENCV), 1)
+XCAM_CFLAGS += -DHAVE_OPENCV
+endif
+
# For libxcam
# =================================================
@@ -14,6 +20,10 @@
LOCAL_MODULE := libxcam
LOCAL_MODULE_TAGS := optional
+ifeq ($(ENABLE_OPENCV), 1)
+LOCAL_STATIC_LIBRARIES := libcv libcxcore
+endif
+
XCAM_XCORE_SRC_FILES := \
xcore/buffer_pool.cpp \
xcore/calibration_parser.cpp \
@@ -45,6 +55,10 @@
modules/soft/soft_worker.cpp \
$(NULL)
+ifeq ($(ENABLE_OPENCV), 1)
+XCAM_SOFT_SRC_FILES += modules/soft/cv_capi_feature_match.cpp
+endif
+
LOCAL_SRC_FILES := $(XCAM_XCORE_SRC_FILES) $(XCAM_SOFT_SRC_FILES)
LOCAL_C_INCLUDES := \
@@ -52,6 +66,13 @@
$(LOCAL_PATH)/modules \
$(NULL)
+ifeq ($(ENABLE_OPENCV), 1)
+LOCAL_C_INCLUDES += \
+ external/opencv/cv/include/ \
+ external/opencv/cxcore/include \
+ $(NULL)
+endif
+
LOCAL_CFLAGS := $(XCAM_CFLAGS)
LOCAL_CPPFLAGS := $(LOCAL_CFLAGS) -frtti