From e1b3422381d6bf328bba510b7e56d5fd7f1ab9e5 Mon Sep 17 00:00:00 2001 From: Laurenz Kraus Date: Wed, 29 Nov 2023 17:35:46 +0100 Subject: [PATCH 1/2] ahhhh --- code/assimp_code.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/assimp_code.lua b/code/assimp_code.lua index 7fa9cd89a..274cd6da1 100644 --- a/code/assimp_code.lua +++ b/code/assimp_code.lua @@ -142,7 +142,7 @@ AssimpLoggingSourceFiles = { AddSourceFilesCode(AssimpLoggingSourceFiles) AssimpCommonSourceFiles = { - "%{CodePath}/Common/Assimp.cpp" + "%{CodePath}/Common/Assimp.cpp", "%{CodePath}/Common/StbCommon.h", "%{CodePath}/Common/Compression.cpp", "%{CodePath}/Common/Compression.h", From 1263d300c1d5b93b0201888f40aecffb8151e301 Mon Sep 17 00:00:00 2001 From: Laurenz Kraus Date: Thu, 30 Nov 2023 20:17:14 +0100 Subject: [PATCH 2/2] Added build no export define --- code/assimp_code.lua | 2 -- premake5.lua | 8 +++++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/code/assimp_code.lua b/code/assimp_code.lua index 274cd6da1..ea8e81d84 100644 --- a/code/assimp_code.lua +++ b/code/assimp_code.lua @@ -12,8 +12,6 @@ AssimpImporterSourceFilesIndex = 0 AssimpExporterSourceFiles = {} AssimpExporterSourceFilesIndex = 0 - - function AddSourceFilesCode(sourceFiles) for _, file in ipairs(sourceFiles) do AssimpSourceFiles[AssimpSourceFilesIndex] = file diff --git a/premake5.lua b/premake5.lua index a97f3d79f..fc562794a 100644 --- a/premake5.lua +++ b/premake5.lua @@ -48,7 +48,6 @@ project "Assimp" defines { - --"ASSIMP_DOUBLE_PRECISION" "RAPIDJSON_HAS_STDSTRING", "OPENDDLPARSER_BUILD" } @@ -59,6 +58,13 @@ project "Assimp" "ASSIMP_BUILD_NO_C4D_IMPORTER" } end + + if (AssimpIncludeExporters == true) then + defines + { + "ASSIMP_BUILD_NO_EXPORT" + } + end -- OS specific filter "system:linux"