diff --git a/.gitignore b/.gitignore index b1aac9362..f1e49dd9d 100644 --- a/.gitignore +++ b/.gitignore @@ -24,6 +24,9 @@ CMakeSettings.json # Output bin/ +bin-int/ +**/bin +**/bin-int lib/ x64/ # QtCreator diff --git a/contrib/assimp_contrib.lua b/contrib/assimp_contrib.lua index cb3385e03..29058e226 100644 --- a/contrib/assimp_contrib.lua +++ b/contrib/assimp_contrib.lua @@ -77,7 +77,7 @@ OppenddlparserSourceFiles = { "%{ContribPath}/openddlparser/include/openddlparser/DDLNode.h", "%{ContribPath}/openddlparser/include/openddlparser/Value.h" } -AddSourceFilesContrib(OppenddlparserSourceFiles) +--AddSourceFilesContrib(OppenddlparserSourceFiles) Open3dgcSourceFiles = { diff --git a/premake5.lua b/premake5.lua index be25314c3..d55c12712 100644 --- a/premake5.lua +++ b/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"