zlib: Remove left-over duplicate of build.
authormark <mark@2c67d6c2-4361-4cd7-bd83-1149b1926c9b>
Tue, 28 May 2013 16:39:50 +0000 (16:39 +0000)
committermark <mark@2c67d6c2-4361-4cd7-bd83-1149b1926c9b>
Tue, 28 May 2013 16:39:50 +0000 (16:39 +0000)
git-svn-id: https://valelab.ucsf.edu/svn/3rdpartypublic@140 2c67d6c2-4361-4cd7-bd83-1149b1926c9b

zlib_build/VS2008/Win32/Debug/zlibstat.lib [deleted file]
zlib_build/VS2008/Win32/Release/zlibstat.lib [deleted file]
zlib_build/VS2008/build_zlib.bat [deleted file]
zlib_build/VS2008/c_runtime.patch [deleted file]
zlib_build/VS2008/x64/Debug/zlibstat.lib [deleted file]
zlib_build/VS2008/x64/Release/zlibstat.lib [deleted file]

diff --git a/zlib_build/VS2008/Win32/Debug/zlibstat.lib b/zlib_build/VS2008/Win32/Debug/zlibstat.lib
deleted file mode 100644 (file)
index 0914754..0000000
Binary files a/zlib_build/VS2008/Win32/Debug/zlibstat.lib and /dev/null differ
diff --git a/zlib_build/VS2008/Win32/Release/zlibstat.lib b/zlib_build/VS2008/Win32/Release/zlibstat.lib
deleted file mode 100644 (file)
index 82c6751..0000000
Binary files a/zlib_build/VS2008/Win32/Release/zlibstat.lib and /dev/null differ
diff --git a/zlib_build/VS2008/build_zlib.bat b/zlib_build/VS2008/build_zlib.bat
deleted file mode 100644 (file)
index 1563e27..0000000
+++ /dev/null
@@ -1,92 +0,0 @@
-@echo off\r
-setlocal ENABLEDELAYEDEXPANSION\r
-rem Author: Mark Tsuchida\r
-rem See contrib\vstudio\readme.txt.\r
-rem\r
-rem Change these two paths as needed:\r
-set ZLIB_SRC_ROOT=..\..\zlib\r
-set VC_DIR="C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC"\r
-\r
-\r
-if "%1" == "/f" (\r
-  call :do_build\r
-  goto :EOF\r
-)\r
-if "%1" == "/F" (\r
-  call :do_build\r
-  goto :EOF\r
-)\r
-echo.\r
-echo Before building, you should modify the project files to link to the DLL\r
-echo version of the Microsoft C Runtime (/MD or /MDd) in the Win32\r
-echo configuration. At least in zlib 1.2.8, the x64 configuration already\r
-echo uses this setting.\r
-echo.\r
-echo If MinGW is available, this can be accomplished by running\r
-echo   sed -i 's/RuntimeLibrary="0"/RuntimeLibrary="2"/' *.vcproj\r
-echo   sed -i 's/RuntimeLibrary="1"/RuntimeLibrary="3"/' *.vcproj\r
-echo in zlib/contrib/vstudio/vc9.\r
-echo.\r
-echo Rerun this batch file as '%0 /f' to bypass this message.\r
-goto :EOF\r
-\r
-\r
-:do_build\r
-call :build_asm\r
-call :build_libs\r
-call :stage_libs\r
-goto :EOF\r
-\r
-\r
-:clear_env\r
-set INCLUDE=\r
-set LIBS=\r
-set LIBPATH=\r
-goto :EOF\r
-\r
-\r
-:build_asm\r
-call :clear_env\r
-pushd %VC_DIR%\r
-call vcvarsall.bat\r
-popd\r
-pushd %ZLIB_SRC_ROOT%\contrib\masmx86\r
-call bld_ml32.bat\r
-popd\r
-\r
-call :clear_env\r
-pushd %VC_DIR%\r
-call bin\vcvars64.bat\r
-popd\r
-pushd %ZLIB_SRC_ROOT%\contrib\masmx64\r
-call bld_ml64.bat\r
-popd\r
-goto :EOF\r
-\r
-\r
-:build_libs\r
-call :clear_env\r
-pushd %VC_DIR%\r
-call vcvarsall.bat\r
-popd\r
-\r
-pushd %ZLIB_SRC_ROOT%\contrib\vstudio\vc9\r
-vcbuild /rebuild zlibvc.sln "Debug|Win32"\r
-vcbuild /rebuild zlibvc.sln "Release|Win32"\r
-vcbuild /rebuild zlibvc.sln "Debug|x64"\r
-vcbuild /rebuild zlibvc.sln "Release|x64"\r
-popd\r
-goto :EOF\r
-\r
-\r
-:stage_libs\r
-for %%I in (Debug Release) do (\r
-  set DEST_DIR=.\Win32\%%I\r
-  if not exist !DEST_DIR! md !DEST_DIR!\r
-  copy "%ZLIB_SRC_ROOT%\contrib\vstudio\vc9\x86\ZlibStat%%I\zlibstat.lib" !DEST_DIR!\r
-\r
-  set DEST_DIR=.\x64\%%I\r
-  if not exist !DEST_DIR! md !DEST_DIR!\r
-  copy "%ZLIB_SRC_ROOT%\contrib\vstudio\vc9\x64\ZlibStat%%I\zlibstat.lib" !DEST_DIR!\r
-)\r
-goto :EOF\r
diff --git a/zlib_build/VS2008/c_runtime.patch b/zlib_build/VS2008/c_runtime.patch
deleted file mode 100644 (file)
index 67afb76..0000000
+++ /dev/null
@@ -1,153 +0,0 @@
-diff -Naur a/contrib/vstudio/vc9/miniunz.vcproj b/contrib/vstudio/vc9/miniunz.vcproj
---- a/contrib/vstudio/vc9/miniunz.vcproj       Mon May 20 15:26:14 2013
-+++ b/contrib/vstudio/vc9/miniunz.vcproj       Mon May 20 14:30:04 2013
-@@ -51,7 +51,7 @@
-                               PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE"
-                               MinimalRebuild="true"
-                               BasicRuntimeChecks="0"
--                              RuntimeLibrary="1"
-+                              RuntimeLibrary="3"
-                               BufferSecurityCheck="false"
-                               UsePrecompiledHeader="0"
-                               AssemblerListingLocation="$(IntDir)\"
-@@ -135,7 +135,7 @@
-                               PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE"
-                               StringPooling="true"
-                               BasicRuntimeChecks="0"
--                              RuntimeLibrary="0"
-+                              RuntimeLibrary="2"
-                               BufferSecurityCheck="false"
-                               EnableFunctionLevelLinking="true"
-                               UsePrecompiledHeader="0"
-diff -Naur a/contrib/vstudio/vc9/minizip.vcproj b/contrib/vstudio/vc9/minizip.vcproj
---- a/contrib/vstudio/vc9/minizip.vcproj       Mon May 20 15:26:14 2013
-+++ b/contrib/vstudio/vc9/minizip.vcproj       Mon May 20 14:30:04 2013
-@@ -51,7 +51,7 @@
-                               PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE"
-                               MinimalRebuild="true"
-                               BasicRuntimeChecks="0"
--                              RuntimeLibrary="1"
-+                              RuntimeLibrary="3"
-                               BufferSecurityCheck="false"
-                               UsePrecompiledHeader="0"
-                               AssemblerListingLocation="$(IntDir)\"
-@@ -135,7 +135,7 @@
-                               PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE"
-                               StringPooling="true"
-                               BasicRuntimeChecks="0"
--                              RuntimeLibrary="0"
-+                              RuntimeLibrary="2"
-                               BufferSecurityCheck="false"
-                               EnableFunctionLevelLinking="true"
-                               UsePrecompiledHeader="0"
-diff -Naur a/contrib/vstudio/vc9/testzlib.vcproj b/contrib/vstudio/vc9/testzlib.vcproj
---- a/contrib/vstudio/vc9/testzlib.vcproj      Mon May 20 15:26:14 2013
-+++ b/contrib/vstudio/vc9/testzlib.vcproj      Mon May 20 14:30:04 2013
-@@ -51,7 +51,7 @@
-                               PreprocessorDefinitions="ASMV;ASMINF;WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
-                               MinimalRebuild="true"
-                               BasicRuntimeChecks="0"
--                              RuntimeLibrary="1"
-+                              RuntimeLibrary="3"
-                               BufferSecurityCheck="false"
-                               UsePrecompiledHeader="0"
-                               AssemblerOutput="4"
-@@ -282,7 +282,7 @@
-                               PreprocessorDefinitions="WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
-                               StringPooling="true"
-                               BasicRuntimeChecks="0"
--                              RuntimeLibrary="0"
-+                              RuntimeLibrary="2"
-                               BufferSecurityCheck="false"
-                               EnableFunctionLevelLinking="true"
-                               UsePrecompiledHeader="0"
-@@ -520,7 +520,7 @@
-                               PreprocessorDefinitions="ASMV;ASMINF;WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
-                               StringPooling="true"
-                               BasicRuntimeChecks="0"
--                              RuntimeLibrary="0"
-+                              RuntimeLibrary="2"
-                               BufferSecurityCheck="false"
-                               EnableFunctionLevelLinking="true"
-                               UsePrecompiledHeader="0"
-@@ -602,7 +602,7 @@
-                               AdditionalIncludeDirectories="..\..\.."
-                               PreprocessorDefinitions="ASMV;ASMINF;WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
-                               BasicRuntimeChecks="0"
--                              RuntimeLibrary="0"
-+                              RuntimeLibrary="2"
-                               BufferSecurityCheck="false"
-                               AssemblerListingLocation="$(IntDir)\"
-                       />
-diff -Naur a/contrib/vstudio/vc9/testzlibdll.vcproj b/contrib/vstudio/vc9/testzlibdll.vcproj
---- a/contrib/vstudio/vc9/testzlibdll.vcproj   Mon May 20 15:26:14 2013
-+++ b/contrib/vstudio/vc9/testzlibdll.vcproj   Mon May 20 14:30:04 2013
-@@ -51,7 +51,7 @@
-                               PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE"
-                               MinimalRebuild="true"
-                               BasicRuntimeChecks="0"
--                              RuntimeLibrary="1"
-+                              RuntimeLibrary="3"
-                               BufferSecurityCheck="false"
-                               UsePrecompiledHeader="0"
-                               AssemblerListingLocation="$(IntDir)\"
-@@ -135,7 +135,7 @@
-                               PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE"
-                               StringPooling="true"
-                               BasicRuntimeChecks="0"
--                              RuntimeLibrary="0"
-+                              RuntimeLibrary="2"
-                               BufferSecurityCheck="false"
-                               EnableFunctionLevelLinking="true"
-                               UsePrecompiledHeader="0"
-diff -Naur a/contrib/vstudio/vc9/zlibstat.vcproj b/contrib/vstudio/vc9/zlibstat.vcproj
---- a/contrib/vstudio/vc9/zlibstat.vcproj      Mon May 20 15:26:14 2013
-+++ b/contrib/vstudio/vc9/zlibstat.vcproj      Mon May 20 14:30:04 2013
-@@ -50,7 +50,7 @@
-                               AdditionalIncludeDirectories="..\..\..;..\..\masmx86"
-                               PreprocessorDefinitions="WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
-                               ExceptionHandling="0"
--                              RuntimeLibrary="1"
-+                              RuntimeLibrary="3"
-                               BufferSecurityCheck="false"
-                               PrecompiledHeaderFile="$(IntDir)/zlibstat.pch"
-                               AssemblerListingLocation="$(IntDir)\"
-@@ -272,7 +272,7 @@
-                               PreprocessorDefinitions="WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ASMV;ASMINF"
-                               StringPooling="true"
-                               ExceptionHandling="0"
--                              RuntimeLibrary="0"
-+                              RuntimeLibrary="2"
-                               BufferSecurityCheck="false"
-                               EnableFunctionLevelLinking="true"
-                               PrecompiledHeaderFile="$(IntDir)/zlibstat.pch"
-@@ -495,7 +495,7 @@
-                               PreprocessorDefinitions="WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
-                               StringPooling="true"
-                               ExceptionHandling="0"
--                              RuntimeLibrary="0"
-+                              RuntimeLibrary="2"
-                               BufferSecurityCheck="false"
-                               EnableFunctionLevelLinking="true"
-                               PrecompiledHeaderFile="$(IntDir)/zlibstat.pch"
-diff -Naur a/contrib/vstudio/vc9/zlibvc.vcproj b/contrib/vstudio/vc9/zlibvc.vcproj
---- a/contrib/vstudio/vc9/zlibvc.vcproj        Mon May 20 15:26:14 2013
-+++ b/contrib/vstudio/vc9/zlibvc.vcproj        Mon May 20 14:30:04 2013
-@@ -56,7 +56,7 @@
-                               AdditionalIncludeDirectories="..\..\..;..\..\masmx86"
-                               PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF"
-                               ExceptionHandling="0"
--                              RuntimeLibrary="1"
-+                              RuntimeLibrary="3"
-                               BufferSecurityCheck="false"
-                               PrecompiledHeaderFile="$(IntDir)/zlibvc.pch"
-                               AssemblerListingLocation="$(IntDir)\"
-@@ -640,7 +640,7 @@
-                               PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF"
-                               StringPooling="true"
-                               ExceptionHandling="0"
--                              RuntimeLibrary="0"
-+                              RuntimeLibrary="2"
-                               BufferSecurityCheck="false"
-                               EnableFunctionLevelLinking="true"
-                               PrecompiledHeaderFile="$(IntDir)/zlibvc.pch"
diff --git a/zlib_build/VS2008/x64/Debug/zlibstat.lib b/zlib_build/VS2008/x64/Debug/zlibstat.lib
deleted file mode 100644 (file)
index 85e3021..0000000
Binary files a/zlib_build/VS2008/x64/Debug/zlibstat.lib and /dev/null differ
diff --git a/zlib_build/VS2008/x64/Release/zlibstat.lib b/zlib_build/VS2008/x64/Release/zlibstat.lib
deleted file mode 100644 (file)
index bd342e6..0000000
Binary files a/zlib_build/VS2008/x64/Release/zlibstat.lib and /dev/null differ