Merge branch 'main' into SP3-13-Assets-Manager

This commit is contained in:
Xiao Qi 2022-09-21 22:54:53 +08:00
commit 4446d0a60d
3 changed files with 8 additions and 5 deletions

1
.gitignore vendored
View File

@ -31,6 +31,7 @@ x86/
bld/
[Bb]in/
[Bb]in-int/
[Bb]in_int/
[Oo]bj/
[Ll]og/
[Ll]ogs/

View File

@ -1,4 +1,4 @@
#include "SHPch.h"
#include "SHpch.h"
#include <iostream>
#include <unordered_map>
#include "SHVkPhysicalDeviceLibrary.h"
@ -180,10 +180,13 @@ namespace SHADE
return;
}
#ifdef DEBUG
SHLOG_TRACE("Successfully queried Physical Devices:");
for (auto const& device : physicalDevices)
{
SHLOG_TRACE(std::string_view (std::string("\t-") + GetDeviceTypeName(device.getProperties().deviceType) + device.getProperties().deviceName.operator std::string()));
}
#endif
}
}

View File

@ -7,16 +7,15 @@ workspace "SHADE"
configurations
{
"Debug",
"Release",
"Release"
}
flags
{
"MultiProcessorCompile"
"MultiProcessorCompile"
}
outputdir = "%{wks.location}/bin/%{cfg.buildcfg}"
interdir = "%{wks.location}/bin_int"
outputdir = "bin/%{cfg.architecture}"
include "SHADE_Engine"
include "SHADE_Application"