diff options
| author | TingPing <tingping@tingping.se> | 2013-10-05 15:55:56 -0400 |
|---|---|---|
| committer | TingPing <tingping@tingping.se> | 2013-10-09 17:17:53 -0400 |
| commit | 111a58f1ef3948d3e15c3aff5c5cbdbb7f1a4123 (patch) | |
| tree | e93983b9ff02d105ce4b58b3e0c40e4239e40043 /win32/installer/installer.vcxproj | |
| parent | 1f069228033c61dc1fd56ea944359cbf510870f3 (diff) | |
Improve Windows installer
- Unify x86 and x64 installer files - Get rid of version program - Clean up .iss file - Only allow one installation
Diffstat (limited to 'win32/installer/installer.vcxproj')
| -rw-r--r-- | win32/installer/installer.vcxproj | 42 |
1 files changed, 6 insertions, 36 deletions
diff --git a/win32/installer/installer.vcxproj b/win32/installer/installer.vcxproj index 0506b246..88de2c35 100644 --- a/win32/installer/installer.vcxproj +++ b/win32/installer/installer.vcxproj @@ -50,7 +50,7 @@ <OutDir>$(HexChatBin)</OutDir> <IntDir>$(HexChatObj)$(ProjectName)\</IntDir> </PropertyGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ItemDefinitionGroup Condition="'$(Configuration)'=='Release'"> <ClCompile> <FunctionLevelLinking>true</FunctionLevelLinking> <IntrinsicFunctions>true</IntrinsicFunctions> @@ -61,46 +61,16 @@ <OptimizeReferences>true</OptimizeReferences> </Link> <PreBuildEvent> - <Command>echo [Setup] > "$(OutDir)\hexchat-x86.iss" -echo WizardImageFile="$(ProjectDir)\wizardimage.bmp" >> "$(OutDir)\hexchat-x86.iss" -echo WizardSmallImageFile="$(ProjectDir)\wizardsmallimage.bmp" >> "$(OutDir)\hexchat-x86.iss" -"$(OutDir)\version" -a >> "$(OutDir)\hexchat-x86.iss" -"$(OutDir)\version" -v >> "$(OutDir)\hexchat-x86.iss" -"$(OutDir)\version" -i >> "$(OutDir)\hexchat-x86.iss" -"$(OutDir)\version" -o >> "$(OutDir)\hexchat-x86.iss" -echo SetupIconFile="$(DataDir)icons\hexchat.ico" >> "$(OutDir)\hexchat-x86.iss" -type hexchat-x86.skel.iss >> "$(OutDir)\hexchat-x86.iss" -"$(ProgramFiles)\Inno Setup 5\compil32" /cc "$(OutDir)\hexchat-x86.iss"</Command> - </PreBuildEvent> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <ClCompile> - <FunctionLevelLinking>true</FunctionLevelLinking> - <IntrinsicFunctions>true</IntrinsicFunctions> - </ClCompile> - <Link> - <GenerateDebugInformation>true</GenerateDebugInformation> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <OptimizeReferences>true</OptimizeReferences> - </Link> - <PreBuildEvent> - <Command>echo [Setup] > "$(OutDir)\hexchat-x64.iss" -echo WizardImageFile="$(ProjectDir)\wizardimage.bmp" >> "$(OutDir)\hexchat-x64.iss" -echo WizardSmallImageFile="$(ProjectDir)\wizardsmallimage.bmp" >> "$(OutDir)\hexchat-x64.iss" -"$(OutDir)\version" -a >> "$(OutDir)\hexchat-x64.iss" -"$(OutDir)\version" -v >> "$(OutDir)\hexchat-x64.iss" -"$(OutDir)\version" -i >> "$(OutDir)\hexchat-x64.iss" -"$(OutDir)\version" -o >> "$(OutDir)\hexchat-x64.iss" -echo SetupIconFile="$(DataDir)icons\hexchat.ico" >> "$(OutDir)\hexchat-x64.iss" -type hexchat-x64.skel.iss >> "$(OutDir)\hexchat-x64.iss" -"$(ProgramFiles)\Inno Setup 5\compil32" /cc "$(OutDir)\hexchat-x64.iss"</Command> + <Command> +del "$(OutDir)hexchat.iss" +type hexchat.iss >> "$(OutDir)hexchat.iss" +"$(ProgramFiles)\Inno Setup 5\iscc.exe" /dPROJECTDIR="$(ProjectDir)" /dAPPARCH="$(Platform)" "$(OutDir)hexchat.iss"</Command> </PreBuildEvent> </ItemDefinitionGroup> <ItemGroup> <None Include="wizardimage.bmp" /> <None Include="wizardsmallimage.bmp" /> - <None Include="hexchat-x64.skel.iss" /> - <None Include="hexchat-x86.skel.iss" /> + <None Include="hexchat.iss" /> </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> |