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

Gtk: Shaders: Use our copy of glslang headers 

Add include to compiler command to prevent use of system headers.
This commit is contained in:
BearOso 2020-08-08 12:01:10 -05:00
parent a5cb64f707
commit 03d3f69a0c
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gtk/meson.build
View File

@ -78,6 +78,7 @@ if slang and opengl
OSDependent_src = ['../shaders/glslang/glslang/OSDependent/Unix/ossource.cpp'] OSDependent_src = ['../shaders/glslang/glslang/OSDependent/Unix/ossource.cpp']
OSDependent_lib = static_library('OSDependent', OSDependent_lib = static_library('OSDependent',
OSDependent_src, OSDependent_src,
include_directories: include_directories('../shaders/glslang'),
cpp_args: glslang_args) cpp_args: glslang_args)
libs += OSDependent_lib libs += OSDependent_lib
@ -116,12 +117,14 @@ if slang and opengl
glslang_lib = static_library('glslang', glslang_lib = static_library('glslang',
glslang_src, glslang_src,
include_directories: include_directories('../shaders/glslang'),
cpp_args: glslang_args) cpp_args: glslang_args)
libs += glslang_lib libs += glslang_lib
OGLCompilersDLL_src = ['../shaders/glslang/OGLCompilersDLL/InitializeDll.cpp'] OGLCompilersDLL_src = ['../shaders/glslang/OGLCompilersDLL/InitializeDll.cpp']
OGLCompilersDLL_lib = static_library('OGLCompilersDLL', OGLCompilersDLL_lib = static_library('OGLCompilersDLL',
OGLCompilersDLL_src, OGLCompilersDLL_src,
include_directories: include_directories('../shaders/glslang'),
cpp_args: glslang_args) cpp_args: glslang_args)
libs += OGLCompilersDLL_lib libs += OGLCompilersDLL_lib
@ -138,6 +141,7 @@ if slang and opengl
] ]
SPIRV_lib = static_library('SPIRV', SPIRV_lib = static_library('SPIRV',
SPIRV_src, SPIRV_src,
include_directories: include_directories('../shaders/glslang'),
cpp_args: glslang_args) cpp_args: glslang_args)
libs += SPIRV_lib libs += SPIRV_lib
@ -156,6 +160,7 @@ if slang and opengl
'../shaders/SPIRV-Cross/spirv_parser.cpp', '../shaders/SPIRV-Cross/spirv_parser.cpp',
'../shaders/SPIRV-Cross/spirv_parser.hpp', '../shaders/SPIRV-Cross/spirv_parser.hpp',
'../shaders/SPIRV-Cross/spirv.hpp'] '../shaders/SPIRV-Cross/spirv.hpp']
includes += '../shaders/glslang'
endif endif
wayland = get_option('wayland') wayland = get_option('wayland')