From: Thomas Heller <theller@ctypes.org>
Date: Fri, 16 Apr 2004 18:47:50 +0000 (+0000)
Subject: The wininst-7.1.exe template binary for bdist_wininst is now linked
X-Git-Tag: v2.4a1~489
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=89adf0a6017712b2667f1b6119f77daf7ccaeb5d;p=python

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.
---

diff --git a/PC/bdist_wininst/wininst-7.1.vcproj b/PC/bdist_wininst/wininst-7.1.vcproj
index 55bac5be95..80fcdebaea 100644
--- a/PC/bdist_wininst/wininst-7.1.vcproj
+++ b/PC/bdist_wininst/wininst-7.1.vcproj
@@ -24,7 +24,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="1"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\Include,..\..\..\zlib-1.1.4"
+				AdditionalIncludeDirectories="..\..\Include,..\..\..\zlib-1.2.1"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
 				StringPooling="TRUE"
 				RuntimeLibrary="2"
@@ -41,7 +41,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				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"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
@@ -59,7 +59,7 @@
 				HeaderFileName=""/>
 			<Tool
 				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
 				Name="VCPreBuildEventTool"/>
 			<Tool
@@ -90,7 +90,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\Include,..\..\..\zlib-1.1.4"
+				AdditionalIncludeDirectories="..\..\Include,..\..\..\zlib-1.2.1"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="2"
@@ -107,7 +107,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				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"
 				LinkIncremental="2"
 				SuppressStartupBanner="TRUE"