libgui|Assimp: Compiling with an unmodified Assimp

skyjake · Jun 25, 2017 · 5272413 · 5272413
1 parent c9c4b5f
commit 5272413
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/doomsday/sdk/libgui/CMakeLists.txt b/doomsday/sdk/libgui/CMakeLists.txt
@@ -52,6 +52,7 @@ if (DENG_ASSIMP_EMBEDDED)
     add_subdirectory (../../external/assimp assimp)
     set_property (TARGET assimp PROPERTY FOLDER Libraries)
     set (CMAKE_C_FLAGS ${oldCFlags})
+    add_definitions (-DDENG_HAVE_CUSTOMIZED_ASSIMP=1)
 endif ()
 #----------------------------------------------------------------------------------------
 

diff --git a/doomsday/sdk/libgui/src/graphics/modeldrawable.cpp b/doomsday/sdk/libgui/src/graphics/modeldrawable.cpp
@@ -647,6 +647,8 @@ DENG2_PIMPL(ModelDrawable)
     {
         LOG_GL_MSG("Loading model from %s") << file.description();
 
+#if defined (DENG_HAVE_CUSTOMIZED_ASSIMP)
+        {
         /*
          * MD5: Multiple animation sequences are supported via multiple .md5anim files.
          * Autodetect if these exist and make a list of their names.
@@ -667,6 +669,8 @@ DENG2_PIMPL(ModelDrawable)
             });
         }
         importer.SetPropertyString(AI_CONFIG_IMPORT_MD5_ANIM_SEQUENCE_NAMES, anims.toStdString());
+        }
+#endif
 
         scene = glData.scene = nullptr;
         sourcePath = file.path();