From 453bbbe77988510479e3f7fea97c0a57877db94a Mon Sep 17 00:00:00 2001 From: BearOso Date: Sat, 30 Apr 2022 18:06:37 -0500 Subject: [PATCH] Update glslang. Fix meson build. --- external/glslang | 2 +- gtk/meson.build | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/external/glslang b/external/glslang index bcf6a243..e3bca2ad 160000 --- a/external/glslang +++ b/external/glslang @@ -1 +1 @@ -Subproject commit bcf6a2430e99e8fc24f9f266e99316905e6d5134 +Subproject commit e3bca2add61a83cc87b0db199c1fbd45690dbf0b diff --git a/gtk/meson.build b/gtk/meson.build index b6842aba..a5a4bace 100644 --- a/gtk/meson.build +++ b/gtk/meson.build @@ -70,9 +70,9 @@ if slang glslang_opt_var = cmake.subproject_options() glslang_opt_var.add_cmake_defines({'BUILD_TESTING': false}) 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('MachineIndependent') + deps += glslang_pro.dependency('MachineIndependent') deps += glslang_pro.dependency('OGLCompiler') deps += glslang_pro.dependency('HLSL') deps += glslang_pro.dependency('OSDependent') @@ -349,6 +349,9 @@ libjma_srcs = [ '../jma/winout.cpp' ] +includes += '../external/fmt/include' +srcs += '../external/fmt/src/format.cc' + libjma = static_library('jma', libjma_srcs, c_args: args,