Skip to content

S
swiftshader
Commit 3e204de9 by Alexis Hetu Committed by Alexis Hétu
Options

Changed SwiftShader output

To avoid having a library name mismatch between the LIBRARY lines of the .def files and the output from the GN files, the output names were restored to libEGL and libGLESv2, but the output directories were changed to avoid clashing with the ANGLE libraries. Also removed the warning silencing that's no longer required. Change-Id: Ifa13d302ffa19acc04e46e4c772fa407a1c818bc Reviewed-on: https://swiftshader-review.googlesource.com/5810Tested-by: 's avatarAlexis Hétu <sugoi@google.com> Reviewed-by: 's avatarCorentin Wallez <cwallez@google.com> Reviewed-by: 's avatarAlexis Hétu <sugoi@google.com>
parent d7260e20
Showing with 6 additions and 2 deletions
src/OpenGL/libEGL/BUILD.gn
......@@ -35,6 +35,9 @@ config("swiftshader_libEGL_private_config") {
}
shared_library("swiftshader_libEGL") {
output_name = "libEGL"
output_dir = "$root_out_dir/swiftshader"
sources = [
"Config.cpp",
"Display.cpp",
......@@ -65,7 +68,6 @@ shared_library("swiftshader_libEGL") {
ldflags = [
"/DEF:" + rebase_path("libGLESv2.def", root_build_dir),
"/ignore:4070", # outputting 'swiftshader_libEGL.dll' instead of 'libEGL.dll'
]
} else if (host_os == "linux") {
sources += [
......
src/OpenGL/libGLESv2/BUILD.gn
......@@ -40,6 +40,9 @@ config("swiftshader_libGLESv2_private_config") {
}
shared_library("swiftshader_libGLESv2") {
output_name = "libGLESv2"
output_dir = "$root_out_dir/swiftshader"
deps = [
"../../OpenGL/compiler:swiftshader_opengl_compiler",
"../../Reactor:swiftshader_reactor",
......@@ -78,7 +81,6 @@ shared_library("swiftshader_libGLESv2") {
ldflags = [
"/DEF:" + rebase_path("libGLESv2.def", root_build_dir),
"/ignore:4070", # outputting 'swiftshader_libGLESv2.dll' instead of 'libGLESv2.dll'
]
}
......
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