Added support for enabeling non free C4D importer

pull/5484/head
Laurenz Kraus 2023-11-27 20:24:12 +01:00
parent a90b5bac9f
commit adfe838cfe
3 changed files with 14 additions and 13 deletions

3
.gitignore vendored
View File

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

View File

@ -77,7 +77,7 @@ OppenddlparserSourceFiles = {
"%{ContribPath}/openddlparser/include/openddlparser/DDLNode.h", "%{ContribPath}/openddlparser/include/openddlparser/DDLNode.h",
"%{ContribPath}/openddlparser/include/openddlparser/Value.h" "%{ContribPath}/openddlparser/include/openddlparser/Value.h"
} }
AddSourceFilesContrib(OppenddlparserSourceFiles) --AddSourceFilesContrib(OppenddlparserSourceFiles)
Open3dgcSourceFiles = { Open3dgcSourceFiles = {

View File

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