diff options
| author | Arnavion <arnavion@gmail.com> | 2013-11-03 14:16:11 -0800 |
|---|---|---|
| committer | Arnavion <arnavion@gmail.com> | 2013-11-03 14:16:11 -0800 |
| commit | 2e75068c7c4c772fc2c8fc7244a1ceeea87171cc (patch) | |
| tree | 46d0d805112ec64ebfde7db6ad01d712f4a959cf | |
| parent | af248ce2c17416ed33e9feb3d248347ee86f02e4 (diff) | |
Use correct path to TextTransform.exe depending on the platform.
| -rw-r--r-- | src/common/common.vcxproj | 4 | ||||
| -rw-r--r-- | src/fe-gtk/fe-gtk.vcxproj | 2 | ||||
| -rw-r--r-- | win32/hexchat.props | 2 | ||||
| -rw-r--r-- | win32/installer/installer.vcxproj | 2 |
4 files changed, 6 insertions, 4 deletions
diff --git a/src/common/common.vcxproj b/src/common/common.vcxproj index 13610cee..39c50222 100644 --- a/src/common/common.vcxproj +++ b/src/common/common.vcxproj @@ -159,8 +159,8 @@ <Command> <![CDATA[ SET SOLUTIONDIR=$(SolutionDir)..\ -"%PROGRAMFILES%\Common Files\microsoft shared\TextTemplating\12.0\TextTransform.exe" -out "%SOLUTIONDIR%config-win32.h" "%SOLUTIONDIR%config-win32.h.tt" -"%PROGRAMFILES%\Common Files\microsoft shared\TextTemplating\12.0\TextTransform.exe" -out "%SOLUTIONDIR%win32\version.txt" "%SOLUTIONDIR%win32\version.txt.tt" +$(TextTransformPath) -out "%SOLUTIONDIR%config-win32.h" "%SOLUTIONDIR%config-win32.h.tt" +$(TextTransformPath) -out "%SOLUTIONDIR%win32\version.txt" "%SOLUTIONDIR%win32\version.txt.tt" ]]> </Command> </PreBuildEvent> diff --git a/src/fe-gtk/fe-gtk.vcxproj b/src/fe-gtk/fe-gtk.vcxproj index 7cc40da8..90218fc9 100644 --- a/src/fe-gtk/fe-gtk.vcxproj +++ b/src/fe-gtk/fe-gtk.vcxproj @@ -100,7 +100,7 @@ <Command> <![CDATA[ SET SOLUTIONDIR=$(SolutionDir)..\ -"%PROGRAMFILES%\Common Files\microsoft shared\TextTemplating\12.0\TextTransform.exe" -out hexchat.rc hexchat.rc.tt +$(TextTransformPath) -out hexchat.rc hexchat.rc.tt $(DepsRoot)\bin\glib-compile-resources.exe --generate-source --sourcedir $(DataDir) --target "$(ProjectDir)resources.c" "$(DataDir)hexchat.gresource.xml" ]]> </Command> 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" |