diff --git a/qrenderdoc/Code/pyrenderdoc/pyrenderdoc_module.vcxproj b/qrenderdoc/Code/pyrenderdoc/pyrenderdoc_module.vcxproj
index 79874e0ad..6f5ce368b 100644
--- a/qrenderdoc/Code/pyrenderdoc/pyrenderdoc_module.vcxproj
+++ b/qrenderdoc/Code/pyrenderdoc/pyrenderdoc_module.vcxproj
@@ -23,8 +23,8 @@
Win32Proj
pyrenderdoc_module
pyrenderdoc_module
- 8.1
+
DynamicLibrary
diff --git a/qrenderdoc/Code/pyrenderdoc/qrenderdoc_module.vcxproj b/qrenderdoc/Code/pyrenderdoc/qrenderdoc_module.vcxproj
index 5f9f37eae..8f3d4205f 100644
--- a/qrenderdoc/Code/pyrenderdoc/qrenderdoc_module.vcxproj
+++ b/qrenderdoc/Code/pyrenderdoc/qrenderdoc_module.vcxproj
@@ -23,8 +23,8 @@
Win32Proj
qrenderdoc_module
qrenderdoc_module
- 8.1
+
DynamicLibrary
diff --git a/qrenderdoc/qrenderdoc_local.vcxproj b/qrenderdoc/qrenderdoc_local.vcxproj
index 70ec296e7..d92f2f30d 100644
--- a/qrenderdoc/qrenderdoc_local.vcxproj
+++ b/qrenderdoc/qrenderdoc_local.vcxproj
@@ -30,9 +30,9 @@
{A14A6AE5-02B1-35FE-BE59-B3E7C273B40B}
qrenderdoc
Qt4VSv1.0
- 8.1
qrenderdoc
+
v140
diff --git a/qrenderdoc/renderdocui_stub.vcxproj b/qrenderdoc/renderdocui_stub.vcxproj
index 800f3784b..e66c74369 100644
--- a/qrenderdoc/renderdocui_stub.vcxproj
+++ b/qrenderdoc/renderdocui_stub.vcxproj
@@ -22,9 +22,9 @@
{37955C79-D91D-423F-8C6C-8F5BCF4F28D4}
Win32Proj
renderdocui_stub
- 8.1
renderdocui_stub
+
Application
diff --git a/renderdoc/3rdparty/breakpad/client/windows/common.vcxproj b/renderdoc/3rdparty/breakpad/client/windows/common.vcxproj
index f87bdc66a..e7826345c 100644
--- a/renderdoc/3rdparty/breakpad/client/windows/common.vcxproj
+++ b/renderdoc/3rdparty/breakpad/client/windows/common.vcxproj
@@ -24,6 +24,7 @@
common
breakpad_common
+
Unicode
diff --git a/renderdoc/3rdparty/breakpad/client/windows/crash_generation/crash_generation_client.vcxproj b/renderdoc/3rdparty/breakpad/client/windows/crash_generation/crash_generation_client.vcxproj
index 1cbbe77de..5cf7242f8 100644
--- a/renderdoc/3rdparty/breakpad/client/windows/crash_generation/crash_generation_client.vcxproj
+++ b/renderdoc/3rdparty/breakpad/client/windows/crash_generation/crash_generation_client.vcxproj
@@ -23,6 +23,7 @@
Win32Proj
crash_generation_client
+
Unicode
diff --git a/renderdoc/3rdparty/breakpad/client/windows/crash_generation/crash_generation_server.vcxproj b/renderdoc/3rdparty/breakpad/client/windows/crash_generation/crash_generation_server.vcxproj
index 3917d7ae3..62cd7f495 100644
--- a/renderdoc/3rdparty/breakpad/client/windows/crash_generation/crash_generation_server.vcxproj
+++ b/renderdoc/3rdparty/breakpad/client/windows/crash_generation/crash_generation_server.vcxproj
@@ -23,6 +23,7 @@
Win32Proj
crash_generation_server
+
Unicode
diff --git a/renderdoc/3rdparty/breakpad/client/windows/handler/exception_handler.vcxproj b/renderdoc/3rdparty/breakpad/client/windows/handler/exception_handler.vcxproj
index 55d4a5c00..236775a4e 100644
--- a/renderdoc/3rdparty/breakpad/client/windows/handler/exception_handler.vcxproj
+++ b/renderdoc/3rdparty/breakpad/client/windows/handler/exception_handler.vcxproj
@@ -23,6 +23,7 @@
Win32Proj
exception_handler
+
Unicode
diff --git a/renderdoc/driver/d3d11/renderdoc_d3d11.vcxproj b/renderdoc/driver/d3d11/renderdoc_d3d11.vcxproj
index 4e06ae1f0..18e379fbe 100644
--- a/renderdoc/driver/d3d11/renderdoc_d3d11.vcxproj
+++ b/renderdoc/driver/d3d11/renderdoc_d3d11.vcxproj
@@ -24,6 +24,7 @@
renderdoc_d3d11
d3d11
+
StaticLibrary
diff --git a/renderdoc/driver/d3d12/renderdoc_d3d12.vcxproj b/renderdoc/driver/d3d12/renderdoc_d3d12.vcxproj
index 474ec1356..f6331e6b3 100644
--- a/renderdoc/driver/d3d12/renderdoc_d3d12.vcxproj
+++ b/renderdoc/driver/d3d12/renderdoc_d3d12.vcxproj
@@ -24,6 +24,7 @@
renderdoc_d3d12
d3d12
+
StaticLibrary
diff --git a/renderdoc/driver/d3d8/renderdoc_d3d8.vcxproj b/renderdoc/driver/d3d8/renderdoc_d3d8.vcxproj
index 90c5d86c6..4603b4f33 100644
--- a/renderdoc/driver/d3d8/renderdoc_d3d8.vcxproj
+++ b/renderdoc/driver/d3d8/renderdoc_d3d8.vcxproj
@@ -24,6 +24,7 @@
renderdoc_d3d8
d3d8
+
StaticLibrary
diff --git a/renderdoc/driver/d3d9/renderdoc_d3d9.vcxproj b/renderdoc/driver/d3d9/renderdoc_d3d9.vcxproj
index 7ef6ea2e5..054a9bb62 100644
--- a/renderdoc/driver/d3d9/renderdoc_d3d9.vcxproj
+++ b/renderdoc/driver/d3d9/renderdoc_d3d9.vcxproj
@@ -24,6 +24,7 @@
renderdoc_d3d9
d3d9
+
StaticLibrary
diff --git a/renderdoc/driver/dxgi/renderdoc_dxgi.vcxproj b/renderdoc/driver/dxgi/renderdoc_dxgi.vcxproj
index 368ede0ed..dd86340f5 100644
--- a/renderdoc/driver/dxgi/renderdoc_dxgi.vcxproj
+++ b/renderdoc/driver/dxgi/renderdoc_dxgi.vcxproj
@@ -24,6 +24,7 @@
renderdoc_dxgi
dxgi
+
StaticLibrary
diff --git a/renderdoc/driver/gl/renderdoc_gl.vcxproj b/renderdoc/driver/gl/renderdoc_gl.vcxproj
index ef8d15a02..071225ac9 100644
--- a/renderdoc/driver/gl/renderdoc_gl.vcxproj
+++ b/renderdoc/driver/gl/renderdoc_gl.vcxproj
@@ -24,6 +24,7 @@
renderdoc_gl
gl
+
StaticLibrary
diff --git a/renderdoc/driver/ihv/amd/AMD.vcxproj b/renderdoc/driver/ihv/amd/AMD.vcxproj
index a139ff991..ed195affa 100644
--- a/renderdoc/driver/ihv/amd/AMD.vcxproj
+++ b/renderdoc/driver/ihv/amd/AMD.vcxproj
@@ -22,6 +22,7 @@
{5DE5A561-548A-4DD7-90F0-06A2B39EAE9A}
AMD
+
StaticLibrary
diff --git a/renderdoc/driver/ihv/amd/AMD_RGP.vcxproj b/renderdoc/driver/ihv/amd/AMD_RGP.vcxproj
index 575ce5223..ccc160e5b 100644
--- a/renderdoc/driver/ihv/amd/AMD_RGP.vcxproj
+++ b/renderdoc/driver/ihv/amd/AMD_RGP.vcxproj
@@ -21,8 +21,8 @@
{B33F8FFD-3C04-4779-9C3B-E2858387971B}
AMD_RGP
- 8.1
+
StaticLibrary
diff --git a/renderdoc/driver/ihv/arm/ARM.vcxproj b/renderdoc/driver/ihv/arm/ARM.vcxproj
index 7de9125f6..9867f9bdc 100644
--- a/renderdoc/driver/ihv/arm/ARM.vcxproj
+++ b/renderdoc/driver/ihv/arm/ARM.vcxproj
@@ -22,6 +22,7 @@
{F9CCE6CA-0CA3-4A22-9C7B-881369955E62}
AMD
+
StaticLibrary
diff --git a/renderdoc/driver/ihv/intel/Intel.vcxproj b/renderdoc/driver/ihv/intel/Intel.vcxproj
index eee070dc6..7bce8f68d 100644
--- a/renderdoc/driver/ihv/intel/Intel.vcxproj
+++ b/renderdoc/driver/ihv/intel/Intel.vcxproj
@@ -21,8 +21,8 @@
{7FCB5FC5-1DBD-4DA6-83A0-6BA4E945BDA5}
Intel
- 8.1
+
StaticLibrary
diff --git a/renderdoc/driver/ihv/nv/NV.vcxproj b/renderdoc/driver/ihv/nv/NV.vcxproj
index 9398ab536..ba19262d6 100644
--- a/renderdoc/driver/ihv/nv/NV.vcxproj
+++ b/renderdoc/driver/ihv/nv/NV.vcxproj
@@ -22,6 +22,7 @@
{40349AD9-5558-4DF4-84E2-11934DE90A11}
NV
+
StaticLibrary
diff --git a/renderdoc/driver/shaders/dxbc/renderdoc_dxbc.vcxproj b/renderdoc/driver/shaders/dxbc/renderdoc_dxbc.vcxproj
index 2ce5b13e9..8342e8264 100644
--- a/renderdoc/driver/shaders/dxbc/renderdoc_dxbc.vcxproj
+++ b/renderdoc/driver/shaders/dxbc/renderdoc_dxbc.vcxproj
@@ -24,6 +24,7 @@
renderdoc_dxbc
dxbc
+
StaticLibrary
diff --git a/renderdoc/driver/shaders/dxil/renderdoc_dxil.vcxproj b/renderdoc/driver/shaders/dxil/renderdoc_dxil.vcxproj
index d22e43778..06fd7946b 100644
--- a/renderdoc/driver/shaders/dxil/renderdoc_dxil.vcxproj
+++ b/renderdoc/driver/shaders/dxil/renderdoc_dxil.vcxproj
@@ -24,6 +24,7 @@
renderdoc_dxil
dxil
+
StaticLibrary
diff --git a/renderdoc/driver/shaders/spirv/renderdoc_spirv.vcxproj b/renderdoc/driver/shaders/spirv/renderdoc_spirv.vcxproj
index 4d4215bb6..5049b3fa3 100644
--- a/renderdoc/driver/shaders/spirv/renderdoc_spirv.vcxproj
+++ b/renderdoc/driver/shaders/spirv/renderdoc_spirv.vcxproj
@@ -24,6 +24,7 @@
renderdoc_spirv
spirv
+
StaticLibrary
diff --git a/renderdoc/driver/vulkan/renderdoc_vulkan.vcxproj b/renderdoc/driver/vulkan/renderdoc_vulkan.vcxproj
index 1ca1693cb..4156d85fe 100644
--- a/renderdoc/driver/vulkan/renderdoc_vulkan.vcxproj
+++ b/renderdoc/driver/vulkan/renderdoc_vulkan.vcxproj
@@ -24,6 +24,7 @@
renderdoc_vulkan
vulkan
+
StaticLibrary
diff --git a/renderdoc/renderdoc.vcxproj b/renderdoc/renderdoc.vcxproj
index 8108005c7..9414c496a 100644
--- a/renderdoc/renderdoc.vcxproj
+++ b/renderdoc/renderdoc.vcxproj
@@ -25,6 +25,7 @@
renderdoc
renderdoc
+
DynamicLibrary
diff --git a/renderdoc/renderdoc_version.vcxproj b/renderdoc/renderdoc_version.vcxproj
index 35f0bb903..0dec255a9 100644
--- a/renderdoc/renderdoc_version.vcxproj
+++ b/renderdoc/renderdoc_version.vcxproj
@@ -22,9 +22,9 @@
{257FD75C-4D17-4A23-A754-23BFD85887A0}
Win32Proj
version
- 8.1
version
+
StaticLibrary
diff --git a/renderdoccmd/renderdoccmd.vcxproj b/renderdoccmd/renderdoccmd.vcxproj
index 11fcd703c..f89278023 100644
--- a/renderdoccmd/renderdoccmd.vcxproj
+++ b/renderdoccmd/renderdoccmd.vcxproj
@@ -24,6 +24,7 @@
renderdoccmd
renderdoccmd
+
Application
diff --git a/renderdocshim/renderdocshim.vcxproj b/renderdocshim/renderdocshim.vcxproj
index e6344a4e4..d86029edb 100644
--- a/renderdocshim/renderdocshim.vcxproj
+++ b/renderdocshim/renderdocshim.vcxproj
@@ -23,6 +23,7 @@
Win32Proj
renderdocshim
+
DynamicLibrary
diff --git a/util/WindowsSDKTarget.props b/util/WindowsSDKTarget.props
new file mode 100644
index 000000000..047743aea
--- /dev/null
+++ b/util/WindowsSDKTarget.props
@@ -0,0 +1,18 @@
+
+
+
+
+
+
+
+
+ $(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v10.0@ProductVersion)
+
+ $(RenderDocLatestWin10SDKVersion).0
+
+
+ $(RenderDocLatestWin10SDKVersion)
+ 8.1
+
+
+