Merge branch 'main' into SP3-13-Assets-Manager
This commit is contained in:
commit
4446d0a60d
|
@ -31,6 +31,7 @@ x86/
|
|||
bld/
|
||||
[Bb]in/
|
||||
[Bb]in-int/
|
||||
[Bb]in_int/
|
||||
[Oo]bj/
|
||||
[Ll]og/
|
||||
[Ll]ogs/
|
||||
|
|
|
@ -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
|
||||
|
||||
}
|
||||
}
|
||||
|
|
|
@ -7,7 +7,7 @@ workspace "SHADE"
|
|||
configurations
|
||||
{
|
||||
"Debug",
|
||||
"Release",
|
||||
"Release"
|
||||
}
|
||||
|
||||
flags
|
||||
|
@ -15,8 +15,7 @@ workspace "SHADE"
|
|||
"MultiProcessorCompile"
|
||||
}
|
||||
|
||||
outputdir = "%{wks.location}/bin/%{cfg.buildcfg}"
|
||||
interdir = "%{wks.location}/bin_int"
|
||||
outputdir = "bin/%{cfg.architecture}"
|
||||
|
||||
include "SHADE_Engine"
|
||||
include "SHADE_Application"
|
||||
|
|
Loading…
Reference in New Issue