From 947429152f6bbbc12f639770128484c3c976a93b Mon Sep 17 00:00:00 2001 From: Ser Lev Arris Date: Sun, 22 Mar 2015 18:27:06 +0100 Subject: [PATCH] finishing. also skip filtering C4D importer due fixed in https://github.com/assimp/assimp/commit/14324c60cf7aa092250ed71e23387cffa4a15aa6 --- workspaces/Android-NDK/jni/Android.mk | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/workspaces/Android-NDK/jni/Android.mk b/workspaces/Android-NDK/jni/Android.mk index a0255f85c..0d9f4981d 100755 --- a/workspaces/Android-NDK/jni/Android.mk +++ b/workspaces/Android-NDK/jni/Android.mk @@ -3,27 +3,17 @@ LOCAL_PATH := $(call my-dir)/../../../ include $(CLEAR_VARS) LOCAL_MODULE := assimp_static ASSIMP_SRC_DIR = code -FILE_LIST := $(wildcard $(LOCAL_PATH)/$(ASSIMP_SRC_DIR)/*.cpp) -IGNORE_LIST := $(wildcard $(LOCAL_PATH)/$(ASSIMP_SRC_DIR)/C4D*.cpp) -EXCLUDES := $(IGNORE_LIST:$(LOCAL_PATH)/%=%) -ALL_SRC_FILES := $(FILE_LIST:$(LOCAL_PATH)/%=%) -LOCAL_SRC_FILES := $(filter-out $(EXCLUDES), $(ALL_SRC_FILES)) +FILE_LIST := $(wildcard $(LOCAL_PATH)/$(ASSIMP_SRC_DIR)/*.cpp) +FILE_LIST += $(wildcard $(LOCAL_PATH)/contrib/openddlparser/code/*.cpp) +FILE_LIST += $(wildcard $(LOCAL_PATH)/contrib/unzip/*.c) +FILE_LIST += $(wildcard $(LOCAL_PATH)/contrib/poly2tri/poly2tri/*/*.cc) + +LOCAL_SRC_FILES := $(FILE_LIST:$(LOCAL_PATH)/%=%) LOCAL_SRC_FILES += contrib/clipper/clipper.cpp \ contrib/ConvertUTF/ConvertUTF.c \ - contrib/unzip/ioapi.c \ - contrib/unzip/unzip.c \ - contrib/irrXML/irrXML.cpp \ - contrib/poly2tri/poly2tri/sweep/advancing_front.cc \ - contrib/poly2tri/poly2tri/sweep/sweep_context.cc \ - contrib/poly2tri/poly2tri/sweep/sweep.cc \ - contrib/poly2tri/poly2tri/sweep/cdt.cc \ - contrib/poly2tri/poly2tri/common/shapes.cc - -LOCAL_SRC_FILES += contrib/openddlparser/code/OpenDDLParser.cpp \ - contrib/openddlparser/code/DDLNode.cpp \ - contrib/openddlparser/code/Value.cpp + contrib/irrXML/irrXML.cpp # enables -frtti and -fexceptions LOCAL_CPP_FEATURES := exceptions