From a0c6e534e0a1219176aa3d08ae8cbe066145d643 Mon Sep 17 00:00:00 2001
From: Rom Walton <romw@romwnet.org>
Date: Fri, 16 Nov 2012 11:25:14 -0500
Subject: [PATCH]     - ZIP: Add missing preprocessor symbols to the 64-bit
 build targets.

---
 checkin_notes                          |  7 +++++++
 win_build/boinc.sln                    | 21 ---------------------
 win_build/libboinczip_staticcrt.vcproj |  4 ++--
 3 files changed, 9 insertions(+), 23 deletions(-)

diff --git a/checkin_notes b/checkin_notes
index 1469a4d485..187708f12c 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -6879,3 +6879,10 @@ Charlie 16 Nov 2012
     zip/
         boinc_zip.xcodeproj/
             project.pbxproj
+
+Rom    16 Nov 2012
+    - ZIP: Add missing preprocessor symbols to the 64-bit build targets.
+    
+    win_build/
+        libboinczip_staticcrt.vcproj
+    
\ No newline at end of file
diff --git a/win_build/boinc.sln b/win_build/boinc.sln
index c8f6b59dba..265613e02a 100644
--- a/win_build/boinc.sln
+++ b/win_build/boinc.sln
@@ -268,16 +268,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libboinczip_staticcrt", "li
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_boinczip", "test_boinc_zip.vcproj", "{92253F20-4CD6-494E-8DEF-F5B4555B61CD}"
-	ProjectSection(WebsiteProperties) = preProject
-		Debug.AspNetCompiler.Debug = "True"
-		Release.AspNetCompiler.Debug = "False"
-	EndProjectSection
-	ProjectSection(ProjectDependencies) = postProject
-		{753E897D-9ECE-42B1-9F0D-CD566775C77E} = {753E897D-9ECE-42B1-9F0D-CD566775C77E}
-		{B00664BD-71EB-46C1-957E-CD851418D395} = {B00664BD-71EB-46C1-957E-CD851418D395}
-	EndProjectSection
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -748,17 +738,6 @@ Global
 		{753E897D-9ECE-42B1-9F0D-CD566775C77E}.Release|Win32.Build.0 = Release|Win32
 		{753E897D-9ECE-42B1-9F0D-CD566775C77E}.Release|x64.ActiveCfg = Release|x64
 		{753E897D-9ECE-42B1-9F0D-CD566775C77E}.Release|x64.Build.0 = Release|x64
-		{92253F20-4CD6-494E-8DEF-F5B4555B61CD}.Debug|Win32.ActiveCfg = Debug|Win32
-		{92253F20-4CD6-494E-8DEF-F5B4555B61CD}.Debug|x64.ActiveCfg = Debug|x64
-		{92253F20-4CD6-494E-8DEF-F5B4555B61CD}.EmuDebug|Win32.ActiveCfg = Debug|Win32
-		{92253F20-4CD6-494E-8DEF-F5B4555B61CD}.EmuDebug|Win32.Build.0 = Debug|Win32
-		{92253F20-4CD6-494E-8DEF-F5B4555B61CD}.EmuDebug|x64.ActiveCfg = Debug|Win32
-		{92253F20-4CD6-494E-8DEF-F5B4555B61CD}.EmuRelease|Win32.ActiveCfg = Release|Win32
-		{92253F20-4CD6-494E-8DEF-F5B4555B61CD}.EmuRelease|Win32.Build.0 = Release|Win32
-		{92253F20-4CD6-494E-8DEF-F5B4555B61CD}.EmuRelease|x64.ActiveCfg = Release|Win32
-		{92253F20-4CD6-494E-8DEF-F5B4555B61CD}.Release|Win32.ActiveCfg = Release|Win32
-		{92253F20-4CD6-494E-8DEF-F5B4555B61CD}.Release|Win32.Build.0 = Release|Win32
-		{92253F20-4CD6-494E-8DEF-F5B4555B61CD}.Release|x64.ActiveCfg = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/win_build/libboinczip_staticcrt.vcproj b/win_build/libboinczip_staticcrt.vcproj
index 94dac79791..d92f5e02ac 100644
--- a/win_build/libboinczip_staticcrt.vcproj
+++ b/win_build/libboinczip_staticcrt.vcproj
@@ -120,7 +120,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\lib,..\,.\,..\..\zlib"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;DLL;_CRT_SECURE_NO_WARNINGS;NO_MKTEMP"
+				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;DLL;_CRT_SECURE_NO_WARNINGS;NO_MKTEMP;USE_ZIPMAIN;NO_CRYPT;IZ_PWLEN=80;NO_ASM;NO_UNICODE_SUPPORT"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
 				PrecompiledHeaderFile=".\Debug/boinc_zip.pch"
@@ -272,7 +272,7 @@
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				AdditionalIncludeDirectories="..\lib,..\,.\,..\..\zlib"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;DLL;_CRT_SECURE_NO_WARNINGS;NO_MKTEMP"
+				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;DLL;_CRT_SECURE_NO_WARNINGS;NO_MKTEMP;USE_ZIPMAIN;NO_CRYPT;IZ_PWLEN=80;NO_ASM;NO_UNICODE_SUPPORT"
 				StringPooling="true"
 				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="true"