Downgrade glslang version.

AmusementClub · Mar 26, 2024 · 2da16c6 · 2da16c6
1 parent 247e7fe
commit 2da16c6
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -23,6 +23,7 @@ jobs:
         shell: msys2 {0}
         run: |
           pacman -S --noconfirm mingw-w64-x86_64-{gcc,pkg-config,meson,python-mako,vulkan-devel,libplacebo,rust,cargo-c}
+          pacman -U --noconfirm https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-glslang-13.1.1-1-any.pkg.tar.zst
 
       - name: Build release
         shell: msys2 {0}

diff --git a/meson.build b/meson.build
@@ -1,5 +1,5 @@
 project('vs-placebo', ['c', 'cpp'],
-  default_options: ['buildtype=release', 'b_ndebug=if-release', 'c_std=c11', 'cpp_std=c++11'],
+  default_options: ['buildtype=release', 'b_ndebug=if-release', 'c_std=c99', 'cpp_std=c++11'],
   meson_version: '>=0.51.0',
   version: '1.4.4'
 )
@@ -11,6 +11,7 @@ if win32
 endif
 
 libplacebo_default_options = [
+  'cpp_std=c++17',
   'default_library=static',
   'vulkan=enabled',
   'opengl=disabled',

diff --git a/subprojects/libplacebo b/subprojects/libplacebo