Merge pull request #1159 from assimp/issues-1155
closes https://github.com/assimp/assimp/issues/1155: remove deprecatedpull/1161/head
Kim Kulling
GitHub
commit
a046268a67
|
|
@ -1,124 +0,0 @@
|
|||
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)
|
||||
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/irrXML/irrXML.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
|
||||
|
||||
# can't be disabled? rudamentary function?
|
||||
# -DASSIMP_BUILD_NO_FLIPWINDING_PROCESS \
|
||||
#
|
||||
DontBuildProcess = \
|
||||
-DASSIMP_BUILD_NO_FLIPUVS_PROCESS \
|
||||
-DASSIMP_BUILD_NO_MAKELEFTHANDED_PROCESS \
|
||||
-DASSIMP_BUILD_NO_CALCTANGENTS_PROCESS \
|
||||
-DASSIMP_BUILD_NO_DEBONE_PROCESS \
|
||||
-DASSIMP_BUILD_NO_FINDDEGENERATES_PROCESS \
|
||||
-DASSIMP_BUILD_NO_FINDINSTANCES_PROCESS \
|
||||
-DASSIMP_BUILD_NO_FINDINVALIDDATA_PROCESS \
|
||||
-DASSIMP_BUILD_NO_FIXINFACINGNORMALS_PROCESS \
|
||||
-DASSIMP_BUILD_NO_GENFACENORMALS_PROCESS \
|
||||
-DASSIMP_BUILD_NO_GENUVCOORDS_PROCESS \
|
||||
-DASSIMP_BUILD_NO_GENVERTEXNORMALS_PROCESS \
|
||||
-DASSIMP_BUILD_NO_IMPROVECACHELOCALITY_PROCESS \
|
||||
-DASSIMP_BUILD_NO_JOINVERTICES_PROCESS \
|
||||
-DASSIMP_BUILD_NO_LIMITBONEWEIGHTS_PROCESS \
|
||||
-DASSIMP_BUILD_NO_OPTIMIZEGRAPH_PROCESS \
|
||||
-DASSIMP_BUILD_NO_OPTIMIZEMESHES_PROCESS \
|
||||
-DASSIMP_BUILD_NO_PRETRANSFORMVERTICES_PROCESS \
|
||||
-DASSIMP_BUILD_NO_REMOVEVC_PROCESS \
|
||||
-DASSIMP_BUILD_NO_REMOVE_REDUNDANTMATERIALS_PROCESS \
|
||||
-DASSIMP_BUILD_NO_SORTBYPTYPE_PROCESS \
|
||||
-DASSIMP_BUILD_NO_SPLITBYBONECOUNT_PROCESS \
|
||||
-DASSIMP_BUILD_NO_SPLITLARGEMESHES_PROCESS \
|
||||
-DASSIMP_BUILD_NO_TRANSFORMTEXCOORDS_PROCESS \
|
||||
-DASSIMP_BUILD_NO_TRIANGULATE_PROCESS \
|
||||
-DASSIMP_BUILD_NO_VALIDATEDS_PROCESS
|
||||
|
||||
DontBuildImporters = \
|
||||
-DASSIMP_BUILD_NO_X_IMPORTER \
|
||||
-DASSIMP_BUILD_NO_3DS_IMPORTER \
|
||||
-DASSIMP_BUILD_NO_MD3_IMPORTER \
|
||||
-DASSIMP_BUILD_NO_MDL_IMPORTER \
|
||||
-DASSIMP_BUILD_NO_MD2_IMPORTER \
|
||||
-DASSIMP_BUILD_NO_PLY_IMPORTER \
|
||||
-DASSIMP_BUILD_NO_ASE_IMPORTER \
|
||||
-DASSIMP_BUILD_NO_HMP_IMPORTER \
|
||||
-DASSIMP_BUILD_NO_SMD_IMPORTER \
|
||||
-DASSIMP_BUILD_NO_MDC_IMPORTER \
|
||||
-DASSIMP_BUILD_NO_MD5_IMPORTER \
|
||||
-DASSIMP_BUILD_NO_STL_IMPORTER \
|
||||
-DASSIMP_BUILD_NO_LWO_IMPORTER \
|
||||
-DASSIMP_BUILD_NO_DXF_IMPORTER \
|
||||
-DASSIMP_BUILD_NO_NFF_IMPORTER \
|
||||
-DASSIMP_BUILD_NO_RAW_IMPORTER \
|
||||
-DASSIMP_BUILD_NO_OFF_IMPORTER \
|
||||
-DASSIMP_BUILD_NO_AC_IMPORTER \
|
||||
-DASSIMP_BUILD_NO_BVH_IMPORTER \
|
||||
-DASSIMP_BUILD_NO_IRRMESH_IMPORTER \
|
||||
-DASSIMP_BUILD_NO_IRR_IMPORTER \
|
||||
-DASSIMP_BUILD_NO_Q3D_IMPORTER \
|
||||
-DASSIMP_BUILD_NO_B3D_IMPORTER \
|
||||
-DASSIMP_BUILD_NO_COLLADA_IMPORTER \
|
||||
-DASSIMP_BUILD_NO_TERRAGEN_IMPORTER \
|
||||
-DASSIMP_BUILD_NO_CSM_IMPORTER \
|
||||
-DASSIMP_BUILD_NO_3D_IMPORTER \
|
||||
-DASSIMP_BUILD_NO_LWS_IMPORTER \
|
||||
-DASSIMP_BUILD_NO_OGRE_IMPORTER \
|
||||
-DASSIMP_BUILD_NO_MS3D_IMPORTER \
|
||||
-DASSIMP_BUILD_NO_COB_IMPORTER \
|
||||
-DASSIMP_BUILD_NO_Q3BSP_IMPORTER \
|
||||
-DASSIMP_BUILD_NO_NDO_IMPORTER \
|
||||
-DASSIMP_BUILD_NO_IFC_IMPORTER \
|
||||
-DASSIMP_BUILD_NO_XGL_IMPORTER \
|
||||
-DASSIMP_BUILD_NO_FBX_IMPORTER \
|
||||
-DASSIMP_BUILD_NO_C4D_IMPORTER \
|
||||
-DASSIMP_BUILD_NO_OPENGEX_IMPORTER \
|
||||
-DASSIMP_BUILD_NO_ASSBIN_IMPORTER
|
||||
# -DASSIMP_BUILD_NO_BLEND_IMPORTER \
|
||||
# -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
|
||||
|
||||
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) -DASSIMP_BUILD_NO_EXPORT -DOPENDDL_NO_USE_CPP11 $(DontBuildImporters) # $(DontBuildProcess)
|
||||
|
||||
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)
|
||||
|
||||
include $(CLEAR_VARS)
|
||||
LOCAL_MODULE := assimp
|
||||
|
||||
LOCAL_CFLAGS += -UASSIMP_BUILD_DLL_EXPORT
|
||||
LOCAL_WHOLE_STATIC_LIBRARIES = assimp_static
|
||||
|
||||
LOCAL_LDLIBS := -lz
|
||||
|
||||
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/include $(LOCAL_PATH)/$(ASSIMP_SRC_DIR)/BoostWorkaround
|
||||
include $(BUILD_SHARED_LIBRARY)
|
||||
|
||||
-include $(LOCAL_PATH)/assimp_cmd.mk
|
||||
|
||||
# let it on original place
|
||||
include $(LOCAL_PATH)/port/jassimp/jassimp-native/Android.mk
|
||||
|
|
@ -1,8 +0,0 @@
|
|||
ifeq ($(CC),clang)
|
||||
NDK_TOOLCHAIN_VERSION := $(CC)
|
||||
$(info "Use llvm Compiler")
|
||||
endif
|
||||
|
||||
APP_ABI := armeabi-v7a
|
||||
|
||||
APP_STL := stlport_static
|
||||
File diff suppressed because it is too large
Load Diff
|
|
@ -1,6 +0,0 @@
|
|||
The xcode project files in this directory are contributed by Andy Maloney and are not continuously updated.
|
||||
Currently, it's for Assimp r352. If you're using a newer revision, watch out for missing files/includes/...
|
||||
|
||||
See Andy's description at
|
||||
http://sourceforge.net/tracker/index.php?func=detail&aid=2659135&group_id=226462&atid=1067634 (Tracker item 2659135)
|
||||
for more information.
|
||||
File diff suppressed because it is too large
Load Diff
|
|
@ -1,7 +0,0 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<Workspace
|
||||
version = "1.0">
|
||||
<FileRef
|
||||
location = "self:Assimp.xcodeproj">
|
||||
</FileRef>
|
||||
</Workspace>
|
||||
|
|
@ -1,80 +0,0 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<Scheme
|
||||
LastUpgradeVersion = "0700"
|
||||
version = "1.3">
|
||||
<BuildAction
|
||||
parallelizeBuildables = "YES"
|
||||
buildImplicitDependencies = "YES">
|
||||
<BuildActionEntries>
|
||||
<BuildActionEntry
|
||||
buildForTesting = "YES"
|
||||
buildForRunning = "YES"
|
||||
buildForProfiling = "YES"
|
||||
buildForArchiving = "YES"
|
||||
buildForAnalyzing = "YES">
|
||||
<BuildableReference
|
||||
BuildableIdentifier = "primary"
|
||||
BlueprintIdentifier = "7F79227F1AB43AC3005A8E5D"
|
||||
BuildableName = "libassimp.a"
|
||||
BlueprintName = "assimp"
|
||||
ReferencedContainer = "container:workspaces/xcode6/Assimp.xcodeproj">
|
||||
</BuildableReference>
|
||||
</BuildActionEntry>
|
||||
</BuildActionEntries>
|
||||
</BuildAction>
|
||||
<TestAction
|
||||
buildConfiguration = "Debug"
|
||||
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
|
||||
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
|
||||
shouldUseLaunchSchemeArgsEnv = "YES">
|
||||
<Testables>
|
||||
</Testables>
|
||||
<AdditionalOptions>
|
||||
</AdditionalOptions>
|
||||
</TestAction>
|
||||
<LaunchAction
|
||||
buildConfiguration = "Debug"
|
||||
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
|
||||
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
|
||||
launchStyle = "0"
|
||||
useCustomWorkingDirectory = "NO"
|
||||
ignoresPersistentStateOnLaunch = "NO"
|
||||
debugDocumentVersioning = "YES"
|
||||
debugServiceExtension = "internal"
|
||||
allowLocationSimulation = "YES">
|
||||
<MacroExpansion>
|
||||
<BuildableReference
|
||||
BuildableIdentifier = "primary"
|
||||
BlueprintIdentifier = "7F79227F1AB43AC3005A8E5D"
|
||||
BuildableName = "libassimp.a"
|
||||
BlueprintName = "assimp"
|
||||
ReferencedContainer = "container:workspaces/xcode6/Assimp.xcodeproj">
|
||||
</BuildableReference>
|
||||
</MacroExpansion>
|
||||
<AdditionalOptions>
|
||||
</AdditionalOptions>
|
||||
</LaunchAction>
|
||||
<ProfileAction
|
||||
buildConfiguration = "Release"
|
||||
shouldUseLaunchSchemeArgsEnv = "YES"
|
||||
savedToolIdentifier = ""
|
||||
useCustomWorkingDirectory = "NO"
|
||||
debugDocumentVersioning = "YES">
|
||||
<MacroExpansion>
|
||||
<BuildableReference
|
||||
BuildableIdentifier = "primary"
|
||||
BlueprintIdentifier = "7F79227F1AB43AC3005A8E5D"
|
||||
BuildableName = "libassimp.a"
|
||||
BlueprintName = "assimp"
|
||||
ReferencedContainer = "container:workspaces/xcode6/Assimp.xcodeproj">
|
||||
</BuildableReference>
|
||||
</MacroExpansion>
|
||||
</ProfileAction>
|
||||
<AnalyzeAction
|
||||
buildConfiguration = "Debug">
|
||||
</AnalyzeAction>
|
||||
<ArchiveAction
|
||||
buildConfiguration = "Release"
|
||||
revealArchiveInOrganizer = "YES">
|
||||
</ArchiveAction>
|
||||
</Scheme>
|
||||
Loading…
Reference in New Issue