diff --git a/qrenderdoc/Code/pyrenderdoc/python.props b/qrenderdoc/Code/pyrenderdoc/python.props
index e02782bdf..db0480697 100644
--- a/qrenderdoc/Code/pyrenderdoc/python.props
+++ b/qrenderdoc/Code/pyrenderdoc/python.props
@@ -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 -->
-
-
$(VSPythonOverridePath)
- $(RENDERDOC_PYTHON_PREFIX32)
- $(RENDERDOC_PYTHON_PREFIX64)
318
@@ -128,6 +122,10 @@
+
+
+
+
diff --git a/qrenderdoc/custom_qt.props b/qrenderdoc/custom_qt.props
new file mode 100644
index 000000000..90f6cf283
--- /dev/null
+++ b/qrenderdoc/custom_qt.props
@@ -0,0 +1,38 @@
+
+
+
+
+
+ $(ProjectDir)3rdparty\qt\$(Platform)
+ $(ProjectDir)3rdparty\qt\include
+
+
+ $(QtOverridePath)\msvc2019_64
+ $(QtOverridePath)\msvc2019
+
+
+ $(Qt64OverridePath)
+ $(Qt32OverridePath)
+
+
+ $(QtCustomPath)
+ $(QtCustomPath)\include
+ 0
+ 1
+
+
+ $(QtBaseDir)\bin
+ $(QtBaseDir)\lib
+ $(QtBaseDir)\plugins
+
+
+
+
+
+
+
+
+
+
diff --git a/qrenderdoc/custom_qt_sheet.xml b/qrenderdoc/custom_qt_sheet.xml
new file mode 100644
index 000000000..019ff6328
--- /dev/null
+++ b/qrenderdoc/custom_qt_sheet.xml
@@ -0,0 +1,40 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/qrenderdoc/qrenderdoc_local.vcxproj b/qrenderdoc/qrenderdoc_local.vcxproj
index 9639c5f38..e8cc28139 100644
--- a/qrenderdoc/qrenderdoc_local.vcxproj
+++ b/qrenderdoc/qrenderdoc_local.vcxproj
@@ -78,21 +78,6 @@
-
-
- $(ProjectDir)3rdparty\qt\$(Platform)
- $(ProjectDir)3rdparty\qt\include
- $(RENDERDOC_QT_PREFIX64)
- $(RENDERDOC_QT_PREFIX64)\include
- $(RENDERDOC_QT_PREFIX32)
- $(RENDERDOC_QT_PREFIX32)\include
-
- $(QtBaseDir)\bin
- $(QtBaseDir)\lib
- $(QtBaseDir)\plugins
-
Default
@@ -2192,4 +2177,11 @@
+
+
+
+ Project
+
+
+
\ No newline at end of file
diff --git a/util/buildscripts/build.sh b/util/buildscripts/build.sh
index 8b63138fc..1de10551a 100755
--- a/util/buildscripts/build.sh
+++ b/util/buildscripts/build.sh
@@ -166,6 +166,8 @@ usage() {
echo " --symstore [Windows only] Specify a path to a symbol store.";
echo " --llvm_arm32 Give the path to an ARM32 build of LLVM, for android.";
echo " --llvm_arm64 Give the path to an ARM64 build of LLVM, for android.";
+ echo " --python Give the path to a Python root, for windows.";
+ echo " --qt Give the path to a Qt root, for windows.";
echo " --skipcompile Skip compile steps, package already compiled binaries.";
echo " --strict Require all build steps to complete successfully,";
echo " including optional steps e.g. android/installer.";
@@ -283,6 +285,11 @@ PLATFORM=$(uname)
if uname -a | grep -qiE 'msys|cygwin|microsoft'; then
PLATFORM=Windows
+ echo "Using Python from '$PYTHON_ROOT' and Qt from '$QT_ROOT'"
+
+ export PYTHON_ROOT;
+ export QT_ROOT;
+
if [ -d /c/Windows ]; then
WIN_ROOT=/
elif [ -d /mnt/c/Windows ]; then
diff --git a/util/buildscripts/scripts/compile_win32.sh b/util/buildscripts/scripts/compile_win32.sh
index 75eb6d020..124dab06f 100755
--- a/util/buildscripts/scripts/compile_win32.sh
+++ b/util/buildscripts/scripts/compile_win32.sh
@@ -5,8 +5,10 @@ mkdir -p "${REPO_ROOT}/dist"
# pushd into the git checkout
pushd "${REPO_ROOT}"
+echo Using ${PYTHON_ROOT} and ${QT_ROOT} for build
+
# Build 32-bit Release
-MSYS2_ARG_CONV_EXCL="*" msbuild.exe /nologo /m /fl4 /flp4':Verbosity=minimal;Encoding=ASCII;logfile=dist/build32.log' renderdoc.sln /t:Rebuild /p:'Configuration=Release;Platform=x86'
+MSYS2_ARG_CONV_EXCL="*" msbuild.exe /p:VSPythonOverridePath="$(native_path "${PYTHON_ROOT}")" /p:QtOverridePath="$(native_path "${QT_ROOT}")" /nologo /m /fl4 /flp4':Verbosity=minimal;Encoding=ASCII;logfile=dist/build32.log' renderdoc.sln /t:Rebuild /p:'Configuration=Release;Platform=x86'
if [ ! -f ./Win32/Release/renderdoc.dll ] || [ ! -f ./Win32/Release/qrenderdoc.exe ] || [ ! -f ./Win32/Release/renderdoccmd.exe ] ; then
echo "Failed to build 32-bit release mode.";
@@ -14,7 +16,7 @@ if [ ! -f ./Win32/Release/renderdoc.dll ] || [ ! -f ./Win32/Release/qrenderdoc.e
fi
# Build 64-bit Release
-MSYS2_ARG_CONV_EXCL="*" msbuild.exe /nologo /m /fl4 /flp4':Verbosity=minimal;Encoding=ASCII;logfile=dist/build64.log' renderdoc.sln /t:Rebuild /p:'Configuration=Release;Platform=x64'
+MSYS2_ARG_CONV_EXCL="*" msbuild.exe /p:VSPythonOverridePath="$(native_path "${PYTHON_ROOT}")" /p:QtOverridePath="$(native_path "${QT_ROOT}")" /nologo /m /fl4 /flp4':Verbosity=minimal;Encoding=ASCII;logfile=dist/build64.log' renderdoc.sln /t:Rebuild /p:'Configuration=Release;Platform=x64'
if [ ! -f ./x64/Release/renderdoc.dll ] || [ ! -f ./x64/Release/qrenderdoc.exe ] || [ ! -f ./x64/Release/renderdoccmd.exe ] ; then
echo "Failed to build 64-bit release mode.";