commit f27cb237680dbbf969a749372899f35f63f2add5
author Nicolas Capens <capn@google.com> Wed Nov 14 00:19:12 2018 -0500
committer Nicolas Capens <nicolascapens@google.com> Wed Nov 14 15:38:59 2018 +0000
tree 6b7a21265bf925f834692034a8f1712543074d4d
parent 02ce5830e7dbe00131509c3a32f669c3c9ee3809

Fix debugger wait dialog.

The popup dialog for waiting for the debugger was missing a resource,
causing DllMain to fail and thus failure to load the DLL.

Bug b/116336664

Change-Id: Ic12af87f3eb272a1f1ba27917926dcd845d86977
Reviewed-on: https://swiftshader-review.googlesource.com/c/22528
Tested-by: Nicolas Capens <nicolascapens@google.com>
Reviewed-by: Alexis Hétu <sugoi@google.com>

src/Vulkan/vulkan.vcxproj

diff --git a/src/Vulkan/vulkan.vcxproj b/src/Vulkan/vulkan.vcxproj
index 89062a8..5258dc6 100644
--- a/src/Vulkan/vulkan.vcxproj
+++ b/src/Vulkan/vulkan.vcxproj
@@ -83,7 +83,7 @@
       <Optimization>Disabled</Optimization>

       <SDLCheck>true</SDLCheck>

       <AdditionalIncludeDirectories>$(SolutionDir)include;$(SolutionDir)src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;NOMINMAX;DEBUGGER_WAIT_DIALOG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

       <AdditionalOptions>/permissive- %(AdditionalOptions)</AdditionalOptions>

       <TreatSpecificWarningsAsErrors>4018;5038;4838</TreatSpecificWarningsAsErrors>