From 18eca1897eedecf22b3157bb6aa6393673d74c4f Mon Sep 17 00:00:00 2001 From: Xiao Qi Date: Sat, 24 Sep 2022 22:52:42 +0800 Subject: [PATCH] Added in post build command to copy assimp dll Added in SH_API to asset manager class --- SHADE_Application/premake5.lua | 3 ++- SHADE_Engine/premake5.lua | 8 +++++++- SHADE_Engine/src/Assets/SHAssetManager.h | 14 +++----------- 3 files changed, 12 insertions(+), 13 deletions(-) diff --git a/SHADE_Application/premake5.lua b/SHADE_Application/premake5.lua index 50bd41b2..2d214d92 100644 --- a/SHADE_Application/premake5.lua +++ b/SHADE_Application/premake5.lua @@ -33,7 +33,8 @@ project "SHADE_Application" "%{IncludeDir.spdlog}/include", "%{IncludeDir.VULKAN}/include", "%{IncludeDir.VMA}/include", - "%{IncludeDir.VULKAN}/Source/SPIRV-Reflect" + "%{IncludeDir.VULKAN}/Source/SPIRV-Reflect", + "%{IncludeDir.tinyddsloader}" } externalwarnings "Off" diff --git a/SHADE_Engine/premake5.lua b/SHADE_Engine/premake5.lua index e8a4992b..842cf00a 100644 --- a/SHADE_Engine/premake5.lua +++ b/SHADE_Engine/premake5.lua @@ -103,9 +103,15 @@ project "SHADE_Engine" { "xcopy /s /r /y /q \"%{IncludeDir.spdlog}\\bin\" \"$(OutDir)\"", "xcopy /r /y /q \"%{IncludeDir.SDL}\\lib\\SDL2.dll\" \"$(OutDir)\"", - "xcopy /s /r /y /q \"%{IncludeDir.dotnet}\\bin\" \"$(OutDir)\"" + "xcopy /s /r /y /q \"%{IncludeDir.dotnet}\\bin\" \"$(OutDir)\"" } + filter "configurations:Debug" + postbuildcommands {"xcopy /r /y /q \"%{IncludeDir.assimp}\\bin\\Debug\\assimp-vc142-mtd.dll\" \"$(OutDir)\""} + + filter "configurations:Release" + postbuildcommands {"xcopy /r /y /q \"%{IncludeDir.assimp}\\bin\\Release\\assimp-vc142-mt.dll\" \"$(OutDir)\""} + warnings 'Extra' filter "configurations:Debug" diff --git a/SHADE_Engine/src/Assets/SHAssetManager.h b/SHADE_Engine/src/Assets/SHAssetManager.h index 99ad602b..f9ebe6f3 100644 --- a/SHADE_Engine/src/Assets/SHAssetManager.h +++ b/SHADE_Engine/src/Assets/SHAssetManager.h @@ -8,23 +8,17 @@ * or disclosure of this file or its contents without the prior * written consent of Digipen Institute of Technology is prohibited. ******************************************************************************/ -#ifndef SH_RESOURCE_MANAGER_H -#define SH_RESOURCE_MANAGER_H - -#include -#include -#include +#pragma once #include "tinyddsloader.h" #include "SHAsset.h" #include "Asset Types/SHMeshAsset.h" #include "Asset Types/SHDDSAsset.h" - -struct _MonoMethod; +#include "SH_API.h" namespace SHADE { - class SHAssetManager + class SH_API SHAssetManager { public: /**************************************************************************** @@ -134,5 +128,3 @@ namespace SHADE static std::unordered_map ddsCollection; }; } - -#endif // !SH_RESOURCE_MANAGER_H