summary refs log tree commit diff stats
path: root/win32
diff options
context:
space:
mode:
authorArnavion <arnavion@gmail.com>2013-11-03 14:16:11 -0800
committerArnavion <arnavion@gmail.com>2013-11-03 14:16:11 -0800
commit2e75068c7c4c772fc2c8fc7244a1ceeea87171cc (patch)
tree46d0d805112ec64ebfde7db6ad01d712f4a959cf /win32
parentaf248ce2c17416ed33e9feb3d248347ee86f02e4 (diff)
Use correct path to TextTransform.exe depending on the platform.
Diffstat (limited to 'win32')
-rw-r--r--win32/hexchat.props2
-rw-r--r--win32/installer/installer.vcxproj2
2 files changed, 3 insertions, 1 deletions
diff --git a/win32/hexchat.props b/win32/hexchat.props
index 57f77648..e5bc6acf 100644
--- a/win32/hexchat.props
+++ b/win32/hexchat.props
@@ -94,6 +94,8 @@ copy "$(HexChatBin)hcsysinfo.dll" "$(HexChatRel)\plugins"
 xcopy /q /s /i "$(HexChatBin)locale" "$(HexChatRel)\share\locale"

 xcopy /q /s /i "$(DepsRoot)\share\locale" "$(HexChatRel)\share\locale"

 		</HexChatCopy>

+		<TextTransformPath Condition="'$(Platform)'=='Win32'">"%PROGRAMFILES%\Common Files\microsoft shared\TextTemplating\12.0\TextTransform.exe"</TextTransformPath>

+		<TextTransformPath Condition="'$(Platform)'=='x64'">"%PROGRAMFILES(x86)%\Common Files\microsoft shared\TextTemplating\12.0\TextTransform.exe"</TextTransformPath>

 	</PropertyGroup>

 

 	<ItemDefinitionGroup>

diff --git a/win32/installer/installer.vcxproj b/win32/installer/installer.vcxproj
index 453e87bd..54e361f6 100644
--- a/win32/installer/installer.vcxproj
+++ b/win32/installer/installer.vcxproj
@@ -64,7 +64,7 @@
       <Command>

       <![CDATA[

 SET SOLUTIONDIR=$(SolutionDir)..\

-"%PROGRAMFILES%\Common Files\microsoft shared\TextTemplating\12.0\TextTransform.exe" -out "%SOLUTIONDIR%win32\installer\hexchat.iss" "%SOLUTIONDIR%win32\installer\hexchat.iss.tt"

+$(TextTransformPath) -out "%SOLUTIONDIR%win32\installer\hexchat.iss" "%SOLUTIONDIR%win32\installer\hexchat.iss.tt"

 del "$(OutDir)hexchat.iss"

 type hexchat.iss >> "$(OutDir)hexchat.iss"

 "$(ProgramFiles)\Inno Setup 5\iscc.exe" /dPROJECTDIR="$(ProjectDir)" /dAPPARCH="$(Platform)" "$(OutDir)hexchat.iss"