lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-05-04 17:10:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add a load of MSBuild nonsense to *avoid* targeting a specific Win SDK

Browse Source 
* Even though we don't care about the windows SDK version at all, we actively
  need to avoid the default which actively sabotages us.
This commit is contained in:
baldurk
2020-06-11 13:25:02 +01:00
parent ff4a632fbf
commit d1f4a47cd5
28 changed files with 45 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
qrenderdoc/Code/pyrenderdoc/pyrenderdoc_module.vcxproj
+1 -1
View File
@@ -23,8 +23,8 @@
<Keyword>Win32Proj</Keyword>
<RootNamespace>pyrenderdoc_module</RootNamespace>
<ProjectName>pyrenderdoc_module</ProjectName>
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(SolutionDir)\util\WindowsSDKTarget.props" />
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
qrenderdoc/Code/pyrenderdoc/qrenderdoc_module.vcxproj
+1 -1
View File
@@ -23,8 +23,8 @@
<Keyword>Win32Proj</Keyword>
<RootNamespace>qrenderdoc_module</RootNamespace>
<ProjectName>qrenderdoc_module</ProjectName>
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(SolutionDir)\util\WindowsSDKTarget.props" />
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
qrenderdoc/qrenderdoc_local.vcxproj
+1 -1
View File
@@ -30,9 +30,9 @@
<ProjectGuid>{A14A6AE5-02B1-35FE-BE59-B3E7C273B40B}</ProjectGuid>
<RootNamespace>qrenderdoc</RootNamespace>
<Keyword>Qt4VSv1.0</Keyword>
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
<ProjectName>qrenderdoc</ProjectName>
</PropertyGroup>
<Import Project="$(SolutionDir)\util\WindowsSDKTarget.props" />
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup>
<PlatformToolSet>v140</PlatformToolSet>
qrenderdoc/renderdocui_stub.vcxproj
+1 -1
View File
@@ -22,9 +22,9 @@
<ProjectGuid>{37955C79-D91D-423F-8C6C-8F5BCF4F28D4}</ProjectGuid>
<Keyword>Win32Proj</Keyword>
<RootNamespace>renderdocui_stub</RootNamespace>
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
<ProjectName>renderdocui_stub</ProjectName>
</PropertyGroup>
<Import Project="$(SolutionDir)\util\WindowsSDKTarget.props" />
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup>
<ConfigurationType>Application</ConfigurationType>
renderdoc/3rdparty/breakpad/client/windows/common.vcxproj
Vendored
+1
View File
@@ -24,6 +24,7 @@
<RootNamespace>common</RootNamespace>
<ProjectName>breakpad_common</ProjectName>
</PropertyGroup>
<Import Project="$(SolutionDir)\util\WindowsSDKTarget.props" />
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Label="Configuration">
<CharacterSet>Unicode</CharacterSet>
renderdoc/3rdparty/breakpad/client/windows/crash_generation/crash_generation_client.vcxproj
Vendored
+1
View File
@@ -23,6 +23,7 @@
<Keyword>Win32Proj</Keyword>
<RootNamespace>crash_generation_client</RootNamespace>
</PropertyGroup>
<Import Project="$(SolutionDir)\util\WindowsSDKTarget.props" />
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Label="Configuration">
<CharacterSet>Unicode</CharacterSet>
renderdoc/3rdparty/breakpad/client/windows/crash_generation/crash_generation_server.vcxproj
Vendored
+1
View File
@@ -23,6 +23,7 @@
<Keyword>Win32Proj</Keyword>
<RootNamespace>crash_generation_server</RootNamespace>
</PropertyGroup>
<Import Project="$(SolutionDir)\util\WindowsSDKTarget.props" />
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Label="Configuration">
<CharacterSet>Unicode</CharacterSet>
renderdoc/3rdparty/breakpad/client/windows/handler/exception_handler.vcxproj
Vendored
+1
View File
@@ -23,6 +23,7 @@
<Keyword>Win32Proj</Keyword>
<RootNamespace>exception_handler</RootNamespace>
</PropertyGroup>
<Import Project="$(SolutionDir)\util\WindowsSDKTarget.props" />
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Label="Configuration">
<CharacterSet>Unicode</CharacterSet>
renderdoc/driver/d3d11/renderdoc_d3d11.vcxproj
+1
View File
@@ -24,6 +24,7 @@
<RootNamespace>renderdoc_d3d11</RootNamespace>
<ProjectName>d3d11</ProjectName>
</PropertyGroup>
<Import Project="$(SolutionDir)\util\WindowsSDKTarget.props" />
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
renderdoc/driver/d3d12/renderdoc_d3d12.vcxproj
+1
View File
@@ -24,6 +24,7 @@
<RootNamespace>renderdoc_d3d12</RootNamespace>
<ProjectName>d3d12</ProjectName>
</PropertyGroup>
<Import Project="$(SolutionDir)\util\WindowsSDKTarget.props" />
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
renderdoc/driver/d3d8/renderdoc_d3d8.vcxproj
+1
View File
@@ -24,6 +24,7 @@
<RootNamespace>renderdoc_d3d8</RootNamespace>
<ProjectName>d3d8</ProjectName>
</PropertyGroup>
<Import Project="$(SolutionDir)\util\WindowsSDKTarget.props" />
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
renderdoc/driver/d3d9/renderdoc_d3d9.vcxproj
+1
View File
@@ -24,6 +24,7 @@
<RootNamespace>renderdoc_d3d9</RootNamespace>
<ProjectName>d3d9</ProjectName>
</PropertyGroup>
<Import Project="$(SolutionDir)\util\WindowsSDKTarget.props" />
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
renderdoc/driver/dxgi/renderdoc_dxgi.vcxproj
+1
View File
@@ -24,6 +24,7 @@
<RootNamespace>renderdoc_dxgi</RootNamespace>
<ProjectName>dxgi</ProjectName>
</PropertyGroup>
<Import Project="$(SolutionDir)\util\WindowsSDKTarget.props" />
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
renderdoc/driver/gl/renderdoc_gl.vcxproj
+1
View File
@@ -24,6 +24,7 @@
<RootNamespace>renderdoc_gl</RootNamespace>
<ProjectName>gl</ProjectName>
</PropertyGroup>
<Import Project="$(SolutionDir)\util\WindowsSDKTarget.props" />
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
renderdoc/driver/ihv/amd/AMD.vcxproj
+1
View File
@@ -22,6 +22,7 @@
<ProjectGuid>{5DE5A561-548A-4DD7-90F0-06A2B39EAE9A}</ProjectGuid>
<RootNamespace>AMD</RootNamespace>
</PropertyGroup>
<Import Project="$(SolutionDir)\util\WindowsSDKTarget.props" />
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
renderdoc/driver/ihv/amd/AMD_RGP.vcxproj
+1 -1
View File
@@ -21,8 +21,8 @@
<PropertyGroup Label="Globals">
<ProjectGuid>{B33F8FFD-3C04-4779-9C3B-E2858387971B}</ProjectGuid>
<RootNamespace>AMD_RGP</RootNamespace>
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(SolutionDir)\util\WindowsSDKTarget.props" />
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
renderdoc/driver/ihv/arm/ARM.vcxproj
+1
View File
@@ -22,6 +22,7 @@
<ProjectGuid>{F9CCE6CA-0CA3-4A22-9C7B-881369955E62}</ProjectGuid>
<RootNamespace>AMD</RootNamespace>
</PropertyGroup>
<Import Project="$(SolutionDir)\util\WindowsSDKTarget.props" />
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
renderdoc/driver/ihv/intel/Intel.vcxproj
+1 -1
View File
@@ -21,8 +21,8 @@
<PropertyGroup Label="Globals">
<ProjectGuid>{7FCB5FC5-1DBD-4DA6-83A0-6BA4E945BDA5}</ProjectGuid>
<RootNamespace>Intel</RootNamespace>
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(SolutionDir)\util\WindowsSDKTarget.props" />
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
renderdoc/driver/ihv/nv/NV.vcxproj
+1
View File
@@ -22,6 +22,7 @@
<ProjectGuid>{40349AD9-5558-4DF4-84E2-11934DE90A11}</ProjectGuid>
<RootNamespace>NV</RootNamespace>
</PropertyGroup>
<Import Project="$(SolutionDir)\util\WindowsSDKTarget.props" />
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
renderdoc/driver/shaders/dxbc/renderdoc_dxbc.vcxproj
+1
View File
@@ -24,6 +24,7 @@
<RootNamespace>renderdoc_dxbc</RootNamespace>
<ProjectName>dxbc</ProjectName>
</PropertyGroup>
<Import Project="$(SolutionDir)\util\WindowsSDKTarget.props" />
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
renderdoc/driver/shaders/dxil/renderdoc_dxil.vcxproj
+1
View File
@@ -24,6 +24,7 @@
<RootNamespace>renderdoc_dxil</RootNamespace>
<ProjectName>dxil</ProjectName>
</PropertyGroup>
<Import Project="$(SolutionDir)\util\WindowsSDKTarget.props" />
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
renderdoc/driver/shaders/spirv/renderdoc_spirv.vcxproj
+1
View File
@@ -24,6 +24,7 @@
<RootNamespace>renderdoc_spirv</RootNamespace>
<ProjectName>spirv</ProjectName>
</PropertyGroup>
<Import Project="$(SolutionDir)\util\WindowsSDKTarget.props" />
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
renderdoc/driver/vulkan/renderdoc_vulkan.vcxproj
+1
View File
@@ -24,6 +24,7 @@
<RootNamespace>renderdoc_vulkan</RootNamespace>
<ProjectName>vulkan</ProjectName>
</PropertyGroup>
<Import Project="$(SolutionDir)\util\WindowsSDKTarget.props" />
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
renderdoc/renderdoc.vcxproj
+1
View File
@@ -25,6 +25,7 @@
<RootNamespace>renderdoc</RootNamespace>
<ProjectName>renderdoc</ProjectName>
</PropertyGroup>
<Import Project="$(SolutionDir)\util\WindowsSDKTarget.props" />
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
renderdoc/renderdoc_version.vcxproj
+1 -1
View File
@@ -22,9 +22,9 @@
<ProjectGuid>{257FD75C-4D17-4A23-A754-23BFD85887A0}</ProjectGuid>
<Keyword>Win32Proj</Keyword>
<RootNamespace>version</RootNamespace>
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
<ProjectName>version</ProjectName>
</PropertyGroup>
<Import Project="$(SolutionDir)\util\WindowsSDKTarget.props" />
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup>
<ConfigurationType>StaticLibrary</ConfigurationType>
renderdoccmd/renderdoccmd.vcxproj
+1
View File
@@ -24,6 +24,7 @@
<RootNamespace>renderdoccmd</RootNamespace>
<ProjectName>renderdoccmd</ProjectName>
</PropertyGroup>
<Import Project="$(SolutionDir)\util\WindowsSDKTarget.props" />
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Development|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
renderdocshim/renderdocshim.vcxproj
+1
View File
@@ -23,6 +23,7 @@
<Keyword>Win32Proj</Keyword>
<RootNamespace>renderdocshim</RootNamespace>
</PropertyGroup>
<Import Project="$(SolutionDir)\util\WindowsSDKTarget.props" />
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Development|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
util/WindowsSDKTarget.props
+18
View File
@@ -0,0 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<!-- visual studio doesn't have a way to say "I don't care about the SDK version". Targetting an old version will explicitly fail on new SDKs for some stupid reason. So instead we try to target the latest windows 10 SDK or 8.1 if no windows 10 SDK is installed -->
<!-- Note, in VS2019 this is semi-fixed and you can specify 10.0 to mean 'any windows 10 SDK'. However a) presumably this will break when windows 11 ships. b) it only works if you're using the v142 toolset for no good reason. -->
<PropertyGroup>
<RenderDocLatestWin10SDKVersion>$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v10.0@ProductVersion)</RenderDocLatestWin10SDKVersion>
<!-- version needed has extra .0 -->
<RenderDocLatestWin10SDKVersion Condition="'$(RenderDocLatestWin10SDKVersion)'!=''">$(RenderDocLatestWin10SDKVersion).0</RenderDocLatestWin10SDKVersion>
<!-- if we found the SDK version, use it. Otherwise fall back to 8.1. Since we require VS2015 which installed the 8.1 SDK at minimum we don't need to fallback any earlier (though we don't use anything from the 8.1 SDK either) -->
<WindowsTargetPlatformVersion Condition="'$(RenderDocLatestWin10SDKVersion)'!=''">$(RenderDocLatestWin10SDKVersion)</WindowsTargetPlatformVersion>
<WindowsTargetPlatformVersion Condition="'$(RenderDocLatestWin10SDKVersion)'==''">8.1</WindowsTargetPlatformVersion>
</PropertyGroup>
</Project>