Commit 77d52402 authored by Thomas Heller's avatar Thomas Heller

The wininst-7.1.exe template binary for bdist_wininst is now linked

with zlib-1.2.1.

UPX needs the --force flag to be able to compress it.
parent 2fa4ec76
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="1" Optimization="1"
InlineFunctionExpansion="1" InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\Include,..\..\..\zlib-1.1.4" AdditionalIncludeDirectories="..\..\Include,..\..\..\zlib-1.2.1"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
StringPooling="TRUE" StringPooling="TRUE"
RuntimeLibrary="2" RuntimeLibrary="2"
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
Name="VCCustomBuildTool"/> Name="VCCustomBuildTool"/>
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="..\..\..\zlib-1.1.4\zlib.lib imagehlp.lib comctl32.lib" AdditionalDependencies="..\..\..\zlib-1.2.1\zlib.lib imagehlp.lib comctl32.lib"
OutputFile="..\..\lib\distutils\command/wininst-7.1.exe" OutputFile="..\..\lib\distutils\command/wininst-7.1.exe"
LinkIncremental="1" LinkIncremental="1"
SuppressStartupBanner="TRUE" SuppressStartupBanner="TRUE"
...@@ -59,7 +59,7 @@ ...@@ -59,7 +59,7 @@
HeaderFileName=""/> HeaderFileName=""/>
<Tool <Tool
Name="VCPostBuildEventTool" Name="VCPostBuildEventTool"
CommandLine="c:\util\upx.exe --best &quot;$(TARGETPATH)&quot; || echo &quot;wininst.exe not compressed&quot;"/> CommandLine="c:\util\upx.exe --force --best &quot;$(TARGETPATH)&quot; || echo &quot;wininst.exe not compressed&quot;"/>
<Tool <Tool
Name="VCPreBuildEventTool"/> Name="VCPreBuildEventTool"/>
<Tool <Tool
...@@ -90,7 +90,7 @@ ...@@ -90,7 +90,7 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="..\..\Include,..\..\..\zlib-1.1.4" AdditionalIncludeDirectories="..\..\Include,..\..\..\zlib-1.2.1"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
RuntimeLibrary="2" RuntimeLibrary="2"
UsePrecompiledHeader="2" UsePrecompiledHeader="2"
...@@ -107,7 +107,7 @@ ...@@ -107,7 +107,7 @@
Name="VCCustomBuildTool"/> Name="VCCustomBuildTool"/>
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="..\..\..\zlib-1.1.4\zlib.lib imagehlp.lib comctl32.lib" AdditionalDependencies="..\..\..\zlib-1.2.1\zlib.lib imagehlp.lib comctl32.lib"
OutputFile="..\..\lib\distutils\command/wininst-7.1_d.exe" OutputFile="..\..\lib\distutils\command/wininst-7.1_d.exe"
LinkIncremental="2" LinkIncremental="2"
SuppressStartupBanner="TRUE" SuppressStartupBanner="TRUE"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment