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

Revert "Merge pull request #2371 from RafaelMarinheiro/master"

Browse Source 
This reverts commit f257e0ea6b9aeab2dc7af3207ac6d29d2bbc01d0, reversing
changes made to 8f0c6bd7732331186b66118d4613cd0dc7076de4.
This commit is contained in:
johnkslang 2020-08-23 01:31:49 -06:00
parent 9f9360d295
commit 983698bb34
1 changed files with 29 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
BUILD.bazel
View File

@ -51,10 +51,7 @@ py_binary(
genrule( genrule(
name = "gen_build_info_h", name = "gen_build_info_h",
srcs = [ srcs = ["CHANGES.md", "build_info.h.tmpl"],
"CHANGES.md",
"build_info.h.tmpl",
],
outs = ["glslang/build_info.h"], outs = ["glslang/build_info.h"],
cmd = "$(location build_info) $$(dirname $(location CHANGES.md)) -i $(location build_info.h.tmpl) -o $(location glslang/build_info.h)", cmd = "$(location build_info) $$(dirname $(location CHANGES.md)) -i $(location build_info.h.tmpl) -o $(location glslang/build_info.h)",
tools = [":build_info"], tools = [":build_info"],
@ -95,8 +92,10 @@ cc_library(
) + [ ) + [
"OGLCompilersDLL/InitializeDll.cpp", "OGLCompilersDLL/InitializeDll.cpp",
] + select({ ] + select({
"@bazel_tools//src/conditions:windows": ["glslang/OSDependent/Windows/ossource.cpp"], "@bazel_tools//src/conditions:windows":
"//conditions:default": ["glslang/OSDependent/Unix/ossource.cpp"], ["glslang/OSDependent/Windows/ossource.cpp"],
"//conditions:default":
["glslang/OSDependent/Unix/ossource.cpp"],
}), }),
hdrs = glob([ hdrs = glob([
"glslang/HLSL/*.h", "glslang/HLSL/*.h",
@ -119,10 +118,7 @@ cc_library(
], ],
linkopts = select({ linkopts = select({
"@bazel_tools//src/conditions:windows": [""], "@bazel_tools//src/conditions:windows": [""],
"//conditions:default": [ "//conditions:default": ["-lm", "-lpthread"],
"-lm",
"-lpthread",
],
}), }),
linkstatic = 1, linkstatic = 1,
) )
@ -228,6 +224,18 @@ cc_binary(
], ],
) )
filegroup(
name = "test_files",
srcs = glob(
["Test/**"],
exclude = [
"Test/bump",
"Test/glslangValidator",
"Test/runtests",
],
),
)
cc_library( cc_library(
name = "glslang_test_lib", name = "glslang_test_lib",
testonly = 1, testonly = 1,
@ -241,9 +249,16 @@ cc_library(
"gtests/main.cpp", "gtests/main.cpp",
], ],
copts = COMMON_COPTS, copts = COMMON_COPTS,
defines = [ data = [":test_files"],
"GLSLANG_TEST_DIRECTORY='\"USE_FLAG_INSTEAD\"'", defines = select({
], # Unfortunately we can't use $(location) in cc_library at the moment.
# See https://github.com/bazelbuild/bazel/issues/1023
# So we'll specify the path manually.
"@bazel_tools//src/conditions:windows":
["GLSLANG_TEST_DIRECTORY='\"../../../../../Test\"'"],
"//conditions:default":
["GLSLANG_TEST_DIRECTORY='\"Test\"'"],
}),
linkstatic = 1, linkstatic = 1,
deps = [ deps = [
":SPIRV", ":SPIRV",
@ -266,13 +281,9 @@ GLSLANG_TESTS = glob(
[cc_test( [cc_test(
name = test_file.replace("gtests/", "").replace(".FromFile.cpp", "") + "_test", name = test_file.replace("gtests/", "").replace(".FromFile.cpp", "") + "_test",
srcs = [test_file], srcs = [test_file],
args = [
"--test-root",
"$(rootpath Test)",
],
copts = COMMON_COPTS, copts = COMMON_COPTS,
data = [ data = [
"Test", ":test_files",
], ],
deps = [ deps = [
":SPIRV", ":SPIRV",