mewin/glslang
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1932 from zoddicus/anotherSemiColonFix

Browse Source 
Fix config issues and revert previous fixes for semi-colon issues
This commit is contained in:
John Kessenich 2019-10-16 10:39:51 -06:00 committed by GitHub
commit 9e4f6d03f2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
BUILD.gn
View File

@ -159,7 +159,7 @@ source_set("glslang_sources") {
} }
if (is_clang) { if (is_clang) {
cflags_cc = [ cflags = [
"-Wno-extra-semi", "-Wno-extra-semi",
"-Wno-ignored-qualifiers", "-Wno-ignored-qualifiers",
"-Wno-implicit-fallthrough", "-Wno-implicit-fallthrough",
@ -168,7 +168,6 @@ source_set("glslang_sources") {
"-Wno-unused-variable", "-Wno-unused-variable",
"-Wno-missing-field-initializers", "-Wno-missing-field-initializers",
"-Wno-newline-eof", "-Wno-newline-eof",
"-Wextra-semi",
] ]
} }
if (is_win && !is_clang) { if (is_win && !is_clang) {
@ -182,6 +181,9 @@ source_set("glslang_sources") {
"${spirv_tools_dir}:spvtools_opt", "${spirv_tools_dir}:spvtools_opt",
"${spirv_tools_dir}:spvtools_val", "${spirv_tools_dir}:spvtools_val",
] ]
configs -= [ "//build/config/compiler:chromium_code" ]
configs += [ "//build/config/compiler:no_chromium_code" ]
} }
source_set("glslang_default_resource_limits_sources") { source_set("glslang_default_resource_limits_sources") {
@ -193,6 +195,9 @@ source_set("glslang_default_resource_limits_sources") {
":glslang_sources", ":glslang_sources",
] ]
public_configs = [ ":glslang_public" ] public_configs = [ ":glslang_public" ]
configs -= [ "//build/config/compiler:chromium_code" ]
configs += [ "//build/config/compiler:no_chromium_code" ]
} }
executable("glslang_validator") { executable("glslang_validator") {
@ -208,6 +213,9 @@ executable("glslang_validator") {
":glslang_default_resource_limits_sources", ":glslang_default_resource_limits_sources",
":glslang_sources", ":glslang_sources",
] ]
configs -= [ "//build/config/compiler:chromium_code" ]
configs += [ "//build/config/compiler:no_chromium_code" ]
} }
executable("spirv-remap") { executable("spirv-remap") {
@ -218,4 +226,7 @@ executable("spirv-remap") {
deps = [ deps = [
":glslang_sources", ":glslang_sources",
] ]
configs -= [ "//build/config/compiler:chromium_code" ]
configs += [ "//build/config/compiler:no_chromium_code" ]
} }

4
CMakeLists.txt
View File

@ -92,12 +92,12 @@ endif(WIN32)
if(${CMAKE_CXX_COMPILER_ID} MATCHES "GNU") if(${CMAKE_CXX_COMPILER_ID} MATCHES "GNU")
add_compile_options(-Wall -Wmaybe-uninitialized -Wuninitialized -Wunused -Wunused-local-typedefs add_compile_options(-Wall -Wmaybe-uninitialized -Wuninitialized -Wunused -Wunused-local-typedefs
-Wunused-parameter -Wunused-value -Wunused-variable -Wunused-but-set-parameter -Wunused-but-set-variable -fno-exceptions) -Wunused-parameter -Wunused-value -Wunused-variable -Wunused-but-set-parameter -Wunused-but-set-variable -fno-exceptions)
add_compile_options(-Wno-reorder) # disable this from -Wall, since it happens all over. add_compile_options(-Wno-reorder) # disable this from -Wall, since it happens all over.
add_compile_options(-fno-rtti) add_compile_options(-fno-rtti)
elseif(${CMAKE_CXX_COMPILER_ID} MATCHES "Clang") elseif(${CMAKE_CXX_COMPILER_ID} MATCHES "Clang")
add_compile_options(-Wall -Wuninitialized -Wunused -Wunused-local-typedefs add_compile_options(-Wall -Wuninitialized -Wunused -Wunused-local-typedefs
-Wunused-parameter -Wunused-value -Wunused-variable -Wextra-semi) -Wunused-parameter -Wunused-value -Wunused-variable)
add_compile_options(-Wno-reorder) # disable this from -Wall, since it happens all over. add_compile_options(-Wno-reorder) # disable this from -Wall, since it happens all over.
add_compile_options(-fno-rtti) add_compile_options(-fno-rtti)
elseif(${CMAKE_CXX_COMPILER_ID} MATCHES "MSVC") elseif(${CMAKE_CXX_COMPILER_ID} MATCHES "MSVC")