ShuriZma
/
snes9x
mirror of https://github.com/snes9xgit/snes9x.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update glslang. Fix meson build.

This commit is contained in:
BearOso 2022-04-30 18:06:37 -05:00
parent 19c7ce56e0
commit 453bbbe779
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
external/glslang vendored

@ -1 +1 @@
Subproject commit bcf6a2430e99e8fc24f9f266e99316905e6d5134 Subproject commit e3bca2add61a83cc87b0db199c1fbd45690dbf0b

7
gtk/meson.build
View File

@ -70,9 +70,9 @@ if slang
glslang_opt_var = cmake.subproject_options() glslang_opt_var = cmake.subproject_options()
glslang_opt_var.add_cmake_defines({'BUILD_TESTING': false}) glslang_opt_var.add_cmake_defines({'BUILD_TESTING': false})
glslang_pro = cmake.subproject('glslang', options: glslang_opt_var) glslang_pro = cmake.subproject('glslang', options: glslang_opt_var)
# deps += glslang_pro.dependency('GenericCodeGen') deps += glslang_pro.dependency('GenericCodeGen')
deps += glslang_pro.dependency('glslang') deps += glslang_pro.dependency('glslang')
# deps += glslang_pro.dependency('MachineIndependent') deps += glslang_pro.dependency('MachineIndependent')
deps += glslang_pro.dependency('OGLCompiler') deps += glslang_pro.dependency('OGLCompiler')
deps += glslang_pro.dependency('HLSL') deps += glslang_pro.dependency('HLSL')
deps += glslang_pro.dependency('OSDependent') deps += glslang_pro.dependency('OSDependent')
@ -349,6 +349,9 @@ libjma_srcs = [
'../jma/winout.cpp' '../jma/winout.cpp'
] ]
includes += '../external/fmt/include'
srcs += '../external/fmt/src/format.cc'
libjma = static_library('jma', libjma = static_library('jma',
libjma_srcs, libjma_srcs,
c_args: args, c_args: args,