Commit dbghelp.h that compiles without warnings in VS2015. Refs #222

pdblocate/pdblocate.cpp

@@ -33,7 +33,7 @@
 
 #include <assert.h>
 
-#include <dbghelp.h>
+#include "dbghelp/dbghelp.h"
 #include <shlobj.h>
 
 #include <vector>

pdblocate/pdblocate.vcxproj

@@ -66,6 +66,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(SolutionDir)renderdoc\3rdparty\</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -83,6 +84,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(SolutionDir)renderdoc\3rdparty\</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -100,6 +102,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(SolutionDir)renderdoc\3rdparty\</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -117,6 +120,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(SolutionDir)renderdoc\3rdparty\</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>

renderdoc/3rdparty/breakpad/client/windows/common/ipc_protocol.h

@@ -31,7 +31,7 @@
 #define CLIENT_WINDOWS_COMMON_IPC_PROTOCOL_H__
 
 #include <Windows.h>
-#include <DbgHelp.h>
+#include "dbghelp/DbgHelp.h"
 #include <string>
 #include <utility>
 #include "breakpad/common/windows/string_utils-inl.h"

renderdoc/3rdparty/breakpad/client/windows/crash_generation/client_info.h

@@ -31,7 +31,7 @@
 #define CLIENT_WINDOWS_CRASH_GENERATION_CLIENT_INFO_H__
 
 #include <Windows.h>
-#include <DbgHelp.h>
+#include "dbghelp/DbgHelp.h"
 #include "breakpad/client/windows/common/ipc_protocol.h"
 #include "breakpad/common/scoped_ptr.h"
 #include "breakpad/google_breakpad/common/minidump_format.h"

renderdoc/3rdparty/breakpad/client/windows/crash_generation/crash_generation_client.h

@@ -31,7 +31,7 @@
 #define CLIENT_WINDOWS_CRASH_GENERATION_CRASH_GENERATION_CLIENT_H_
 
 #include <windows.h>
-#include <dbghelp.h>
+#include "dbghelp/dbghelp.h"
 #include <string>
 #include <vector>
 #include <utility>

renderdoc/3rdparty/breakpad/client/windows/crash_generation/minidump_generator.h

@@ -31,7 +31,7 @@
 #define CLIENT_WINDOWS_CRASH_GENERATION_MINIDUMP_GENERATOR_H_
 
 #include <windows.h>
-#include <dbghelp.h>
+#include "dbghelp/dbghelp.h"
 #include <rpc.h>
 #include <list>
 #include "breakpad/google_breakpad/common/minidump_format.h"

renderdoc/3rdparty/breakpad/client/windows/handler/exception_handler.h

@@ -58,7 +58,7 @@
 
 #include <stdlib.h>
 #include <Windows.h>
-#include <DbgHelp.h>
+#include "dbghelp/DbgHelp.h"
 #include <rpc.h>
 
 #pragma warning(push)

renderdoc/os/win32/win32_callstack.cpp

@@ -37,10 +37,7 @@
 #include <shlobj.h>
 #include <tchar.h>
 
-#pragma warning (push)
-#pragma warning (disable:4091) // a microsoft header has warnings. Very nice.
-#include <dbghelp.h>
-#pragma warning (pop)
+#include "dbghelp/dbghelp.h"
 
 #include <Psapi.h>