saberbud/ceres-solver
1
0
Fork 0
mirror of https://github.com/ceres-solver/ceres-solver.git synced 2026-08-29 16:40:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

Make Android.mk play better with the external consraints

Browse Source 
Change-Id: Ia0a1037d97c032a4ba1a9acbf4e04c192d12ee61
This commit is contained in:
Sameer Agarwal
2013-03-13 12:14:00 -07:00
parent 700d50d807
commit 793a339335
1 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jni/Android.mk
+20 -4
View File
@@ -69,15 +69,28 @@
# Similarly if you do not need the line search minimizer, consider adding
#
# -DCERES_NO_LINE_SEARCH_MINIMIZER
#
# Changing the logging library:
#
# Ceres Solver ships with a replacement for glog that provides a
# simple and small implementation that builds on Android. However, if
# you wish to supply a header only version yourself, then you may
# define CERES_GLOG_DIR to point to it.
LOCAL_PATH := $(call my-dir)
EIGEN_PATH := $(EIGEN_PATH)
CERES_INCLUDE_PATHS := $(LOCAL_PATH)/../internal
CERES_INCLUDE_PATHS := $(CERES_EXTRA_INCLUDES)
CERES_INCLUDE_PATHS += $(LOCAL_PATH)/../internal
CERES_INCLUDE_PATHS += $(LOCAL_PATH)/../internal/ceres
CERES_INCLUDE_PATHS += $(LOCAL_PATH)/../include
CERES_INCLUDE_PATHS += $(LOCAL_PATH)/../internal/ceres/miniglog
# Use the alternate glog implementation if provided by the user.
ifdef CERES_GLOG_DIR
CERES_INCLUDE_PATHS += $(CERES_GLOG_DIR)
else
CERES_INCLUDE_PATHS += $(LOCAL_PATH)/../internal/ceres/miniglog
endif
CERES_SRC_PATH := ../internal/ceres
include $(CLEAR_VARS)
@@ -135,7 +148,6 @@ LOCAL_SRC_FILES := $(CERES_SRC_PATH)/array_utils.cc \
$(CERES_SRC_PATH)/local_parameterization.cc \
$(CERES_SRC_PATH)/loss_function.cc \
$(CERES_SRC_PATH)/low_rank_inverse_hessian.cc \
$(CERES_SRC_PATH)/miniglog/glog/logging.cc \
$(CERES_SRC_PATH)/minimizer.cc \
$(CERES_SRC_PATH)/normal_prior.cc \
$(CERES_SRC_PATH)/parameter_block_ordering.cc \
@@ -183,6 +195,10 @@ LOCAL_SRC_FILES := $(CERES_SRC_PATH)/array_utils.cc \
$(CERES_SRC_PATH)/generated/schur_eliminator_4_4_4.cc \
$(CERES_SRC_PATH)/generated/schur_eliminator_4_4_d.cc
ifndef CERES_GLOG_DIR
LOCAL_SRC_FILES += $(CERES_SRC_PATH)/miniglog/glog/logging.cc
endif
LOCAL_MODULE := ceres
include $(BUILD_STATIC_LIBRARY)