LADI
/
OpenNI2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Switch to using common android makefile

This commit is contained in:
Eddie Cohen 2013-10-23 11:08:32 +03:00 committed by eddie.cohen
parent 4fda0e4278
commit dc432118f7
8 changed files with 60 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
Android.mk
View File

@ -14,31 +14,5 @@
# limitations under the License.
############################################################
# This makefile builds OpenNI and its drivers.
# No samples are built.
############################################################
# Check if we're building from OS or NDK
ifdef TARGET_BUILD_VARIANT
OPENNI2_ANDROID_OS_BUILD := true
else
OPENNI2_ANDROID_NDK_BUILD := true
endif
# Setup OpenNI2 local variables
OPENNI2_CFLAGS := -O3 -ftree-vectorize -ffast-math -funroll-loops -fPIC -fvisibility=hidden
ifeq ($(ARCH_ARM_HAVE_ARMV7A),true)
OPENNI2_CFLAGS += -march=armv7-a -mfloat-abi=softfp -mtune=cortex-a9 -mfpu=vfp
endif
ifeq ($(ARCH_ARM_HAVE_NEON),true)
OPENNI2_CFLAGS += -mfpu=neon -DHAVE_NEON=1 -flax-vector-conversions
endif
# Recurse through all subdirs
include $(call all-makefiles-under, $(call my-dir)/Source)
# Cleanup the local variables
OPENNI2_CFLAGS :=
include $(call all-subdir-makefiles)

14
Source/Core/Android.mk
View File

