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

Merge remote-tracking branch 'origin/main' into SP3-12-SceneGraph

This commit is contained in:
Diren D Bharwani 2022-09-22 13:53:17 +08:00
parent b6b2a3350c b2f8ed23b1
commit cd1f1a8fea
3 changed files with 28 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
Dependencies.lua
View File

@ -1,16 +1,16 @@
IncludeDir = {} IncludeDir = {}
IncludeDir["assimp"] = "%{wks.location}/Dependencies/assimp" IncludeDir["assimp"] = "%{wks.location}\\Dependencies\\assimp"
IncludeDir["imgui"] = "%{wks.location}/Dependencies/imgui" IncludeDir["imgui"] = "%{wks.location}\\Dependencies\\imgui"
IncludeDir["imguizmo"] = "%{wks.location}/Dependencies/imguizmo" IncludeDir["imguizmo"] = "%{wks.location}\\Dependencies\\imguizmo"
IncludeDir["imnodes"] = "%{wks.location}/Dependencies/imnodes" IncludeDir["imnodes"] = "%{wks.location}\\Dependencies\\imnodes"
IncludeDir["msdf_atlas_gen"] = "%{wks.location}/Dependencies/msdf" IncludeDir["msdf_atlas_gen"] = "%{wks.location}\\Dependencies\\msdf"
IncludeDir["msdfgen"] = "%{wks.location}/Dependencies/msdf/msdfgen" IncludeDir["msdfgen"] = "%{wks.location}\\Dependencies\\msdf\\msdfgen"
IncludeDir["spdlog"] = "%{wks.location}/Dependencies/spdlog" IncludeDir["spdlog"] = "%{wks.location}\\Dependencies\\spdlog"
IncludeDir["tracy"] = "%{wks.location}/Dependencies/tracy" IncludeDir["tracy"] = "%{wks.location}\\Dependencies\\tracy"
IncludeDir["VMA"] = "%{wks.location}/Dependencies/VMA" IncludeDir["VMA"] = "%{wks.location}\\Dependencies\\VMA"
IncludeDir["yamlcpp"] = "%{wks.location}/Dependencies/yamlcpp/include" IncludeDir["yamlcpp"] = "%{wks.location}\\Dependencies\\yamlcpp\\include"
IncludeDir["RTTR"] = "%{wks.location}/Dependencies/RTTR" IncludeDir["RTTR"] = "%{wks.location}\\Dependencies\\RTTR"
IncludeDir["reactphysics3d"] = "%{wks.location}/Dependencies/reactphysics3d" IncludeDir["reactphysics3d"] = "%{wks.location}\\Dependencies\\reactphysics3d"
IncludeDir["SDL"] = "%{wks.location}/Dependencies/SDL" IncludeDir["SDL"] = "%{wks.location}\\Dependencies\\SDL"
IncludeDir["VULKAN"] = "$(VULKAN_SDK)" IncludeDir["VULKAN"] = "$(VULKAN_SDK)"
IncludeDir["dotnet"] = "%{wks.location}/Dependencies/dotnet" IncludeDir["dotnet"] = "%{wks.location}\\Dependencies\\dotnet"

24
SHADE_Engine/premake5.lua
View File

@ -25,22 +25,22 @@ project "SHADE_Engine"
externalincludedirs externalincludedirs
{ {
"%{IncludeDir.assimp}/include", "%{IncludeDir.assimp}\\include",
"%{IncludeDir.imgui}", "%{IncludeDir.imgui}",
"%{IncludeDir.imguizmo}", "%{IncludeDir.imguizmo}",
"%{IncludeDir.imnodes}", "%{IncludeDir.imnodes}",
"%{IncludeDir.msdf_atlas_gen}", "%{IncludeDir.msdf_atlas_gen}",
"%{IncludeDir.msdfgen}", "%{IncludeDir.msdfgen}",
"%{IncludeDir.spdlog}/include", "%{IncludeDir.spdlog}\\include",
"%{IncludeDir.tracy}", "%{IncludeDir.tracy}",
"%{IncludeDir.VMA}/include", "%{IncludeDir.VMA}\\include",
"%{IncludeDir.yamlcpp}", "%{IncludeDir.yamlcpp}",
"%{IncludeDir.SDL}/include", "%{IncludeDir.SDL}\\include",
"%{IncludeDir.RTTR}/include", "%{IncludeDir.RTTR}\\include",
"%{IncludeDir.reactphysics3d}/include", "%{IncludeDir.reactphysics3d}\\include",
"%{IncludeDir.VULKAN}/include", "%{IncludeDir.VULKAN}\\include",
"%{IncludeDir.VULKAN}/Source/SPIRV-Reflect", "%{IncludeDir.VULKAN}\\Source\\SPIRV-Reflect",
"%{IncludeDir.dotnet}/include", "%{IncludeDir.dotnet}\\include",
} }
externalwarnings "Off" externalwarnings "Off"
@ -100,9 +100,9 @@ project "SHADE_Engine"
postbuildcommands postbuildcommands
{ {
"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)\""
} }
warnings 'Extra' warnings 'Extra'

3
premake5.lua
View File

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