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

Merge branch 'main' into SP3-6-c-scripting 

# Conflicts:
#	Dependencies.bat
This commit is contained in:
Kah Wei 2022-09-15 12:22:37 +08:00
parent 972fe46ec2 58cd71110a
commit e5b7742955
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Dependencies.bat
View File

@ -16,12 +16,12 @@ echo "I - imnodes"
echo "J - tracy" echo "J - tracy"
echo "K - RTTR" echo "K - RTTR"
echo "L - yamlcpp" echo "L - yamlcpp"
echo "N - SDL" echo "M - SDL"
echo "O - dotnet" echo "N - dotnet"
echo --------------------------------------------------- echo ---------------------------------------------------
echo. echo.
choice /C ABCDEFGHIJKLMNO /T 10 /D A choice /C ABCDEFGHIJKLMN /T 10 /D A
set _e=%ERRORLEVEL% set _e=%ERRORLEVEL%
if %_e%==1 goto VMA if %_e%==1 goto VMA
@ -36,8 +36,8 @@ if %_e%==9 goto imnodes
if %_e%==10 goto tracy if %_e%==10 goto tracy
if %_e%==11 goto RTTR if %_e%==11 goto RTTR
if %_e%==12 goto yamlcpp if %_e%==12 goto yamlcpp
if %_e%==14 goto SDL if %_e%==13 goto SDL
if %_e%==15 goto dotnet if %_e%==14 goto dotnet
:VMA :VMA
echo -----------------------VMA---------------------------- echo -----------------------VMA----------------------------

2
SHADE_Engine/premake5.lua
View File

@ -36,7 +36,7 @@ project "SHADE_Engine"
"%{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",
} }