Merge branch 'master' of https://github.com/Krausler/Assimp

.gitignore

@@ -24,6 +24,9 @@ CMakeSettings.json
 
 # Output
 bin/
+bin-int/
+**/bin
+**/bin-int
 lib/
 x64/
 # QtCreator

premake5.lua

@@ -7,19 +7,9 @@ group "Dependencies"
     include "contrib/zlib"
     include "contrib/zip"
     include "contrib/pugixml"
-    --include "contrib/openddlparser"
+    include "contrib/openddlparser"
 group ""
 
-workspace "Assimp Test"
-    architecture "x86_64"
-    
-    configurations
-    {
-        "Debug",
-        "Release"
-    }
-
-
 project "Assimp"
     kind "StaticLib"
     language "C++"
@@ -43,7 +33,8 @@ project "Assimp"
     {
         "zlib",
         "zip",
-        "pugixml"
+        "pugixml",
+        "openddlparser"
     }
     
     includedirs
@@ -62,6 +53,13 @@ project "Assimp"
         "OPENDDLPARSER_BUILD"
     }
 
+    if (AssimpEnableNoneFreeC4DImporter == false) then
+        defines
+        {
+            "ASSIMP_BUILD_NO_C4D_IMPORTER"
+        }
+    end
+
     filter "system:linux"
         pic "On"
 		systemversion "latest"