Skip to content

Commit 210a988

Browse files
author
Tim Foley
authored
Update binaries (shader-slang#1758)
1 parent 6a360f7 commit 210a988

File tree

4 files changed

+14
-22
lines changed

4 files changed

+14
-22
lines changed

build/visual-studio/slang/slang.vcxproj

+12
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,9 @@
110110
<ImportLibrary>..\..\..\bin\windows-x86\debug\slang.lib</ImportLibrary>
111111
<TreatLinkerWarningAsErrors>true</TreatLinkerWarningAsErrors>
112112
</Link>
113+
<PostBuildEvent>
114+
<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>
115+
</PostBuildEvent>
113116
</ItemDefinitionGroup>
114117
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
115118
<ClCompile>
@@ -128,6 +131,9 @@
128131
<ImportLibrary>..\..\..\bin\windows-x64\debug\slang.lib</ImportLibrary>
129132
<TreatLinkerWarningAsErrors>true</TreatLinkerWarningAsErrors>
130133
</Link>
134+
<PostBuildEvent>
135+
<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>
136+
</PostBuildEvent>
131137
</ItemDefinitionGroup>
132138
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
133139
<ClCompile>
@@ -150,6 +156,9 @@
150156
<ImportLibrary>..\..\..\bin\windows-x86\release\slang.lib</ImportLibrary>
151157
<TreatLinkerWarningAsErrors>true</TreatLinkerWarningAsErrors>
152158
</Link>
159+
<PostBuildEvent>
160+
<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>
161+
</PostBuildEvent>
153162
</ItemDefinitionGroup>
154163
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
155164
<ClCompile>
@@ -172,6 +181,9 @@
172181
<ImportLibrary>..\..\..\bin\windows-x64\release\slang.lib</ImportLibrary>
173182
<TreatLinkerWarningAsErrors>true</TreatLinkerWarningAsErrors>
174183
</Link>
184+
<PostBuildEvent>
185+
<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>
186+
</PostBuildEvent>
175187
</ItemDefinitionGroup>
176188
<ItemGroup>
177189
<ClInclude Include="..\..\..\slang.h" />

premake5.lua

+1-1
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ newoption {
7979
trigger = "build-glslang",
8080
description = "(Optional) If true glslang and spirv-opt will be built",
8181
value = "bool",
82-
default = "true",
82+
default = "false",
8383
allowed = { { "true", "True"}, { "false", "False" } }
8484
}
8585

slang.sln

-20
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "slang", "build\visual-studi
3333
{E145B2B8-CD13-A6BE-B6A7-16E5A2148223} = {E145B2B8-CD13-A6BE-B6A7-16E5A2148223}
3434
EndProjectSection
3535
EndProject
36-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "slang-glslang", "build\visual-studio\slang-glslang\slang-glslang.vcxproj", "{C495878A-832C-485B-B347-0998A90CC936}"
37-
EndProject
38-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "slang-spirv-tools", "build\visual-studio\slang-spirv-tools\slang-spirv-tools.vcxproj", "{C36F6185-49B3-467E-8388-D0E9BF5F7BB8}"
39-
EndProject
4036
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "slangc", "build\visual-studio\slangc\slangc.vcxproj", "{D56CBCEB-1EB5-4CA8-AEC4-48EA35ED61C7}"
4137
EndProject
4238
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test-tool", "test-tool", "{57B5AA5E-C340-1823-CC51-9B17385C7423}"
@@ -149,22 +145,6 @@ Global
149145
{DB00DA62-0533-4AFD-B59F-A67D5B3A0808}.Release|Win32.Build.0 = Release|Win32
150146
{DB00DA62-0533-4AFD-B59F-A67D5B3A0808}.Release|x64.ActiveCfg = Release|x64
151147
{DB00DA62-0533-4AFD-B59F-A67D5B3A0808}.Release|x64.Build.0 = Release|x64
152-
{C495878A-832C-485B-B347-0998A90CC936}.Debug|Win32.ActiveCfg = Debug|Win32
153-
{C495878A-832C-485B-B347-0998A90CC936}.Debug|Win32.Build.0 = Debug|Win32
154-
{C495878A-832C-485B-B347-0998A90CC936}.Debug|x64.ActiveCfg = Debug|x64
155-
{C495878A-832C-485B-B347-0998A90CC936}.Debug|x64.Build.0 = Debug|x64
156-
{C495878A-832C-485B-B347-0998A90CC936}.Release|Win32.ActiveCfg = Release|Win32
157-
{C495878A-832C-485B-B347-0998A90CC936}.Release|Win32.Build.0 = Release|Win32
158-
{C495878A-832C-485B-B347-0998A90CC936}.Release|x64.ActiveCfg = Release|x64
159-
{C495878A-832C-485B-B347-0998A90CC936}.Release|x64.Build.0 = Release|x64
160-
{C36F6185-49B3-467E-8388-D0E9BF5F7BB8}.Debug|Win32.ActiveCfg = Debug|Win32
161-
{C36F6185-49B3-467E-8388-D0E9BF5F7BB8}.Debug|Win32.Build.0 = Debug|Win32
162-
{C36F6185-49B3-467E-8388-D0E9BF5F7BB8}.Debug|x64.ActiveCfg = Debug|x64
163-
{C36F6185-49B3-467E-8388-D0E9BF5F7BB8}.Debug|x64.Build.0 = Debug|x64
164-
{C36F6185-49B3-467E-8388-D0E9BF5F7BB8}.Release|Win32.ActiveCfg = Release|Win32
165-
{C36F6185-49B3-467E-8388-D0E9BF5F7BB8}.Release|Win32.Build.0 = Release|Win32
166-
{C36F6185-49B3-467E-8388-D0E9BF5F7BB8}.Release|x64.ActiveCfg = Release|x64
167-
{C36F6185-49B3-467E-8388-D0E9BF5F7BB8}.Release|x64.Build.0 = Release|x64
168148
{D56CBCEB-1EB5-4CA8-AEC4-48EA35ED61C7}.Debug|Win32.ActiveCfg = Debug|Win32
169149
{D56CBCEB-1EB5-4CA8-AEC4-48EA35ED61C7}.Debug|Win32.Build.0 = Debug|Win32
170150
{D56CBCEB-1EB5-4CA8-AEC4-48EA35ED61C7}.Debug|x64.ActiveCfg = Debug|x64

0 commit comments

Comments
 (0)