summaryrefslogtreecommitdiff
path: root/build
diff options
context:
space:
mode:
authorTim Foley <tfoleyNV@users.noreply.github.com>2021-01-21 08:38:06 -0800
committerGitHub <noreply@github.com>2021-01-21 08:38:06 -0800
commit3d21e7a654c65a8a3ad6f4b2c591b8fbdbfe1672 (patch)
tree33ae17d7224005fde55b121d3df65091f4c49f6f /build
parent660cf7a639cb0f73e2ea7abc4a4a8ca59e50c88d (diff)
Upgrade slang-binaries for glslang 11.1.0 (#1664)
This change also switches the build back to using prebuilt glslang binaries instead of always building from source.
Diffstat (limited to 'build')
-rw-r--r--build/visual-studio/slang/slang.vcxproj12
1 files changed, 12 insertions, 0 deletions
diff --git a/build/visual-studio/slang/slang.vcxproj b/build/visual-studio/slang/slang.vcxproj
index 6bfe8e6dc..642ddab7a 100644
--- a/build/visual-studio/slang/slang.vcxproj
+++ b/build/visual-studio/slang/slang.vcxproj
@@ -110,6 +110,9 @@
<ImportLibrary>..\..\..\bin\windows-x86\debug\slang.lib</ImportLibrary>
<TreatLinkerWarningAsErrors>true</TreatLinkerWarningAsErrors>
</Link>
+ <PostBuildEvent>
+ <Command>IF EXIST ..\..\..\external\slang-binaries\bin\windows-x86\slang-glslang.dll\ (xcopy /Q /E /Y /I ..\..\..\external\slang-binaries\bin\windows-x86\slang-glslang.dll ..\..\..\bin\windows-x86\debug &gt; nul) ELSE (xcopy /Q /Y /I ..\..\..\external\slang-binaries\bin\windows-x86\slang-glslang.dll ..\..\..\bin\windows-x86\debug &gt; nul)</Command>
+ </PostBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
@@ -128,6 +131,9 @@
<ImportLibrary>..\..\..\bin\windows-x64\debug\slang.lib</ImportLibrary>
<TreatLinkerWarningAsErrors>true</TreatLinkerWarningAsErrors>
</Link>
+ <PostBuildEvent>
+ <Command>IF EXIST ..\..\..\external\slang-binaries\bin\windows-x64\slang-glslang.dll\ (xcopy /Q /E /Y /I ..\..\..\external\slang-binaries\bin\windows-x64\slang-glslang.dll ..\..\..\bin\windows-x64\debug &gt; nul) ELSE (xcopy /Q /Y /I ..\..\..\external\slang-binaries\bin\windows-x64\slang-glslang.dll ..\..\..\bin\windows-x64\debug &gt; nul)</Command>
+ </PostBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
@@ -150,6 +156,9 @@
<ImportLibrary>..\..\..\bin\windows-x86\release\slang.lib</ImportLibrary>
<TreatLinkerWarningAsErrors>true</TreatLinkerWarningAsErrors>
</Link>
+ <PostBuildEvent>
+ <Command>IF EXIST ..\..\..\external\slang-binaries\bin\windows-x86\slang-glslang.dll\ (xcopy /Q /E /Y /I ..\..\..\external\slang-binaries\bin\windows-x86\slang-glslang.dll ..\..\..\bin\windows-x86\release &gt; nul) ELSE (xcopy /Q /Y /I ..\..\..\external\slang-binaries\bin\windows-x86\slang-glslang.dll ..\..\..\bin\windows-x86\release &gt; nul)</Command>
+ </PostBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
@@ -172,6 +181,9 @@
<ImportLibrary>..\..\..\bin\windows-x64\release\slang.lib</ImportLibrary>
<TreatLinkerWarningAsErrors>true</TreatLinkerWarningAsErrors>
</Link>
+ <PostBuildEvent>
+ <Command>IF EXIST ..\..\..\external\slang-binaries\bin\windows-x64\slang-glslang.dll\ (xcopy /Q /E /Y /I ..\..\..\external\slang-binaries\bin\windows-x64\slang-glslang.dll ..\..\..\bin\windows-x64\release &gt; nul) ELSE (xcopy /Q /Y /I ..\..\..\external\slang-binaries\bin\windows-x64\slang-glslang.dll ..\..\..\bin\windows-x64\release &gt; nul)</Command>
+ </PostBuildEvent>
</ItemDefinitionGroup>
<ItemGroup>
<ClInclude Include="..\..\..\slang.h" />