lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-08-30 18:35:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use properties consistently for custom dependency paths on windows

Browse Source 
* This removes the (now undocumented) python env vars, and the never documented
  Qt env vars. We add new build script arguments to specify these paths.
This commit is contained in:
baldurk
2026-08-13 21:05:12 +01:00
parent 5b90b75b79
commit 1416d92b09
6 changed files with 100 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
qrenderdoc/Code/pyrenderdoc/python.props
+4 -6
View File
@@ -31,10 +31,6 @@
As a result we use the existance of the .lib, .h and .zip as a key to
ensure we only use a valid install -->
<!-- We want to keep supporting the old environment variable path for compatibility
but encourage users to use the new property page method. So we check for that first
to determine PythonOverride, and only fall back to env vars if it's not set. -->
<!-- MSBuild doesn't implement a simple loop so just do this by hand by
taking advantage of MSBuild evaluating these in-order.
First we set the number we're testing, then see if we find the files. If
@@ -46,8 +42,6 @@
<!-- first define the override prefix we're searching against -->
<PropertyGroup>
<PythonOverride>$(VSPythonOverridePath)</PythonOverride>
<PythonOverride Condition="'$(VSPythonOverridePath)'=='' AND '$(Platform)'=='Win32'">$(RENDERDOC_PYTHON_PREFIX32)</PythonOverride>
<PythonOverride Condition="'$(VSPythonOverridePath)'=='' AND '$(Platform)'=='x64'">$(RENDERDOC_PYTHON_PREFIX64)</PythonOverride>
</PropertyGroup>
<PropertyGroup><PythonMajorMinorTest>318</PythonMajorMinorTest></PropertyGroup>
@@ -128,6 +122,10 @@
<Message Importance="high" Text="PySide2 found and used from $(PythonOverride)" />
</Target>
<Target Name="PythonNotOverridden" AfterTargets="Build" Condition="'$(CustomPythonUsed)'=='0' AND $(PythonOverride)==''">
<Message Importance="high" Text="Built against default bundled python" />
</Target>
<Target Name="PythonFailedOverridden" AfterTargets="Build" Condition="'$(CustomPythonUsed)'=='0' AND $(PythonOverride)!=''">
<Message Importance="high" Text="** Could not use python version $(PythonOverride) due to missing requirements." />
<Message Importance="high" Text="** Check for $(PythonOverride)\include\Python.h, $(PythonOverride)\pythonMAJMIN.zip, and either $(PythonOverride)\pythonMAJMIN.lib or $(PythonOverride)\libs\pythonMAJMIN.lib" />