diff options
| -rwxr-xr-x | CMakeLists.txt | 14 | ||||
| -rwxr-xr-x | extra/yassl/taocrypt/taocrypt.vcproj | 268 | ||||
| -rwxr-xr-x | extra/yassl/yassl.vcproj | 211 | ||||
| -rw-r--r-- | server-tools/instance-manager/mysqlmanager.vcproj | 382 | ||||
| -rw-r--r-- | win/build-vs9.bat | 18 | ||||
| -rw-r--r-- | win/build-vs9_x64.bat | 18 | ||||
| -rw-r--r-- | zlib/zutil.h | 2 |
7 files changed, 43 insertions, 870 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 37956204faa..ae069498da1 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -82,18 +82,18 @@ SET(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} -DDBUG_OFF") SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4800 /wd4805") SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4800 /wd4805") -IF(CMAKE_GENERATOR MATCHES "Visual Studio 8") +# Disable warnings in Visual Studio 8 and above +IF(MSVC AND NOT CMAKE_GENERATOR MATCHES "Visual Studio 7") SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /wd4996") SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /wd4996") SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /wd4996") SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /wd4996") SET(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /wd4996") SET(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} /wd4996") -ENDIF(CMAKE_GENERATOR MATCHES "Visual Studio 8") - -IF(CMAKE_GENERATOR MATCHES "Visual Studio 7" OR - CMAKE_GENERATOR MATCHES "Visual Studio 8") +ENDIF(MSVC AND NOT CMAKE_GENERATOR MATCHES "Visual Studio 7") +# Settings for Visual Studio 7 and above. +IF(MSVC) # replace /MDd with /MTd STRING(REPLACE "/MD" "/MT" CMAKE_C_FLAGS_RELEASE ${CMAKE_C_FLAGS_RELEASE}) STRING(REPLACE "/MD" "/MT" CMAKE_C_FLAGS_RELWITHDEBINFO ${CMAKE_C_FLAGS_RELWITHDEBINFO}) @@ -123,9 +123,7 @@ IF(CMAKE_GENERATOR MATCHES "Visual Studio 7" OR IF(NOT tmp_manifest) SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /MANIFEST:NO") ENDIF(NOT tmp_manifest) - -ENDIF(CMAKE_GENERATOR MATCHES "Visual Studio 7" OR - CMAKE_GENERATOR MATCHES "Visual Studio 8") +ENDIF(MSVC) ADD_DEFINITIONS("-D_WINDOWS -D__WIN__ -D_CRT_SECURE_NO_DEPRECATE") diff --git a/extra/yassl/taocrypt/taocrypt.vcproj b/extra/yassl/taocrypt/taocrypt.vcproj deleted file mode 100755 index bcbc0f82192..00000000000 --- a/extra/yassl/taocrypt/taocrypt.vcproj +++ /dev/null @@ -1,268 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="7.10" - Name="taocrypt" - SccProjectName="" - SccLocalPath=""> - <Platforms> - <Platform - Name="Win32"/> - </Platforms> - <Configurations> - <Configuration - Name="Debug|Win32" - OutputDirectory=".\debug_obj" - IntermediateDirectory=".\debug_obj" - ConfigurationType="4" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="FALSE" - CharacterSet="2"> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - OptimizeForProcessor="2" - AdditionalIncludeDirectories="include,mySTL" - PreprocessorDefinitions="WIN32;_DEBUG;_LIB" - ExceptionHandling="FALSE" - BasicRuntimeChecks="3" - RuntimeLibrary="1" - UsePrecompiledHeader="2" - PrecompiledHeaderFile=".\debug_obj/taocrypt.pch" - AssemblerListingLocation=".\debug_obj/" - ObjectFile=".\debug_obj/" - ProgramDataBaseFileName=".\debug_obj/" - BrowseInformation="1" - WarningLevel="3" - SuppressStartupBanner="TRUE" - DebugInformationFormat="4" - CompileAs="0"/> - <Tool - Name="VCCustomBuildTool"/> - <Tool - Name="VCLibrarianTool" - OutputFile=".\debug_obj\taocrypt.lib" - SuppressStartupBanner="TRUE"/> - <Tool - Name="VCMIDLTool"/> - <Tool - Name="VCPostBuildEventTool"/> - <Tool - Name="VCPreBuildEventTool"/> - <Tool - Name="VCPreLinkEventTool"/> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG" - Culture="1033"/> - <Tool - Name="VCWebServiceProxyGeneratorTool"/> - <Tool - Name="VCXMLDataGeneratorTool"/> - <Tool - Name="VCManagedWrapperGeneratorTool"/> - <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - </Configuration> - <Configuration - Name="Release|Win32" - OutputDirectory=".\release_obj" - IntermediateDirectory=".\release_obj" - ConfigurationType="4" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="FALSE" - CharacterSet="2"> - <Tool - Name="VCCLCompilerTool" - Optimization="2" - InlineFunctionExpansion="1" - OptimizeForProcessor="2" - AdditionalIncludeDirectories="include,mySTL" - PreprocessorDefinitions="WIN32;NDEBUG;_LIB" - StringPooling="TRUE" - ExceptionHandling="FALSE" - RuntimeLibrary="0" - EnableFunctionLevelLinking="TRUE" - UsePrecompiledHeader="2" - PrecompiledHeaderFile=".\release_obj/taocrypt.pch" - AssemblerListingLocation=".\release_obj/" - ObjectFile=".\release_obj/" - ProgramDataBaseFileName=".\release_obj/" - WarningLevel="3" - SuppressStartupBanner="TRUE" - CompileAs="0"/> - <Tool - Name="VCCustomBuildTool"/> - <Tool - Name="VCLibrarianTool" - OutputFile=".\release_obj\taocrypt.lib" - SuppressStartupBanner="TRUE"/> - <Tool - Name="VCMIDLTool"/> - <Tool - Name="VCPostBuildEventTool"/> - <Tool - Name="VCPreBuildEventTool"/> - <Tool - Name="VCPreLinkEventTool"/> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG" - Culture="1033"/> - <Tool - Name="VCWebServiceProxyGeneratorTool"/> - <Tool - Name="VCXMLDataGeneratorTool"/> - <Tool - Name="VCManagedWrapperGeneratorTool"/> - <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <Filter - Name="Source Files" - Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"> - <File - RelativePath="src\aes.cpp"> - </File> - <File - RelativePath="src\aestables.cpp"> - </File> - <File - RelativePath="src\algebra.cpp"> - </File> - <File - RelativePath="src\arc4.cpp"> - </File> - <File - RelativePath="src\asn.cpp"> - </File> - <File - RelativePath="src\coding.cpp"> - </File> - <File - RelativePath="src\des.cpp"> - </File> - <File - RelativePath="src\dh.cpp"> - </File> - <File - RelativePath="src\dsa.cpp"> - </File> - <File - RelativePath="src\file.cpp"> - </File> - <File - RelativePath="src\hash.cpp"> - </File> - <File - RelativePath="src\integer.cpp"> - </File> - <File - RelativePath="src\md2.cpp"> - </File> - <File - RelativePath="src\md4.cpp"> - </File> - <File - RelativePath="src\md5.cpp"> - </File> - <File - RelativePath="src\misc.cpp"> - </File> - <File - RelativePath="src\random.cpp"> - </File> - <File - RelativePath="src\ripemd.cpp"> - </File> - <File - RelativePath="src\rsa.cpp"> - </File> - <File - RelativePath="src\sha.cpp"> - </File> - </Filter> - <Filter - Name="Header Files" - Filter="h;hpp;hxx;hm;inl"> - <File - RelativePath="include\aes.hpp"> - </File> - <File - RelativePath="include\algebra.hpp"> - </File> - <File - RelativePath="include\arc4.hpp"> - </File> - <File - RelativePath="include\asn.hpp"> - </File> - <File - RelativePath="include\block.hpp"> - </File> - <File - RelativePath="include\coding.hpp"> - </File> - <File - RelativePath="include\des.hpp"> - </File> - <File - RelativePath="include\dh.hpp"> - </File> - <File - RelativePath="include\dsa.hpp"> - </File> - <File - RelativePath="include\error.hpp"> - </File> - <File - RelativePath="include\file.hpp"> - </File> - <File - RelativePath="include\hash.hpp"> - </File> - <File - RelativePath="include\hmac.hpp"> - </File> - <File - RelativePath="include\integer.hpp"> - </File> - <File - RelativePath="include\md2.hpp"> - </File> - <File - RelativePath="include\md4.hpp"> - </File> - <File - RelativePath="include\md5.hpp"> - </File> - <File - RelativePath="include\misc.hpp"> - </File> - <File - RelativePath="include\modarith.hpp"> - </File> - <File - RelativePath="include\modes.hpp"> - </File> - <File - RelativePath="include\random.hpp"> - </File> - <File - RelativePath="include\ripemd.hpp"> - </File> - <File - RelativePath="include\rsa.hpp"> - </File> - <File - RelativePath="include\sha.hpp"> - </File> - </Filter> - </Files> - <Globals> - </Globals> -</VisualStudioProject> diff --git a/extra/yassl/yassl.vcproj b/extra/yassl/yassl.vcproj deleted file mode 100755 index bc020747096..00000000000 --- a/extra/yassl/yassl.vcproj +++ /dev/null @@ -1,211 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="7.10" - Name="yassl" - SccProjectName="" - SccLocalPath=""> - <Platforms> - <Platform - Name="Win32"/> - </Platforms> - <Configurations> - <Configuration - Name="Debug|Win32" - OutputDirectory=".\debug_obj" - IntermediateDirectory=".\debug_obj" - ConfigurationType="4" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="FALSE" - CharacterSet="2"> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - OptimizeForProcessor="2" - AdditionalIncludeDirectories="include,taocrypt\include,taocrypt\mySTL" - PreprocessorDefinitions="WIN32;_DEBUG;_LIB;YASSL_PREFIX" - ExceptionHandling="FALSE" - BasicRuntimeChecks="3" - RuntimeLibrary="1" - UsePrecompiledHeader="2" - PrecompiledHeaderFile=".\debug_obj/yassl.pch" - AssemblerListingLocation=".\debug_obj/" - ObjectFile=".\debug_obj/" - ProgramDataBaseFileName=".\debug_obj/" - BrowseInformation="1" - WarningLevel="3" - SuppressStartupBanner="TRUE" - DebugInformationFormat="4" - CompileAs="0"/> - <Tool - Name="VCCustomBuildTool"/> - <Tool - Name="VCLibrarianTool" - OutputFile=".\debug_obj\yassl.lib" - SuppressStartupBanner="TRUE"/> - <Tool - Name="VCMIDLTool"/> - <Tool - Name="VCPostBuildEventTool"/> - <Tool - Name="VCPreBuildEventTool"/> - <Tool - Name="VCPreLinkEventTool"/> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG" - Culture="1033"/> - <Tool - Name="VCWebServiceProxyGeneratorTool"/> - <Tool - Name="VCXMLDataGeneratorTool"/> - <Tool - Name="VCManagedWrapperGeneratorTool"/> - <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - </Configuration> - <Configuration - Name="Release|Win32" - OutputDirectory=".\release_obj" - IntermediateDirectory=".\release_obj" - ConfigurationType="4" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="FALSE" - CharacterSet="2"> - <Tool - Name="VCCLCompilerTool" - Optimization="2" - InlineFunctionExpansion="1" - OptimizeForProcessor="2" - AdditionalIncludeDirectories="include,taocrypt\include,taocrypt\mySTL" - PreprocessorDefinitions="WIN32;NDEBUG;_LIB;YASSL_PREFIX" - StringPooling="TRUE" - ExceptionHandling="FALSE" - RuntimeLibrary="0" - EnableFunctionLevelLinking="TRUE" - UsePrecompiledHeader="2" - PrecompiledHeaderFile=".\release_obj/yassl.pch" - AssemblerListingLocation=".\release_obj/" - ObjectFile=".\release_obj/" - ProgramDataBaseFileName=".\release_obj/" - WarningLevel="3" - SuppressStartupBanner="TRUE" - CompileAs="0"/> - <Tool - Name="VCCustomBuildTool"/> - <Tool - Name="VCLibrarianTool" - OutputFile=".\release_obj\yassl.lib" - SuppressStartupBanner="TRUE"/> - <Tool - Name="VCMIDLTool"/> - <Tool - Name="VCPostBuildEventTool"/> - <Tool - Name="VCPreBuildEventTool"/> - <Tool - Name="VCPreLinkEventTool"/> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG" - Culture="1033"/> - <Tool - Name="VCWebServiceProxyGeneratorTool"/> - <Tool - Name="VCXMLDataGeneratorTool"/> - <Tool - Name="VCManagedWrapperGeneratorTool"/> - <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <Filter - Name="Source Files" - Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"> - <File - RelativePath="src\buffer.cpp"> - </File> - <File - RelativePath="src\cert_wrapper.cpp"> - </File> - <File - RelativePath="src\crypto_wrapper.cpp"> - </File> - <File - RelativePath="src\handshake.cpp"> - </File> - <File - RelativePath="src\lock.cpp"> - </File> - <File - RelativePath="src\log.cpp"> - </File> - <File - RelativePath="src\socket_wrapper.cpp"> - </File> - <File - RelativePath="src\ssl.cpp"> - </File> - <File - RelativePath="src\timer.cpp"> - </File> - <File - RelativePath="src\yassl_error.cpp"> - </File> - <File - RelativePath="src\yassl_imp.cpp"> - </File> - <File - RelativePath="src\yassl_int.cpp"> - </File> - </Filter> - <Filter - Name="Header Files" - Filter="h;hpp;hxx;hm;inl"> - <File - RelativePath="include\buffer.hpp"> - </File> - <File - RelativePath="include\cert_wrapper.hpp"> - </File> - <File - RelativePath="include\crypto_wrapper.hpp"> - </File> - <File - RelativePath="include\factory.hpp"> - </File> - <File - RelativePath="include\handshake.hpp"> - </File> - <File - RelativePath="include\lock.hpp"> - </File> - <File - RelativePath="include\log.hpp"> - </File> - <File - RelativePath="include\socket_wrapper.hpp"> - </File> - <File - RelativePath="include\timer.hpp"> - </File> - <File - RelativePath="include\yassl_error.hpp"> - </File> - <File - RelativePath="include\yassl_imp.hpp"> - </File> - <File - RelativePath="include\yassl_int.hpp"> - </File> - <File - RelativePath="include\yassl_types.hpp"> - </File> - </Filter> - </Files> - <Globals> - </Globals> -</VisualStudioProject> diff --git a/server-tools/instance-manager/mysqlmanager.vcproj b/server-tools/instance-manager/mysqlmanager.vcproj deleted file mode 100644 index a38565fc1f3..00000000000 --- a/server-tools/instance-manager/mysqlmanager.vcproj +++ /dev/null @@ -1,382 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="7.10" - Name="mysqlmanager" - ProjectGUID="{6D524B3E-210A-4FCD-8D41-FEC0D21E83AC}" - Keyword="Win32Proj"> - <Platforms> - <Platform - Name="Win32"/> - </Platforms> - <Configurations> - <Configuration - Name="Debug|Win32" - OutputDirectory=".\debug_obj" - IntermediateDirectory=".\debug_obj" - ConfigurationType="1" - CharacterSet="2"> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - OptimizeForProcessor="2" - AdditionalIncludeDirectories="..\..\include,../../extra/yassl/include" - PreprocessorDefinitions="MYSQL_INSTANCE_MANAGER;MYSQL_SERVER;_DEBUG;SAFEMALLOC;SAFE_MUTEX;_WINDOWS;CONSOLE" - MinimalRebuild="TRUE" - ExceptionHandling="FALSE" - BasicRuntimeChecks="3" - RuntimeLibrary="1" - UsePrecompiledHeader="0" - WarningLevel="3" - Detect64BitPortabilityProblems="TRUE" - DebugInformationFormat="4"/> - <Tool - Name="VCCustomBuildTool"/> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="wsock32.lib" - OutputFile=".\debug/mysqlmanager.exe" - LinkIncremental="1" - GenerateDebugInformation="TRUE" - ProgramDatabaseFile=".\debug/mysqlmanager.pdb" - GenerateMapFile="TRUE" - MapFileName=".\debug/mysqlmanager.map" - SubSystem="1" - TargetMachine="1"/> - <Tool - Name="VCMIDLTool"/> - <Tool - Name="VCPostBuildEventTool"/> - <Tool - Name="VCPreBuildEventTool"/> - <Tool - Name="VCPreLinkEventTool"/> - <Tool - Name="VCResourceCompilerTool"/> - <Tool - Name="VCWebServiceProxyGeneratorTool"/> - <Tool - Name="VCXMLDataGeneratorTool"/> - <Tool - Name="VCWebDeploymentTool"/> - <Tool - Name="VCManagedWrapperGeneratorTool"/> - <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - </Configuration> - <Configuration - Name="Release|Win32" - OutputDirectory=".\release_obj" - IntermediateDirectory=".\release_obj" - ConfigurationType="1" - CharacterSet="2"> - <Tool - Name="VCCLCompilerTool" - Optimization="2" - InlineFunctionExpansion="1" - OptimizeForProcessor="2" - AdditionalIncludeDirectories="..\..\include,../../extra/yassl/include" - PreprocessorDefinitions="MYSQL_INSTANCE_MANAGER;MYSQL_SERVER;_WINDOWS;CONSOLE" - ExceptionHandling="FALSE" - RuntimeLibrary="0" - UsePrecompiledHeader="0" - WarningLevel="3" - Detect64BitPortabilityProblems="TRUE" - DebugInformationFormat="3"/> - <Tool - Name="VCCustomBuildTool"/> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="wsock32.lib" - OutputFile=".\release/mysqlmanager.exe" - LinkIncremental="1" - GenerateDebugInformation="TRUE" - ProgramDatabaseFile=".\release/mysqlmanager.pdb" - GenerateMapFile="TRUE" - MapFileName=".\release/mysqlmanager.map" - SubSystem="1" - OptimizeReferences="2" - EnableCOMDATFolding="2" - TargetMachine="1"/> - <Tool - Name="VCMIDLTool"/> - <Tool - Name="VCPostBuildEventTool"/> - <Tool - Name="VCPreBuildEventTool"/> - <Tool - Name="VCPreLinkEventTool"/> - <Tool - Name="VCResourceCompilerTool"/> - <Tool - Name="VCWebServiceProxyGeneratorTool"/> - <Tool - Name="VCXMLDataGeneratorTool"/> - <Tool - Name="VCWebDeploymentTool"/> - <Tool - Name="VCManagedWrapperGeneratorTool"/> - <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <Filter - Name="Source Files" - Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx" - UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"> - <File - RelativePath=".\buffer.cpp"> - </File> - <File - RelativePath="..\..\sql\client.c"> - <FileConfiguration - Name="Debug|Win32"> - <Tool - Name="VCCLCompilerTool" - ObjectFile="$(IntDir)/$(InputName)1.obj"/> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32"> - <Tool - Name="VCCLCompilerTool" - ObjectFile="$(IntDir)/$(InputName)1.obj"/> - </FileConfiguration> - </File> - <File - RelativePath=".\command.cpp"> - </File> - <File - RelativePath=".\commands.cpp"> - </File> - <File - RelativePath="..\..\libmysql\get_password.c"> - <FileConfiguration - Name="Debug|Win32"> - <Tool - Name="VCCLCompilerTool" - ObjectFile="$(IntDir)/$(InputName)1.obj"/> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32"> - <Tool - Name="VCCLCompilerTool" - ObjectFile="$(IntDir)/$(InputName)1.obj"/> - </FileConfiguration> - </File> - <File - RelativePath=".\guardian.cpp"> - </File> - <File - RelativePath=".\IMService.cpp"> - </File> - <File - RelativePath=".\instance.cpp"> - </File> - <File - RelativePath=".\instance_map.cpp"> - </File> - <File - RelativePath=".\instance_options.cpp"> - </File> - <File - RelativePath=".\listener.cpp"> - </File> - <File - RelativePath=".\log.cpp"> - </File> - <File - RelativePath=".\manager.cpp"> - </File> - <File - RelativePath=".\messages.cpp"> - </File> - <File - RelativePath="..\..\sql\mini_client_errors.c"> - <FileConfiguration - Name="Debug|Win32"> - <Tool - Name="VCCLCompilerTool" - ObjectFile="$(IntDir)/$(InputName)1.obj"/> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32"> - <Tool - Name="VCCLCompilerTool" - ObjectFile="$(IntDir)/$(InputName)1.obj"/> - </FileConfiguration> - </File> - <File - RelativePath=".\mysql_connection.cpp"> - <FileConfiguration - Name="Debug|Win32"> - <Tool - Name="VCCLCompilerTool" - ObjectFile="$(IntDir)/$(InputName)1.obj"/> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32"> - <Tool - Name="VCCLCompilerTool" - ObjectFile="$(IntDir)/$(InputName)1.obj"/> - </FileConfiguration> - </File> - <File - RelativePath=".\mysqlmanager.cpp"> - </File> - <File - RelativePath="..\..\sql\net_serv.cpp"> - <FileConfiguration - Name="Debug|Win32"> - <Tool - Name="VCCLCompilerTool" - ObjectFile="$(IntDir)/$(InputName)1.obj"/> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32"> - <Tool - Name="VCCLCompilerTool" - ObjectFile="$(IntDir)/$(InputName)1.obj"/> - </FileConfiguration> - </File> - <File - RelativePath=".\options.cpp"> - </File> - <File - RelativePath="..\..\sql\pack.c"> - <FileConfiguration - Name="Debug|Win32"> - <Tool - Name="VCCLCompilerTool" - ObjectFile="$(IntDir)/$(InputName)1.obj"/> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32"> - <Tool - Name="VCCLCompilerTool" - ObjectFile="$(IntDir)/$(InputName)1.obj"/> - </FileConfiguration> - </File> - <File - RelativePath=".\parse.cpp"> - </File> - <File - RelativePath=".\parse_output.cpp"> - </File> - <File - RelativePath="..\..\sql\password.c"> - <FileConfiguration - Name="Debug|Win32"> - <Tool - Name="VCCLCompilerTool" - ObjectFile="$(IntDir)/$(InputName)1.obj"/> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32"> - <Tool - Name="VCCLCompilerTool" - ObjectFile="$(IntDir)/$(InputName)1.obj"/> - </FileConfiguration> - </File> - <File - RelativePath=".\priv.cpp"> - </File> - <File - RelativePath=".\protocol.cpp"> - </File> - <File - RelativePath="..\..\sql\sql_state.c"> - </File> - <File - RelativePath=".\thread_registry.cpp"> - </File> - <File - RelativePath=".\user_map.cpp"> - </File> - <File - RelativePath=".\WindowsService.cpp"> - </File> - </Filter> - <Filter - Name="Header Files" - Filter="h;hpp;hxx;hm;inl;inc;xsd" - UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"> - <File - RelativePath=".\buffer.h"> - </File> - <File - RelativePath=".\command.h"> - </File> - <File - RelativePath=".\commands.h"> - </File> - <File - RelativePath=".\factory.h"> - </File> - <File - RelativePath=".\guardian.h"> - </File> - <File - RelativePath=".\IMService.h"> - </File> - <File - RelativePath=".\instance.h"> - </File> - <File - RelativePath=".\instance_map.h"> - </File> - <File - RelativePath=".\instance_options.h"> - </File> - <File - RelativePath=".\listener.h"> - </File> - <File - RelativePath=".\log.h"> - </File> - <File - RelativePath=".\manager.h"> - </File> - <File - RelativePath=".\messages.h"> - </File> - <File - RelativePath=".\mysql_connection.h"> - </File> - <File - RelativePath=".\mysql_manager_error.h"> - </File> - <File - RelativePath=".\options.h"> - </File> - <File - RelativePath=".\parse.h"> - </File> - <File - RelativePath=".\parse_output.h"> - </File> - <File - RelativePath=".\portability.h"> - </File> - <File - RelativePath=".\priv.h"> - </File> - <File - RelativePath=".\protocol.h"> - </File> - <File - RelativePath=".\thread_registry.h"> - </File> - <File - RelativePath=".\user_map.h"> - </File> - <File - RelativePath=".\WindowsService.h"> - </File> - </Filter> - </Files> - <Globals> - </Globals> -</VisualStudioProject> diff --git a/win/build-vs9.bat b/win/build-vs9.bat new file mode 100644 index 00000000000..09f1e343013 --- /dev/null +++ b/win/build-vs9.bat @@ -0,0 +1,18 @@ +@echo off + +REM Copyright (C) 2006 MySQL AB +REM +REM This program is free software; you can redistribute it and/or modify +REM it under the terms of the GNU General Public License as published by +REM the Free Software Foundation; version 2 of the License. +REM +REM This program is distributed in the hope that it will be useful, +REM but WITHOUT ANY WARRANTY; without even the implied warranty of +REM MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +REM GNU General Public License for more details. +REM +REM You should have received a copy of the GNU General Public License +REM along with this program; if not, write to the Free Software +REM Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +cmake -G "Visual Studio 9 2008" + diff --git a/win/build-vs9_x64.bat b/win/build-vs9_x64.bat new file mode 100644 index 00000000000..61c7253132d --- /dev/null +++ b/win/build-vs9_x64.bat @@ -0,0 +1,18 @@ +@echo off + +REM Copyright (C) 2006 MySQL AB +REM +REM This program is free software; you can redistribute it and/or modify +REM it under the terms of the GNU General Public License as published by +REM the Free Software Foundation; version 2 of the License. +REM +REM This program is distributed in the hope that it will be useful, +REM but WITHOUT ANY WARRANTY; without even the implied warranty of +REM MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +REM GNU General Public License for more details. +REM +REM You should have received a copy of the GNU General Public License +REM along with this program; if not, write to the Free Software +REM Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +cmake -G "Visual Studio 9 2008 Win64" + diff --git a/zlib/zutil.h b/zlib/zutil.h index b7d5eff81b6..4482957d6ac 100644 --- a/zlib/zutil.h +++ b/zlib/zutil.h @@ -194,7 +194,7 @@ extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */ # ifdef __TURBOC__ # define NO_vsnprintf # endif -# ifdef WIN32 +# if defined(WIN32) && (!defined(_MSC_VER) || _MSC_VER < 1500) /* In Win32, vsnprintf is available as the "non-ANSI" _vsnprintf. */ # if !defined(vsnprintf) && !defined(NO_vsnprintf) # define vsnprintf _vsnprintf |