commit e41f7629e2db2fc959c71ff3bcf00437638556b3
author Nicolas Capens <capn@google.com> Fri Aug 09 13:03:17 2019 -0400
committer Nicolas Capens <nicolascapens@google.com> Fri Aug 09 20:41:05 2019 +0000
tree 8e95deace5f462f0d4f7c463f2cac0593685cf4e
parent 0b79e98b8bf7dbe8479e3d4625e35bf4c7587360

Fix CMake Debug builds for Windows

The debugger attachment dialog uses a .rc file that was missing from the
CMake build. This caused DllMain to segfault, which the application only
observes as a failure to load the DLL.

Bug: b/139189696
Change-Id: I590c50da2410826598e8238e25f69709d80f2389
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/34968
Presubmit-Ready: Nicolas Capens <nicolascapens@google.com>
Tested-by: Nicolas Capens <nicolascapens@google.com>
Kokoro-Presubmit: kokoro <noreply+kokoro@google.com>
Reviewed-by: Ben Clayton <bclayton@google.com>

CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 297e34c..4a86d09 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1779,6 +1779,7 @@
     list(APPEND EGL_LIST ${OPENGL_DIR}/libEGL/libEGL.rc)
     list(APPEND GLES2_LIST ${OPENGL_DIR}/libGLESv2/libGLESv2.rc)
     list(APPEND GLES_CM_LIST ${OPENGL_DIR}/libGLES_CM/libGLES_CM.rc)
+    list(APPEND VULKAN_LIST ${VULKAN_DIR}/Vulkan.rc)
 elseif(LINUX)
     list(APPEND SWIFTSHADER_LIST
         ${SOURCE_DIR}/Main/FrameBufferX11.cpp