@ -17,13 +17,15 @@ LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
include $(LOCAL_PATH)/../../ThirdParty/PSCommon/BuildSystem/CommonAndroid.mk
# Sources
MY_SRC_FILES := \
$(LOCAL_PATH)/*.cpp \
$(LOCAL_PATH)/../Drivers/OniFile/Formats/XnCodec.cpp \
$(LOCAL_PATH)/../Drivers/OniFile/Formats/XnStreamCompression.cpp
ifdef OPENNI2_ANDROID_NDK_BUILD
ifdef PS_NDK_BUILD
MY_SRC_FILES += $(LOCAL_PATH)/../../ThirdParty/LibJPEG/*.c
endif
@ -31,7 +33,7 @@ MY_SRC_FILE_EXPANDED := $(wildcard $(MY_SRC_FILES))
LOCAL_SRC_FILES := $(MY_SRC_FILE_EXPANDED:$(LOCAL_PATH)/%=%)
# C/CPP Flags
LOCAL_CFLAGS += $(OPENNI2_CFLAGS) -DOPENNI2_EXPORT
LOCAL_CFLAGS += -DOPENNI2_EXPORT
# Includes
LOCAL_C_INCLUDES := \
@ -39,8 +41,7 @@ LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/../Drivers/OniFile/Formats \
$(LOCAL_PATH)/../Drivers/OniFile
ifdef OPENNI2_ANDROID_NDK_BUILD
ifdef PS_NDK_BUILD
LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../ThirdParty/LibJPEG
else
LOCAL_C_INCLUDES += external/jpeg
@ -53,13 +54,10 @@ LOCAL_LDFLAGS := -Wl,--export-dynamic
# Dependencies
LOCAL_STATIC_LIBRARIES := XnLib
LOCAL_SHARED_LIBRARIES := liblog libdl
ifdef OPENNI2_ANDROID_OS_BUILD
ifdef PS_OS_BUILD
LOCAL_SHARED_LIBRARIES += libjpeg
LOCAL_REQUIRED_MODULES = libPS1080 libOniFile
else
LOCAL_LDLIBS += -llog
endif
# Output

16
Source/DepthUtils/Android.mk
View File

@ -17,6 +17,8 @@ LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
include $(LOCAL_PATH)/../../ThirdParty/PSCommon/BuildSystem/CommonAndroid.mk
# Sources
MY_SRC_FILES := \
$(LOCAL_PATH)/*.cpp \
@ -24,15 +26,15 @@ MY_SRC_FILES := \
MY_SRC_FILE_EXPANDED := $(wildcard $(MY_SRC_FILES))
LOCAL_SRC_FILES := $(MY_SRC_FILE_EXPANDED:$(LOCAL_PATH)/%=%)
# C/CPP Flags
LOCAL_CFLAGS += $(OPENNI2_CFLAGS)
# Includes
LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/../../Include \
$(LOCAL_PATH)/../../ThirdParty/PSCommon/XnLib/Include \
LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../Include
LOCAL_STATIC_LIBRARIES := XnLib
# Output
LOCAL_MODULE := DepthUtils
include $(BUILD_STATIC_LIBRARY)
#include XnLib
include $(LOCAL_PATH)/../../ThirdParty/PSCommon/XnLib/Source/Android.mk

28
Source/Drivers/OniFile/Android.mk
View File

@ -17,22 +17,21 @@ LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
include $(LOCAL_PATH)/../../../ThirdParty/PSCommon/BuildSystem/CommonAndroid.mk
# Sources
MY_SRC_FILES := \
$(LOCAL_PATH)/*.cpp \
$(LOCAL_PATH)/Formats/*.cpp \
$(LOCAL_PATH)/XnLibExtensions/*.cpp
ifdef OPENNI2_ANDROID_NDK_BUILD
MY_SRC_FILES += $(LOCAL_PATH)/../../../ThirdParty/LibJPEG/*.c
endif
ifdef PS_NDK_BUILD
MY_SRC_FILES += $(LOCAL_PATH)/../../../ThirdParty/LibJPEG/*.c
endif
MY_SRC_FILE_EXPANDED := $(wildcard $(MY_SRC_FILES))
LOCAL_SRC_FILES := $(MY_SRC_FILE_EXPANDED:$(LOCAL_PATH)/%=%)
# C/CPP Flags
LOCAL_CFLAGS += $(OPENNI2_CFLAGS)
# Includes
LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/. \
@ -40,20 +39,17 @@ LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/../../../ThirdParty/LibJPEG \
$(LOCAL_PATH)/Formats
ifdef OPENNI2_ANDROID_NDK_BUILD
LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../ThirdParty/LibJPEG
ifdef PS_NDK_BUILD
LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../ThirdParty/LibJPEG
else
LOCAL_C_INCLUDES += external/jpeg
endif
LOCAL_C_INCLUDES += external/jpeg
endif
# Dependencies
LOCAL_STATIC_LIBRARIES := XnLib
LOCAL_SHARED_LIBRARIES := liblog
ifdef OPENNI2_ANDROID_OS_BUILD
LOCAL_SHARED_LIBRARIES += libjpeg
else
LOCAL_LDLIBS += -llog
ifdef PS_OS_BUILD
LOCAL_SHARED_LIBRARIES += libjpeg
endif
# Output

17
Source/Drivers/PS1080/Android.mk
View File

@ -17,6 +17,8 @@ LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
include $(LOCAL_PATH)/../../../ThirdParty/PSCommon/BuildSystem/CommonAndroid.mk
# Sources
MY_SRC_FILES := \
$(LOCAL_PATH)/Core/*.cpp \
@ -26,16 +28,15 @@ MY_SRC_FILES := \
$(LOCAL_PATH)/Include/*.cpp \
$(LOCAL_PATH)/Sensor/*.cpp
ifdef OPENNI2_ANDROID_NDK_BUILD
ifdef PS_NDK_BUILD
MY_SRC_FILES += $(LOCAL_PATH)/../../../ThirdParty/LibJPEG/*.c
endif
endif
MY_SRC_FILE_EXPANDED := $(wildcard $(MY_SRC_FILES))
LOCAL_SRC_FILES := $(MY_SRC_FILE_EXPANDED:$(LOCAL_PATH)/%=%)
# C/CPP Flags
LOCAL_CFLAGS += $(OPENNI2_CFLAGS)
LOCAL_CPPFLAGS := -frtti
LOCAL_CPP_FEATURES := rtti
# Includes
LOCAL_C_INCLUDES := \
@ -44,7 +45,7 @@ LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/../../DepthUtils \
$(LOCAL_PATH)/../../../Include \
ifdef OPENNI2_ANDROID_NDK_BUILD
ifdef PS_NDK_BUILD
LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../../ThirdParty/LibJPEG
else
LOCAL_C_INCLUDES += external/jpeg
@ -52,9 +53,9 @@ endif
# Dependencies
LOCAL_STATIC_LIBRARIES := XnLib DepthUtils
LOCAL_SHARED_LIBRARIES := liblog libdl libusb libgabi++
LOCAL_SHARED_LIBRARIES := libusb
ifdef OPENNI2_ANDROID_OS_BUILD
ifdef PS_OS_BUILD
LOCAL_SHARED_LIBRARIES += libjpeg
else
LOCAL_LDLIBS += -llog

13
Source/Drivers/PSLink/Android.mk
View File

@ -2,6 +2,8 @@
LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
include $(LOCAL_PATH)/../../../ThirdParty/PSCommon/BuildSystem/CommonAndroid.mk
# set path to source
MY_PREFIX := $(LOCAL_PATH)
@ -23,17 +25,8 @@ LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/Protocols/XnLinkProto \
$(LOCAL_PATH)/LinkProtoLib \
LOCAL_CFLAGS:= -fvisibility=hidden -DXN_CORE_EXPORTS
LOCAL_LDFLAGS += -Wl,--export-dynamic
LOCAL_STATIC_LIBRARIES := XnLib
LOCAL_SHARED_LIBRARIES := liblog libdl libusb libgabi++
LOCAL_PREBUILT_LIBS := libc
ifndef OPENNI2_ANDROID_OS_BUILD
LOCAL_LDLIBS += -llog
endif
LOCAL_SHARED_LIBRARIES := libusb
LOCAL_MODULE := PSLink

14
ThirdParty/PSCommon/BuildSystem/CommonAndroid.mk vendored Normal file
View File

@ -0,0 +1,14 @@
# Check if we're building from OS or NDK
ifdef TARGET_BUILD_VARIANT
PS_OS_BUILD := true
else
PS_NDK_BUILD := true
endif
# Setup arm flags
LOCAL_CFLAGS += -O3 -ftree-vectorize -ffast-math -funroll-loops -fPIC -fvisibility=hidden
ifeq ($(ARCH_ARM_HAVE_NEON),true)
LOCAL_CFLAGS += -DHAVE_NEON=1 -flax-vector-conversions
LOCAL_ARM_NEON := true
endif

9
ThirdParty/PSCommon/XnLib/Source/Android.mk vendored
View File

@ -21,6 +21,8 @@ LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
include $(LOCAL_PATH)/../../BuildSystem/CommonAndroid.mk
# Sources
MY_SRC_FILES := \
$(LOCAL_PATH)/*.cpp \
@ -36,7 +38,7 @@ LOCAL_CFLAGS += $(OPENNI2_CFLAGS)
LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/../Include
ifndef TARGET_BUILD_VARIANT
ifdef PS_NDK_BUILD
# building from NDK
LOCAL_SHARED_LIBRARIES += usb
else
@ -44,15 +46,16 @@ else
endif
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../Include
LOCAL_EXPORT_LDLIBS := -llog
# Output
LOCAL_MODULE := XnLib
include $(BUILD_STATIC_LIBRARY)
ifndef TARGET_BUILD_VARIANT
ifdef PS_NDK_BUILD
# building from NDK. Include libusb
include $(LOCAL_PATH)/../ThirdParty/libusb-1.0.9-Android/Android.mk
endif
endif
endif