commit fbe8b75e00711350461e71f007195acd1c671900
author Nicolas Capens <capn@google.com> Tue Mar 01 11:37:10 2016 -0500
committer Nicolas Capens <capn@google.com> Tue Mar 01 16:41:41 2016 +0000
tree bd745644797df5b19e0454466484e48570bc8a9c
parent ab3241d8844b0ca42b46228514ecc64229d8c87a

Fix Android emulator library loading on Windows.

Change-Id: I1eb8764c622ffd99a5937fe539bf78dc01d77f23
Reviewed-on: https://swiftshader-review.googlesource.com/4911
Reviewed-by: Nicolas Capens <capn@google.com>
Tested-by: Nicolas Capens <capn@google.com>

src/OpenGL/libGLES_CM/libGLES_CM.hpp

diff --git a/src/OpenGL/libGLES_CM/libGLES_CM.hpp b/src/OpenGL/libGLES_CM/libGLES_CM.hpp
index f2718d7..eddcd75 100644
--- a/src/OpenGL/libGLES_CM/libGLES_CM.hpp
+++ b/src/OpenGL/libGLES_CM/libGLES_CM.hpp
@@ -242,9 +242,9 @@
 		{
 			#if defined(_WIN32)
 				#if defined(__LP64__)
-					const char *libGLES_CM_lib[] = {"libGLES_CM.dll", "libGLES_CM_translator.dll"};
-				#else
 					const char *libGLES_CM_lib[] = {"libGLES_CM.dll", "lib64GLES_CM_translator.dll"};
+				#else
+					const char *libGLES_CM_lib[] = {"libGLES_CM.dll", "libGLES_CM_translator.dll"};
 				#endif
 			#elif defined(__ANDROID__)
 				#if defined(__LP64__)