From 527bf8c255e04bb1806c53a887c27bb0845eef83 Mon Sep 17 00:00:00 2001 From: Ser Lev Arris Date: Sat, 21 Mar 2015 12:35:29 +0100 Subject: [PATCH] bit cleanup and wait untip issue #506 is fixed --- workspaces/Android-NDK/jni/Android.mk | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/workspaces/Android-NDK/jni/Android.mk b/workspaces/Android-NDK/jni/Android.mk index 09f8eeb84..08a16bd55 100755 --- a/workspaces/Android-NDK/jni/Android.mk +++ b/workspaces/Android-NDK/jni/Android.mk @@ -24,6 +24,9 @@ LOCAL_SRC_FILES += contrib/clipper/clipper.cpp \ # enables -frtti and -fexceptions LOCAL_CPP_FEATURES := exceptions +# identifier 'nullptr' will become a keyword in C++0x [-Wc++0x-compat] +# but next breaks blender and other importer +# LOCAL_CFLAGS += -std=c++11 # cant be disabled? rudamentary function? # -DASSIMP_BUILD_NO_FLIPWINDING_PROCESS \ @@ -99,15 +102,14 @@ DontBuildImporters = \ # -DASSIMP_BUILD_NO_GEO_IMPORTER # -DASSIMP_BUILD_NO_OBJ_IMPORTER \ # -DontBuildImporters := -DASSIMP_BUILD_NO_IFC_IMPORTER -DASSIMP_BUILD_NO_IRRMESH_IMPORTER -DASSIMP_BUILD_NO_IRR_IMPORTER -DASSIMP_BUILD_NO_C4D_IMPORTER -DASSIMP_BUILD_NO_OPENGEX_IMPORTER +DontBuildImporters := -DASSIMP_BUILD_NO_IFC_IMPORTER -DASSIMP_BUILD_NO_IRRMESH_IMPORTER -DASSIMP_BUILD_NO_IRR_IMPORTER -DASSIMP_BUILD_NO_C4D_IMPORTER -ASSIMP_FLAGS_3_0 = -DASSIMP_BUILD_DLL_EXPORT -DASSIMP_BUILD_NO_OWN_ZLIB -DASSIMP_BUILD_BOOST_WORKAROUND -Dassimp_EXPORTS -fPIC -fvisibility=hidden -Wall # $(DontBuildProcess) -ASSIMP_FLAGS_3_1 = $(ASSIMP_FLAGS_3_0) # -DASSIMP_BUILD_BLENDER_DEBUG # -DASSIMP_BUILD_NO_EXPORT +ASSIMP_FLAGS_3_0 = -DASSIMP_BUILD_DLL_EXPORT -DASSIMP_BUILD_NO_OWN_ZLIB -DASSIMP_BUILD_BOOST_WORKAROUND -Dassimp_EXPORTS -fPIC -fvisibility=hidden -Wall +ASSIMP_FLAGS_3_1 = $(ASSIMP_FLAGS_3_0) # -DASSIMP_BUILD_BLENDER_DEBUG -LOCAL_CFLAGS += $(ASSIMP_FLAGS_3_1) $(DontBuildImporters) -DASSIMP_BUILD_NO_EXPORT -#LOCAL_CXXFLAGS += $(ASSIMP_FLAGS_3_1) # -funwind-tables +LOCAL_CFLAGS += $(ASSIMP_FLAGS_3_1) -DASSIMP_BUILD_NO_EXPORT $(DontBuildImporters) # $(DontBuildProcess) -LOCAL_C_INCLUDES += $(LOCAL_PATH)/include $(LOCAL_PATH)/$(ASSIMP_SRC_DIR)/BoostWorkaround ./ +LOCAL_C_INCLUDES += $(LOCAL_PATH)/include $(LOCAL_PATH)/$(ASSIMP_SRC_DIR)/BoostWorkaround $(LOCAL_PATH)/contrib/openddlparser/include ./ LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/include $(LOCAL_PATH)/$(ASSIMP_SRC_DIR)/BoostWorkaround include $(BUILD_STATIC_LIBRARY)