[+] Building AMF-importer.

diff --git a/code/CMakeLists.txt b/code/CMakeLists.txt
index b1e0256..0320ecd 100644 (file)
--- a/code/CMakeLists.txt
+++ b/code/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Open Asset Import Library (assimp)
+# Open Asset Import Library (assimp)
 # ----------------------------------------------------------------------
 #
 # Copyright (c) 2006-2016, assimp team
@@ -202,6 +202,16 @@ SET(ASSIMP_LOADER_SRCS "")
 SET(ASSIMP_IMPORTERS_ENABLED "") # list of enabled importers
 SET(ASSIMP_IMPORTERS_DISABLED "") # disabled list (used to print)
 
+ADD_ASSIMP_IMPORTER( AMF
+  AMFImporter.hpp
+  AMFImporter_Macro.hpp
+  AMFImporter_Node.hpp
+  AMFImporter.cpp
+  AMFImporter_Geometry.cpp
+  AMFImporter_Material.cpp
+  AMFImporter_Postprocess.cpp
+)
+
 ADD_ASSIMP_IMPORTER( 3DS
   3DSConverter.cpp
   3DSHelper.h

diff --git a/code/ImporterRegistry.cpp b/code/ImporterRegistry.cpp
index d6a1759..af56f06 100644 (file)
--- a/code/ImporterRegistry.cpp
+++ b/code/ImporterRegistry.cpp
@@ -1,4 +1,4 @@
-/*
+/*
 ---------------------------------------------------------------------------
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
@@ -53,6 +53,9 @@ corresponding preprocessor flag to selectively disable formats.
 #ifndef ASSIMP_BUILD_NO_X_IMPORTER
 #   include "XFileImporter.h"
 #endif
+#ifndef ASSIMP_BUILD_NO_AMF_IMPORTER
+#   include "AMFImporter.hpp"
+#endif
 #ifndef ASSIMP_BUILD_NO_3DS_IMPORTER
 #   include "3DSLoader.h"
 #endif
@@ -199,6 +202,9 @@ void GetImporterInstanceList(std::vector< BaseImporter* >& out)
 #if (!defined ASSIMP_BUILD_NO_OBJ_IMPORTER)
     out.push_back( new ObjFileImporter());
 #endif
+#ifndef ASSIMP_BUILD_NO_AMF_IMPORTER
+       out.push_back( new AMFImporter() );
+#endif
 #if (!defined ASSIMP_BUILD_NO_3DS_IMPORTER)
     out.push_back( new Discreet3DSImporter());
 #endif