Skip to content

Commit db0a2f2

Browse files
committed
tweaks
1 parent 53aa5a6 commit db0a2f2

3 files changed

Lines changed: 9 additions & 6 deletions

File tree

.github/workflows/build-dependencies.yml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88

99
strategy:
1010
matrix:
11-
configuration: [Debug, Release]
11+
configuration: [Debug, Release, Tools]
1212
platform: [x64]
1313

1414
steps:
@@ -32,15 +32,13 @@ jobs:
3232
run: 'Build_SPIRV-Cross_${{ matrix.configuration }}.bat'
3333
shell: cmd
3434

35-
package:
36-
runs-on: windows-2022
37-
needs: build
38-
steps:
3935
- name: Upload Build Artifacts
4036
uses: actions/upload-artifact@v6
4137
with:
42-
name: 'ShaderGlass_Dependencies'
38+
name: 'ShaderGlass_Dependencies_${{ matrix.platform }}_${{ matrix.configuration }}'
4339
path: |
4440
Dependencies/lib/glslang*.lib
4541
Dependencies/lib/spirv-cross*.lib
42+
Dependencies/bin/*.exe
4643
overwrite: true
44+
if-no-files-found: ignore
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
cmake -S SPIRV-Cross -B Release\SPIRV-Cross-Tools -G "Visual Studio 17 2022" -DSPIRV_CROSS_ENABLE_GLSL=True -DSPIRV_CROSS_ENABLE_C_API=False -DSPIRV_CROSS_CLI=True -DSPIRV_CROSS_ENABLE_UTIL=True -DSPIRV_CROSS_ENABLE_MSL=True -DSPIRV_CROSS_ENABLE_TESTS=False -DSPIRV_CROSS_ENABLE_CPP=True -DCMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE=../../bin -DCMAKE_CXX_FLAGS_RELEASE="/MT /O2 /Ob2 /DNDEBUG"
2+
cmake --build Release\SPIRV-Cross-Tools --config Release
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
cmake -S glslang -B Release\glslang-tools -G "Visual Studio 17 2022" -DENABLE_HLSL=False -DGLSLANG_TESTS=False -DENABLE_SPVREMAPPER=False -DGLSLANG_ENABLE_INSTALL=False -DENABLE_OPT=False -DBUILD_EXTERNAL=False -DENABLE_PCH=False -DENABLE_GLSLANG_BINARIES=True -DENABLE_EXCEPTIONS=False -DENABLE_RTTI=False -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded -DCMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE=../../../bin
2+
cmake --build Release\glslang-tools --config Release
3+

0 commit comments

Comments
 (0)