diff options
| author | Arnavion <arnavion@gmail.com> | 2013-11-03 14:46:13 -0800 |
|---|---|---|
| committer | Arnavion <arnavion@gmail.com> | 2013-11-03 14:46:13 -0800 |
| commit | 39aec3a45bff5d514f0767dbe151663e54ba5efa (patch) | |
| tree | 3cdf0526b191839a06fa0468773ab1f34f714057 | |
| parent | e8282d97f1a5045dbd782a1e8188a46c646a598a (diff) | |
installer: Use correct path to iscc.exe depending on the platform.
| -rw-r--r-- | win32/hexchat.props | 2 | ||||
| -rw-r--r-- | win32/installer/installer.vcxproj | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/win32/hexchat.props b/win32/hexchat.props index e5bc6acf..3acfd913 100644 --- a/win32/hexchat.props +++ b/win32/hexchat.props @@ -96,6 +96,8 @@ 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> + <IsccPath Condition="'$(Platform)'=='Win32'">"%PROGRAMFILES%\Inno Setup 5\iscc.exe"</IsccPath> + <IsccPath Condition="'$(Platform)'=='x64'">"%PROGRAMFILES(x86)%\Inno Setup 5\iscc.exe"</IsccPath> </PropertyGroup> <ItemDefinitionGroup> diff --git a/win32/installer/installer.vcxproj b/win32/installer/installer.vcxproj index 54e361f6..09654ab0 100644 --- a/win32/installer/installer.vcxproj +++ b/win32/installer/installer.vcxproj @@ -67,7 +67,7 @@ SET SOLUTIONDIR=$(SolutionDir)..\ $(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" +$(IsccPath) /dPROJECTDIR="$(ProjectDir)" /dAPPARCH="$(Platform)" "$(OutDir)hexchat.iss" ]]> </Command> </PreBuildEvent> |