From f0fe801d2715090640de6b5f0d5a33543a2a19bb Mon Sep 17 00:00:00 2001 From: baldurk Date: Sun, 12 Jul 2020 10:51:51 +0100 Subject: [PATCH] Specify RC include paths instead of using a macro for the output path * This fixes an issue with builds failing when the path contains some characters RC doesn't like for some reason, even if it's quoted. --- renderdoc/data/renderdoc.rc | 10 +++++----- renderdoc/renderdoc.vcxproj | 3 ++- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/renderdoc/data/renderdoc.rc b/renderdoc/data/renderdoc.rc index c640ccc5e..b11741560 100644 --- a/renderdoc/data/renderdoc.rc +++ b/renderdoc/data/renderdoc.rc @@ -122,11 +122,11 @@ RESOURCE_fixedcol_hlsl TYPE_EMBED "hlsl/fixedcol.hlsl" #define CONCAT(a, b) CONCAT2(a, b) #endif -RESOURCE_fixedcol_0_dxbc TYPE_EMBED CONCAT(RENDERDOC_BAKED_PATH, fixedcol_0.dxbc) -RESOURCE_fixedcol_1_dxbc TYPE_EMBED CONCAT(RENDERDOC_BAKED_PATH, fixedcol_1.dxbc) -RESOURCE_fixedcol_2_dxbc TYPE_EMBED CONCAT(RENDERDOC_BAKED_PATH, fixedcol_2.dxbc) -RESOURCE_fixedcol_3_dxbc TYPE_EMBED CONCAT(RENDERDOC_BAKED_PATH, fixedcol_3.dxbc) -RESOURCE_quadwrite_dxbc TYPE_EMBED CONCAT(RENDERDOC_BAKED_PATH, quadwrite.dxbc) +RESOURCE_fixedcol_0_dxbc TYPE_EMBED fixedcol_0.dxbc +RESOURCE_fixedcol_1_dxbc TYPE_EMBED fixedcol_1.dxbc +RESOURCE_fixedcol_2_dxbc TYPE_EMBED fixedcol_2.dxbc +RESOURCE_fixedcol_3_dxbc TYPE_EMBED fixedcol_3.dxbc +RESOURCE_quadwrite_dxbc TYPE_EMBED quadwrite.dxbc #else diff --git a/renderdoc/renderdoc.vcxproj b/renderdoc/renderdoc.vcxproj index f75d9bf5c..27d81967c 100644 --- a/renderdoc/renderdoc.vcxproj +++ b/renderdoc/renderdoc.vcxproj @@ -693,7 +693,8 @@ namespace DXCEnumerateAndCheck { - RENDERDOC_BAKED_DXC_SHADERS=1;RENDERDOC_BAKED_PATH="$(DXILBakedDirParam)";%(PreprocessorDefinitions) + $(DXILBakedDirParam) + RENDERDOC_BAKED_DXC_SHADERS=1;%(PreprocessorDefinitions)