From f2f38880f91e78b03e79f5561f661f875c60f390 Mon Sep 17 00:00:00 2001 From: baldurk Date: Fri, 19 Aug 2016 02:00:55 +0200 Subject: [PATCH] Remove absolute path to WiX toolset - use $WIX --- dist.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dist.sh b/dist.sh index 4d73fc439..ab381b87c 100644 --- a/dist.sh +++ b/dist.sh @@ -76,10 +76,10 @@ VERSION=`egrep "#define RENDERDOC_VERSION_(MAJOR|MINOR)" renderdoc/data/version. export RENDERDOC_VERSION="${VERSION}.0" -/c/Program\ Files\ \(x86\)/WiX\ Toolset\ v3.8/bin/candle.exe -o dist/Installer32.wixobj installer/Installer32.wxs -/c/Program\ Files\ \(x86\)/WiX\ Toolset\ v3.8/bin/light.exe -ext WixUIExtension -sw1076 -loc installer/customtext.wxl -o dist/Installer32.msi dist/Installer32.wixobj +"$WIX/bin/candle.exe" -o dist/Installer32.wixobj installer/Installer32.wxs +"$WIX/bin/light.exe" -ext WixUIExtension -sw1076 -loc installer/customtext.wxl -o dist/Installer32.msi dist/Installer32.wixobj -/c/Program\ Files\ \(x86\)/WiX\ Toolset\ v3.8/bin/candle.exe -o dist/Installer64.wixobj installer/Installer64.wxs -/c/Program\ Files\ \(x86\)/WiX\ Toolset\ v3.8/bin/light.exe -ext WixUIExtension -sw1076 -loc installer/customtext.wxl -o dist/Installer64.msi dist/Installer64.wixobj +"$WIX/bin/candle.exe" -o dist/Installer64.wixobj installer/Installer64.wxs +"$WIX/bin/light.exe" -ext WixUIExtension -sw1076 -loc installer/customtext.wxl -o dist/Installer64.msi dist/Installer64.wixobj rm dist/*.wixobj dist/*.wixpdb