diff --git a/README.md b/README.md
index e159bd5db..62408ef7e 100644
--- a/README.md
+++ b/README.md
@@ -34,7 +34,7 @@ Building RenderDoc is fairly straight forward.
 
 ### Windows ###
 
-The main [renderdoc.sln](renderdoc.sln) is a VS2010 solution. To build on later VS versions, simply open & upgrade. You will also need to rebuild breakpad, just build `Release|Win32` and `Release|x64` in [breakpad.sln](breakpad/breakpad.sln).
+The main [renderdoc.sln](renderdoc.sln) is a VS2010 solution. To build on later VS versions, simply open & upgrade, I've tested building on VS2012 and VS2013 without issues.
 
 The only external dependency should be the Windows 8.1 SDK. The 8.0 SDK should also work fine, but [the vcxproj](renderdoc/renderdoc.vcxproj) is set up to look in `$(ProgramFiles)\Windows Kits\8.1\` for the necessary paths. If your SDK is installed elsewhere you'll also need to change these locally. You can also compile only against the June 2010 DirectX SDK if you undefine `INCLUDE_D3D_11_1` in `d3d11_common.h`.
 
diff --git a/breakpad/client/windows/common.vcxproj b/breakpad/client/windows/common.vcxproj
index 777695ff9..63d551dc9 100644
--- a/breakpad/client/windows/common.vcxproj
+++ b/breakpad/client/windows/common.vcxproj
@@ -309,8 +309,8 @@
       <PreprocessorDefinitions>_WIN32_WINNT=0x0600;WINVER=0x0600;WIN32;_WINDOWS;_HAS_EXCEPTIONS=0;NOMINMAX;_CRT_RAND_S;CERT_CHAIN_PARA_HAS_EXTRA_FIELDS;WIN32_LEAN_AND_MEAN;_SECURE_ATL;CHROMIUM_BUILD;TOOLKIT_VIEWS=1;ENABLE_GPU=1;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;NVALGRIND;%(PreprocessorDefinitions);%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ResourceCompile>
     <PostBuildEvent>
-      <Command>mkdir $(SolutionDir)\lib32\ 2&gt; nul
-copy $(TargetPath) $(SolutionDir)\lib32\</Command>
+      <Command>mkdir $(SolutionDir)\$(PlatformToolset)\lib32\ 2&gt; nul
+copy $(TargetPath) $(SolutionDir)\$(PlatformToolset)\lib32\</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -363,8 +363,8 @@ copy $(TargetPath) $(SolutionDir)\lib32\</Command>
       <PreprocessorDefinitions>_WIN32_WINNT=0x0600;WINVER=0x0600;WIN32;_WINDOWS;_HAS_EXCEPTIONS=0;NOMINMAX;_CRT_RAND_S;CERT_CHAIN_PARA_HAS_EXTRA_FIELDS;WIN32_LEAN_AND_MEAN;_SECURE_ATL;CHROMIUM_BUILD;TOOLKIT_VIEWS=1;ENABLE_GPU=1;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;NO_TCMALLOC;NDEBUG;NVALGRIND;%(PreprocessorDefinitions);%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ResourceCompile>
     <PostBuildEvent>
-      <Command>mkdir $(SolutionDir)\lib64\ 2&gt; nul
-copy $(TargetPath) $(SolutionDir)\lib64\</Command>
+      <Command>mkdir $(SolutionDir)\$(PlatformToolset)\lib64\ 2&gt; nul
+copy $(TargetPath) $(SolutionDir)\$(PlatformToolset)\lib64\</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
diff --git a/breakpad/client/windows/crash_generation/crash_generation_client.vcxproj b/breakpad/client/windows/crash_generation/crash_generation_client.vcxproj
index 250c854e0..75994b72f 100644
--- a/breakpad/client/windows/crash_generation/crash_generation_client.vcxproj
+++ b/breakpad/client/windows/crash_generation/crash_generation_client.vcxproj
@@ -308,8 +308,8 @@
       <PreprocessorDefinitions>_WIN32_WINNT=0x0600;WINVER=0x0600;WIN32;_WINDOWS;_HAS_EXCEPTIONS=0;NOMINMAX;_CRT_RAND_S;CERT_CHAIN_PARA_HAS_EXTRA_FIELDS;WIN32_LEAN_AND_MEAN;_SECURE_ATL;CHROMIUM_BUILD;TOOLKIT_VIEWS=1;ENABLE_GPU=1;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;NVALGRIND;%(PreprocessorDefinitions);%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ResourceCompile>
     <PostBuildEvent>
-      <Command>mkdir $(SolutionDir)\lib32\ 2&gt; nul
-copy $(TargetPath) $(SolutionDir)\lib32\</Command>
+      <Command>mkdir $(SolutionDir)\$(PlatformToolset)\lib32\ 2&gt; nul
+copy $(TargetPath) $(SolutionDir)\$(PlatformToolset)\lib32\</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -362,8 +362,8 @@ copy $(TargetPath) $(SolutionDir)\lib32\</Command>
       <PreprocessorDefinitions>_WIN32_WINNT=0x0600;WINVER=0x0600;WIN32;_WINDOWS;_HAS_EXCEPTIONS=0;NOMINMAX;_CRT_RAND_S;CERT_CHAIN_PARA_HAS_EXTRA_FIELDS;WIN32_LEAN_AND_MEAN;_SECURE_ATL;CHROMIUM_BUILD;TOOLKIT_VIEWS=1;ENABLE_GPU=1;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;NO_TCMALLOC;NDEBUG;NVALGRIND;%(PreprocessorDefinitions);%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ResourceCompile>
     <PostBuildEvent>
-      <Command>mkdir $(SolutionDir)\lib64\ 2&gt; nul
-copy $(TargetPath) $(SolutionDir)\lib64\</Command>
+      <Command>mkdir $(SolutionDir)\$(PlatformToolset)\lib64\ 2&gt; nul
+copy $(TargetPath) $(SolutionDir)\$(PlatformToolset)\lib64\</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
diff --git a/breakpad/client/windows/crash_generation/crash_generation_server.vcxproj b/breakpad/client/windows/crash_generation/crash_generation_server.vcxproj
index 39fd49c96..a661dbb0f 100644
--- a/breakpad/client/windows/crash_generation/crash_generation_server.vcxproj
+++ b/breakpad/client/windows/crash_generation/crash_generation_server.vcxproj
@@ -308,8 +308,8 @@
       <PreprocessorDefinitions>_WIN32_WINNT=0x0600;WINVER=0x0600;WIN32;_WINDOWS;_HAS_EXCEPTIONS=0;NOMINMAX;_CRT_RAND_S;CERT_CHAIN_PARA_HAS_EXTRA_FIELDS;WIN32_LEAN_AND_MEAN;_SECURE_ATL;CHROMIUM_BUILD;TOOLKIT_VIEWS=1;ENABLE_GPU=1;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;NVALGRIND;%(PreprocessorDefinitions);%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ResourceCompile>
     <PostBuildEvent>
-      <Command>mkdir $(SolutionDir)\lib32\ 2&gt; nul
-copy $(TargetPath) $(SolutionDir)\lib32\</Command>
+      <Command>mkdir $(SolutionDir)\$(PlatformToolset)\lib32\ 2&gt; nul
+copy $(TargetPath) $(SolutionDir)\$(PlatformToolset)\lib32\</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -362,8 +362,8 @@ copy $(TargetPath) $(SolutionDir)\lib32\</Command>
       <PreprocessorDefinitions>_WIN32_WINNT=0x0600;WINVER=0x0600;WIN32;_WINDOWS;_HAS_EXCEPTIONS=0;NOMINMAX;_CRT_RAND_S;CERT_CHAIN_PARA_HAS_EXTRA_FIELDS;WIN32_LEAN_AND_MEAN;_SECURE_ATL;CHROMIUM_BUILD;TOOLKIT_VIEWS=1;ENABLE_GPU=1;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;NO_TCMALLOC;NDEBUG;NVALGRIND;%(PreprocessorDefinitions);%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ResourceCompile>
     <PostBuildEvent>
-      <Command>mkdir $(SolutionDir)\lib64\ 2&gt; nul
-copy $(TargetPath) $(SolutionDir)\lib64\</Command>
+      <Command>mkdir $(SolutionDir)\$(PlatformToolset)\lib64\ 2&gt; nul
+copy $(TargetPath) $(SolutionDir)\$(PlatformToolset)\lib64\</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
diff --git a/breakpad/client/windows/handler/exception_handler.vcxproj b/breakpad/client/windows/handler/exception_handler.vcxproj
index 455efffc6..f4f494fa9 100644
--- a/breakpad/client/windows/handler/exception_handler.vcxproj
+++ b/breakpad/client/windows/handler/exception_handler.vcxproj
@@ -308,8 +308,8 @@
       <PreprocessorDefinitions>_WIN32_WINNT=0x0600;WINVER=0x0600;WIN32;_WINDOWS;_HAS_EXCEPTIONS=0;NOMINMAX;_CRT_RAND_S;CERT_CHAIN_PARA_HAS_EXTRA_FIELDS;WIN32_LEAN_AND_MEAN;_SECURE_ATL;CHROMIUM_BUILD;TOOLKIT_VIEWS=1;ENABLE_GPU=1;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;NVALGRIND;%(PreprocessorDefinitions);%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ResourceCompile>
     <PostBuildEvent>
-      <Command>mkdir $(SolutionDir)\lib32\ 2&gt; nul
-copy $(TargetPath) $(SolutionDir)\lib32\</Command>
+      <Command>mkdir $(SolutionDir)\$(PlatformToolset)\lib32\ 2&gt; nul
+copy $(TargetPath) $(SolutionDir)\$(PlatformToolset)\lib32\</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -362,8 +362,8 @@ copy $(TargetPath) $(SolutionDir)\lib32\</Command>
       <PreprocessorDefinitions>_WIN32_WINNT=0x0600;WINVER=0x0600;WIN32;_WINDOWS;_HAS_EXCEPTIONS=0;NOMINMAX;_CRT_RAND_S;CERT_CHAIN_PARA_HAS_EXTRA_FIELDS;WIN32_LEAN_AND_MEAN;_SECURE_ATL;CHROMIUM_BUILD;TOOLKIT_VIEWS=1;ENABLE_GPU=1;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;NO_TCMALLOC;NDEBUG;NVALGRIND;%(PreprocessorDefinitions);%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ResourceCompile>
     <PostBuildEvent>
-      <Command>mkdir $(SolutionDir)\lib64\ 2&gt; nul
-copy $(TargetPath) $(SolutionDir)\lib64\</Command>
+      <Command>mkdir $(SolutionDir)\$(PlatformToolset)\lib64\ 2&gt; nul
+copy $(TargetPath) $(SolutionDir)\$(PlatformToolset)\lib64\</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
diff --git a/breakpad/lib32/breakpad_common.lib b/breakpad/v100/lib32/breakpad_common.lib
similarity index 99%
rename from breakpad/lib32/breakpad_common.lib
rename to breakpad/v100/lib32/breakpad_common.lib
index 483050de4..71d71adfd 100644
Binary files a/breakpad/lib32/breakpad_common.lib and b/breakpad/v100/lib32/breakpad_common.lib differ
diff --git a/breakpad/lib32/crash_generation_client.lib b/breakpad/v100/lib32/crash_generation_client.lib
similarity index 99%
rename from breakpad/lib32/crash_generation_client.lib
rename to breakpad/v100/lib32/crash_generation_client.lib
index a094b4d92..06cc0f85e 100644
Binary files a/breakpad/lib32/crash_generation_client.lib and b/breakpad/v100/lib32/crash_generation_client.lib differ
diff --git a/breakpad/lib32/crash_generation_server.lib b/breakpad/v100/lib32/crash_generation_server.lib
similarity index 99%
rename from breakpad/lib32/crash_generation_server.lib
rename to breakpad/v100/lib32/crash_generation_server.lib
index f1822fb65..91457a75c 100644
Binary files a/breakpad/lib32/crash_generation_server.lib and b/breakpad/v100/lib32/crash_generation_server.lib differ
diff --git a/breakpad/lib32/exception_handler.lib b/breakpad/v100/lib32/exception_handler.lib
similarity index 99%
rename from breakpad/lib32/exception_handler.lib
rename to breakpad/v100/lib32/exception_handler.lib
index bc71243ed..b24390889 100644
Binary files a/breakpad/lib32/exception_handler.lib and b/breakpad/v100/lib32/exception_handler.lib differ
diff --git a/breakpad/lib64/breakpad_common.lib b/breakpad/v100/lib64/breakpad_common.lib
similarity index 99%
rename from breakpad/lib64/breakpad_common.lib
rename to breakpad/v100/lib64/breakpad_common.lib
index cab742cd7..c1732b98a 100644
Binary files a/breakpad/lib64/breakpad_common.lib and b/breakpad/v100/lib64/breakpad_common.lib differ
diff --git a/breakpad/lib64/crash_generation_client.lib b/breakpad/v100/lib64/crash_generation_client.lib
similarity index 99%
rename from breakpad/lib64/crash_generation_client.lib
rename to breakpad/v100/lib64/crash_generation_client.lib
index 6ac2122c9..83cee0e4c 100644
Binary files a/breakpad/lib64/crash_generation_client.lib and b/breakpad/v100/lib64/crash_generation_client.lib differ
diff --git a/breakpad/lib64/crash_generation_server.lib b/breakpad/v100/lib64/crash_generation_server.lib
similarity index 99%
rename from breakpad/lib64/crash_generation_server.lib
rename to breakpad/v100/lib64/crash_generation_server.lib
index 7748182cc..5edd72570 100644
Binary files a/breakpad/lib64/crash_generation_server.lib and b/breakpad/v100/lib64/crash_generation_server.lib differ
diff --git a/breakpad/lib64/exception_handler.lib b/breakpad/v100/lib64/exception_handler.lib
similarity index 99%
rename from breakpad/lib64/exception_handler.lib
rename to breakpad/v100/lib64/exception_handler.lib
index 133813d2c..fc74515bd 100644
Binary files a/breakpad/lib64/exception_handler.lib and b/breakpad/v100/lib64/exception_handler.lib differ
diff --git a/breakpad/v110/lib32/breakpad_common.lib b/breakpad/v110/lib32/breakpad_common.lib
new file mode 100644
index 000000000..cd0cfb59e
Binary files /dev/null and b/breakpad/v110/lib32/breakpad_common.lib differ
diff --git a/breakpad/v110/lib32/crash_generation_client.lib b/breakpad/v110/lib32/crash_generation_client.lib
new file mode 100644
index 000000000..62e68d946
Binary files /dev/null and b/breakpad/v110/lib32/crash_generation_client.lib differ
diff --git a/breakpad/v110/lib32/crash_generation_server.lib b/breakpad/v110/lib32/crash_generation_server.lib
new file mode 100644
index 000000000..802f787be
Binary files /dev/null and b/breakpad/v110/lib32/crash_generation_server.lib differ
diff --git a/breakpad/v110/lib32/exception_handler.lib b/breakpad/v110/lib32/exception_handler.lib
new file mode 100644
index 000000000..e9fd179a4
Binary files /dev/null and b/breakpad/v110/lib32/exception_handler.lib differ
diff --git a/breakpad/v110/lib64/breakpad_common.lib b/breakpad/v110/lib64/breakpad_common.lib
new file mode 100644
index 000000000..d6f868e75
Binary files /dev/null and b/breakpad/v110/lib64/breakpad_common.lib differ
diff --git a/breakpad/v110/lib64/crash_generation_client.lib b/breakpad/v110/lib64/crash_generation_client.lib
new file mode 100644
index 000000000..1f8a69805
Binary files /dev/null and b/breakpad/v110/lib64/crash_generation_client.lib differ
diff --git a/breakpad/v110/lib64/crash_generation_server.lib b/breakpad/v110/lib64/crash_generation_server.lib
new file mode 100644
index 000000000..3a72962ca
Binary files /dev/null and b/breakpad/v110/lib64/crash_generation_server.lib differ
diff --git a/breakpad/v110/lib64/exception_handler.lib b/breakpad/v110/lib64/exception_handler.lib
new file mode 100644
index 000000000..e64127372
Binary files /dev/null and b/breakpad/v110/lib64/exception_handler.lib differ
diff --git a/breakpad/v120/lib32/breakpad_common.lib b/breakpad/v120/lib32/breakpad_common.lib
new file mode 100644
index 000000000..47876b504
Binary files /dev/null and b/breakpad/v120/lib32/breakpad_common.lib differ
diff --git a/breakpad/v120/lib32/crash_generation_client.lib b/breakpad/v120/lib32/crash_generation_client.lib
new file mode 100644
index 000000000..aace8f85a
Binary files /dev/null and b/breakpad/v120/lib32/crash_generation_client.lib differ
diff --git a/breakpad/v120/lib32/crash_generation_server.lib b/breakpad/v120/lib32/crash_generation_server.lib
new file mode 100644
index 000000000..97fa36029
Binary files /dev/null and b/breakpad/v120/lib32/crash_generation_server.lib differ
diff --git a/breakpad/v120/lib32/exception_handler.lib b/breakpad/v120/lib32/exception_handler.lib
new file mode 100644
index 000000000..e7f187b2a
Binary files /dev/null and b/breakpad/v120/lib32/exception_handler.lib differ
diff --git a/breakpad/v120/lib64/breakpad_common.lib b/breakpad/v120/lib64/breakpad_common.lib
new file mode 100644
index 000000000..41f442ddf
Binary files /dev/null and b/breakpad/v120/lib64/breakpad_common.lib differ
diff --git a/breakpad/v120/lib64/crash_generation_client.lib b/breakpad/v120/lib64/crash_generation_client.lib
new file mode 100644
index 000000000..ecc4820a2
Binary files /dev/null and b/breakpad/v120/lib64/crash_generation_client.lib differ
diff --git a/breakpad/v120/lib64/crash_generation_server.lib b/breakpad/v120/lib64/crash_generation_server.lib
new file mode 100644
index 000000000..864024a11
Binary files /dev/null and b/breakpad/v120/lib64/crash_generation_server.lib differ
diff --git a/breakpad/v120/lib64/exception_handler.lib b/breakpad/v120/lib64/exception_handler.lib
new file mode 100644
index 000000000..30d8a5d6a
Binary files /dev/null and b/breakpad/v120/lib64/exception_handler.lib differ
diff --git a/renderdoc/renderdoc.vcxproj b/renderdoc/renderdoc.vcxproj
index ac0f77d83..b8830c0c7 100644
--- a/renderdoc/renderdoc.vcxproj
+++ b/renderdoc/renderdoc.vcxproj
@@ -69,7 +69,7 @@
     <LinkIncremental>false</LinkIncremental>
     <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
     <IncludePath>$(ProgramFiles)\Windows Kits\8.1\Debuggers\inc;$(ProgramFiles)\Windows Kits\8.1\Include\um;$(ProgramFiles)\Windows Kits\8.1\Include\shared;$(VSInstallDir)\DIA SDK\include;$(SolutionDir)\breakpad;$(IncludePath)</IncludePath>
-    <LibraryPath>$(ProgramFiles)\Windows Kits\8.1\lib\win8\um\x86;$(SolutionDir)\breakpad\lib32;$(LibraryPath)</LibraryPath>
+    <LibraryPath>$(ProgramFiles)\Windows Kits\8.1\lib\win8\um\x86;$(SolutionDir)\breakpad\$(PlatformToolset)\lib32;$(LibraryPath)</LibraryPath>
     <ExecutablePath>$(ProgramFiles)\Windows Kits\8.1\bin\x86;$(ExecutablePath)</ExecutablePath>
     <ExcludePath>$(ProgramFiles)\Windows Kits\8.1\Include\um;$(ProgramFiles)\Windows Kits\8.1\Include\shared;$(ExcludePath)</ExcludePath>
   </PropertyGroup>
@@ -77,7 +77,7 @@
     <LinkIncremental>false</LinkIncremental>
     <OutDir>$(SolutionDir)\$(Platform)\$(Configuration)\</OutDir>
     <IncludePath>$(ProgramFiles)\Windows Kits\8.1\Debuggers\inc;$(ProgramFiles)\Windows Kits\8.1\Include\um;$(ProgramFiles)\Windows Kits\8.1\Include\shared;$(VSInstallDir)\DIA SDK\include;$(SolutionDir)\breakpad;$(IncludePath)</IncludePath>
-    <LibraryPath>$(ProgramFiles)\Windows Kits\8.1\lib\win8\um\x64;$(SolutionDir)\breakpad\lib64;$(LibraryPath)</LibraryPath>
+    <LibraryPath>$(ProgramFiles)\Windows Kits\8.1\lib\win8\um\x64;$(SolutionDir)\breakpad\$(PlatformToolset)\lib64;$(LibraryPath)</LibraryPath>
     <ExecutablePath>$(ProgramFiles)\Windows Kits\8.1\bin;$(ExecutablePath)</ExecutablePath>
     <ExcludePath>$(ProgramFiles)\Windows Kits\8.1\Include\um;$(ProgramFiles)\Windows Kits\8.1\Include\shared;$(ExcludePath)</ExcludePath>
   </PropertyGroup>
@@ -85,7 +85,7 @@
     <LinkIncremental>false</LinkIncremental>
     <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
     <IncludePath>$(ProgramFiles)\Windows Kits\8.1\Debuggers\inc;$(ProgramFiles)\Windows Kits\8.1\Include\um;$(ProgramFiles)\Windows Kits\8.1\Include\shared;$(VSInstallDir)\DIA SDK\include;$(SolutionDir)\breakpad;$(IncludePath)</IncludePath>
-    <LibraryPath>$(ProgramFiles)\Windows Kits\8.1\lib\win8\um\x86;$(SolutionDir)\breakpad\lib32;$(LibraryPath)</LibraryPath>
+    <LibraryPath>$(ProgramFiles)\Windows Kits\8.1\lib\win8\um\x86;$(SolutionDir)\breakpad\$(PlatformToolset)\lib32;$(LibraryPath)</LibraryPath>
     <ExecutablePath>$(ProgramFiles)\Windows Kits\8.1\bin\x86;$(ExecutablePath)</ExecutablePath>
     <ExcludePath>$(ProgramFiles)\Windows Kits\8.1\Include\um;$(ProgramFiles)\Windows Kits\8.1\Include\shared;$(ExcludePath)</ExcludePath>
   </PropertyGroup>
@@ -93,7 +93,7 @@
     <LinkIncremental>false</LinkIncremental>
     <OutDir>$(SolutionDir)\$(Platform)\$(Configuration)\</OutDir>
     <IncludePath>$(ProgramFiles)\Windows Kits\8.1\Debuggers\inc;$(ProgramFiles)\Windows Kits\8.1\Include\um;$(ProgramFiles)\Windows Kits\8.1\Include\shared;$(VSInstallDir)\DIA SDK\include;$(SolutionDir)\breakpad;$(IncludePath)</IncludePath>
-    <LibraryPath>$(ProgramFiles)\Windows Kits\8.1\lib\win8\um\x64;$(SolutionDir)\breakpad\lib64;$(LibraryPath)</LibraryPath>
+    <LibraryPath>$(ProgramFiles)\Windows Kits\8.1\lib\win8\um\x64;$(SolutionDir)\breakpad\$(PlatformToolset)\lib64;$(LibraryPath)</LibraryPath>
     <ExecutablePath>$(ProgramFiles)\Windows Kits\8.1\bin;$(ExecutablePath)</ExecutablePath>
     <ExcludePath>$(ProgramFiles)\Windows Kits\8.1\Include\um;$(ProgramFiles)\Windows Kits\8.1\Include\shared;$(ExcludePath)</ExcludePath>
   </PropertyGroup>
diff --git a/renderdoccmd/renderdoccmd.vcxproj b/renderdoccmd/renderdoccmd.vcxproj
index 501cdc4f1..876745664 100644
--- a/renderdoccmd/renderdoccmd.vcxproj
+++ b/renderdoccmd/renderdoccmd.vcxproj
@@ -65,25 +65,25 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">
     <LinkIncremental>true</LinkIncremental>
     <IncludePath>$(SolutionDir)\breakpad;$(IncludePath)</IncludePath>
-    <LibraryPath>$(SolutionDir)\breakpad\lib32;$(LibraryPath)</LibraryPath>
+    <LibraryPath>$(SolutionDir)\breakpad\$(PlatformToolset)\lib32;$(LibraryPath)</LibraryPath>
     <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Profile|x64'">
     <LinkIncremental>true</LinkIncremental>
     <IncludePath>$(SolutionDir)\breakpad;$(IncludePath)</IncludePath>
-    <LibraryPath>$(SolutionDir)\breakpad\lib64;$(LibraryPath)</LibraryPath>
+    <LibraryPath>$(SolutionDir)\breakpad\$(PlatformToolset)\lib64;$(LibraryPath)</LibraryPath>
     <OutDir>$(SolutionDir)\$(Platform)\$(Configuration)\</OutDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
     <IncludePath>$(SolutionDir)\breakpad;$(IncludePath)</IncludePath>
-    <LibraryPath>$(SolutionDir)\breakpad\lib32;$(LibraryPath)</LibraryPath>
+    <LibraryPath>$(SolutionDir)\breakpad\$(PlatformToolset)\lib32;$(LibraryPath)</LibraryPath>
     <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
     <IncludePath>$(SolutionDir)\breakpad;$(IncludePath)</IncludePath>
-    <LibraryPath>$(SolutionDir)\breakpad\lib64;$(LibraryPath)</LibraryPath>
+    <LibraryPath>$(SolutionDir)\breakpad\$(PlatformToolset)\lib64;$(LibraryPath)</LibraryPath>
     <OutDir>$(SolutionDir)\$(Platform)\$(Configuration)\</OutDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">