commit 3e204de9bb74b5379b42b7eea5c4b898b2698d56
author Alexis Hetu <sugoi@google.com> Wed Jul 20 17:05:17 2016 -0400
committer Alexis Hétu <sugoi@google.com> Wed Jul 20 21:11:21 2016 +0000
tree 5d6464e398858f96d506ba34ffb08bcf55bd5abf
parent d7260e208a42fea189ce418999dcc219781f7d09

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/5810
Tested-by: Alexis Hétu <sugoi@google.com>
Reviewed-by: Corentin Wallez <cwallez@google.com>
Reviewed-by: Alexis Hétu <sugoi@google.com>

src/OpenGL/libEGL/BUILD.gn

diff --git a/src/OpenGL/libEGL/BUILD.gn b/src/OpenGL/libEGL/BUILD.gn
index 3c7791d..485cda9 100644
--- a/src/OpenGL/libEGL/BUILD.gn
+++ b/src/OpenGL/libEGL/BUILD.gn
@@ -35,6 +35,9 @@
 }
 
 shared_library("swiftshader_libEGL") {
+  output_name = "libEGL"
+  output_dir = "$root_out_dir/swiftshader"
+
   sources = [
     "Config.cpp",
     "Display.cpp",
@@ -65,7 +68,6 @@
 
     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

diff --git a/src/OpenGL/libGLESv2/BUILD.gn b/src/OpenGL/libGLESv2/BUILD.gn
index d3e836e..5d3455d 100644
--- a/src/OpenGL/libGLESv2/BUILD.gn
+++ b/src/OpenGL/libGLESv2/BUILD.gn
@@ -40,6 +40,9 @@
 }
 
 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 @@
 
     ldflags = [
       "/DEF:" + rebase_path("libGLESv2.def", root_build_dir),
-      "/ignore:4070", # outputting 'swiftshader_libGLESv2.dll' instead of 'libGLESv2.dll'
     ]
   }