Unverified Commit 27ec9195 by John Kessenich Committed by GitHub

Merge pull request #1768 from ShabbyX/enable-opt

Build.gn: allow optimization in glslang lib and standalone
parents 5bd047ba 741fc4ab
...@@ -58,6 +58,8 @@ source_set("glslang_sources") { ...@@ -58,6 +58,8 @@ source_set("glslang_sources") {
"SPIRV/SpvBuilder.cpp", "SPIRV/SpvBuilder.cpp",
"SPIRV/SpvBuilder.h", "SPIRV/SpvBuilder.h",
"SPIRV/SpvPostProcess.cpp", "SPIRV/SpvPostProcess.cpp",
"SPIRV/SpvTools.cpp",
"SPIRV/SpvTools.h",
"SPIRV/bitutils.h", "SPIRV/bitutils.h",
"SPIRV/disassemble.cpp", "SPIRV/disassemble.cpp",
"SPIRV/disassemble.h", "SPIRV/disassemble.h",
...@@ -130,7 +132,7 @@ source_set("glslang_sources") { ...@@ -130,7 +132,7 @@ source_set("glslang_sources") {
"glslang/Public/ShaderLang.h", "glslang/Public/ShaderLang.h",
] ]
defines = [] defines = [ "ENABLE_OPT=1" ]
if (is_win) { if (is_win) {
sources += [ "glslang/OSDependent/Windows/ossource.cpp" ] sources += [ "glslang/OSDependent/Windows/ossource.cpp" ]
defines += [ "GLSLANG_OSINCLUDE_WIN32" ] defines += [ "GLSLANG_OSINCLUDE_WIN32" ]
...@@ -158,6 +160,7 @@ source_set("glslang_sources") { ...@@ -158,6 +160,7 @@ source_set("glslang_sources") {
deps = [ deps = [
"${spirv_tools_dir}:spvtools_opt", "${spirv_tools_dir}:spvtools_opt",
"${spirv_tools_dir}:spvtools_val",
] ]
} }
...@@ -178,7 +181,7 @@ executable("glslang_validator") { ...@@ -178,7 +181,7 @@ executable("glslang_validator") {
if (!is_win) { if (!is_win) {
cflags = [ "-Woverflow" ] cflags = [ "-Woverflow" ]
} }
defines = [ "ENABLE_OPT=0" ] defines = [ "ENABLE_OPT=1" ]
deps = [ deps = [
":glslang_default_resource_limits_sources", ":glslang_default_resource_limits_sources",
":glslang_sources", ":glslang_sources",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment