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

Added dependencies pull for shader compiler

This commit is contained in:
Xiao Qi 2023-03-25 16:41:49 +08:00
parent f21f235980
commit 47a78de609
5 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Assets/Animation Clips/Main
View File

Binary file not shown.

11
Dependencies.bat
View File

@ -21,10 +21,11 @@ echo "N - dotnet"
echo "O - tinyddsloader"
echo "P - fmod"
echo "Q - vswhere"
echo "R - ShaderCompiler"
echo ---------------------------------------------------
echo.
choice /C ABCDEFGHIJKLMNOPQ
choice /C ABCDEFGHIJKLMNOPQR
set _e=%ERRORLEVEL%
if %_e%==1 goto VMA
@ -44,6 +45,7 @@ if %_e%==14 goto dotnet
if %_e%==15 goto tinyddsloader
if %_e%==16 goto fmod
if %_e%==17 goto vswhere
if %_e%==18 goto ShaderCompiler
:VMA
echo -----------------------VMA----------------------------
@ -163,6 +165,13 @@ echo -----------------------vswhere----------------------------
rmdir "Dependencies/vswhere" /S /Q
mkdir "Dependencies/vswhere"
powershell -Command "& {wget https://github.com/microsoft/vswhere/releases/download/3.1.1/vswhere.exe -OutFile "Dependencies/vswhere/vswhere.exe"}"
if %_e%==17 (goto:done) else (goto:ShaderCompiler)
:ShaderCompiler
echo ------------------ShaderCompiler------------------
rmdir "Dependencies/ShaderCompiler" /S /Q
mkdir "Dependencies/ShaderCompiler"
git clone https://github.com/SHADE-DP/ShaderCompiler.git "Dependencies/ShaderCompiler"
:done
echo DONE!

3
Dependencies.lua
View File

@ -17,4 +17,5 @@ IncludeDir["VULKAN"] = "$(VULKAN_SDK)"
IncludeDir["dotnet"] = "%{wks.location}\\Dependencies\\dotnet"
IncludeDir["tinyddsloader"] = "%{wks.location}\\Dependencies\\tinyddsloader"
IncludeDir["fmod"] = "%{wks.location}\\Dependencies\\fmod"
IncludeDir["vswhere"] = "%{wks.location}\\Dependencies\\vswhere"
IncludeDir["vswhere"] = "%{wks.location}\\Dependencies\\vswhere"
IncludeDir["ShaderCompiler"] = "%{wks.location}\\Dependencies\\ShaderCompiler"

12
SHADE_Engine/premake5.lua
View File

@ -119,9 +119,6 @@ project "SHADE_Engine"
filter "configurations:Debug"
postbuildcommands
{
"xcopy /r /y /q \"%{IncludeDir.ModelCompiler}\\bin\\Debug\\assimp-vc142-mtd.dll\" \"$(OutDir)\"",
"xcopy /r /y /q \"%{IncludeDir.ModelCompiler}\\bin\\Debug\\ModelCompiler.exe\" \"$(OutDir)\"",
"xcopy /r /y /q \"%{IncludeDir.FontCompiler}\\bin\\Debug\\FontCompiler.exe\" \"$(OutDir)\"",
"xcopy /r /y /q \"%{IncludeDir.fmod}\\lib\\fmodL.dll\" \"$(OutDir)\"",
"xcopy /r /y /q \"%{IncludeDir.fmod}\\lib\\fmodstudioL.dll\" \"$(OutDir)\"",
"xcopy /r /y /q \"%{IncludeDir.vswhere}\\vswhere.exe\" \"$(OutDir)\""
@ -130,9 +127,6 @@ project "SHADE_Engine"
filter "configurations:Release"
postbuildcommands
{
"xcopy /r /y /q \"%{IncludeDir.ModelCompiler}\\bin\\Release\\assimp-vc142-mt.dll\" \"$(OutDir)\"",
"xcopy /r /y /q \"%{IncludeDir.ModelCompiler}\\bin\\Release\\ModelCompiler.exe\" \"$(OutDir)\"",
"xcopy /r /y /q \"%{IncludeDir.FontCompiler}\\bin\\Release\\FontCompiler.exe\" \"$(OutDir)\"",
"xcopy /r /y /q \"%{IncludeDir.fmod}\\lib\\fmod.dll\" \"$(OutDir)\"",
"xcopy /r /y /q \"%{IncludeDir.fmod}\\lib\\fmodstudio.dll\" \"$(OutDir)\"",
"xcopy /r /y /q \"%{IncludeDir.vswhere}\\vswhere.exe\" \"$(OutDir)\""
@ -146,12 +140,6 @@ project "SHADE_Engine"
"xcopy /r /y /q \"%{IncludeDir.fmod}\\lib\\fmodstudio.dll\" \"$(OutDir)\""
}
filter "configurations:Publish"
postbuildcommands
{
--"xcopy /r /y /q \"%{IncludeDir.assimp}\\bin\\Release\\assimp-vc142-mt.dll\" \"$(OutDir)\""
}
warnings 'Extra'
filter "configurations:Debug"

2
premake5.lua
View File

@ -27,9 +27,9 @@ workspace "SHADE"
group "Dependencies"
include "Dependencies/FontCompiler/Dependencies/msdf"
include "Dependencies/imgui"
--include "Dependencies/tracy"
include "Dependencies/yamlcpp"
include "Dependencies/reactphysics3d"
include "Dependencies/ModelCompiler"
include "Dependencies/FontCompiler"
include "Dependencies/ShaderCompiler"
group ""