xiaoqi
/
SHADE_Y3
1
0
Fork 0
Code Issues 12 Pull Requests Packages Projects Releases 9 Wiki Activity

Added in post build command to copy assimp dll 

Added in SH_API to asset manager class
This commit is contained in:
Xiao Qi 2022-09-24 22:52:42 +08:00
parent a39230ce42
commit 18eca1897e
3 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
SHADE_Application/premake5.lua
View File

@ -33,7 +33,8 @@ project "SHADE_Application"
"%{IncludeDir.spdlog}/include", "%{IncludeDir.spdlog}/include",
"%{IncludeDir.VULKAN}/include", "%{IncludeDir.VULKAN}/include",
"%{IncludeDir.VMA}/include", "%{IncludeDir.VMA}/include",
"%{IncludeDir.VULKAN}/Source/SPIRV-Reflect" "%{IncludeDir.VULKAN}/Source/SPIRV-Reflect",
"%{IncludeDir.tinyddsloader}"
} }
externalwarnings "Off" externalwarnings "Off"

8
SHADE_Engine/premake5.lua
View File

@ -103,9 +103,15 @@ project "SHADE_Engine"
{ {
"xcopy /s /r /y /q \"%{IncludeDir.spdlog}\\bin\" \"$(OutDir)\"", "xcopy /s /r /y /q \"%{IncludeDir.spdlog}\\bin\" \"$(OutDir)\"",
"xcopy /r /y /q \"%{IncludeDir.SDL}\\lib\\SDL2.dll\" \"$(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' warnings 'Extra'
filter "configurations:Debug" filter "configurations:Debug"

14
SHADE_Engine/src/Assets/SHAssetManager.h
View File

@ -8,23 +8,17 @@
* or disclosure of this file or its contents without the prior * or disclosure of this file or its contents without the prior
* written consent of Digipen Institute of Technology is prohibited. * written consent of Digipen Institute of Technology is prohibited.
******************************************************************************/ ******************************************************************************/
#ifndef SH_RESOURCE_MANAGER_H #pragma once
#define SH_RESOURCE_MANAGER_H
#include <unordered_map>
#include <string>
#include <vector>
#include "tinyddsloader.h" #include "tinyddsloader.h"
#include "SHAsset.h" #include "SHAsset.h"
#include "Asset Types/SHMeshAsset.h" #include "Asset Types/SHMeshAsset.h"
#include "Asset Types/SHDDSAsset.h" #include "Asset Types/SHDDSAsset.h"
#include "SH_API.h"
struct _MonoMethod;
namespace SHADE namespace SHADE
{ {
class SHAssetManager class SH_API SHAssetManager
{ {
public: public:
/**************************************************************************** /****************************************************************************
@ -134,5 +128,3 @@ namespace SHADE
static std::unordered_map<AssetID, SHDDSAsset> ddsCollection; static std::unordered_map<AssetID, SHDDSAsset> ddsCollection;
}; };
} }
#endif // !SH_RESOURCE_MANAGER_H