Windows odbc build fail with missing header file and vs lower version
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/3d132b80 Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/3d132b80 Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/3d132b80 Branch: refs/heads/master Commit: 3d132b80ffad3c38589e9e29eb093d5408c4f341 Parents: f7ac169 Author: Weixin-Xu <[email protected]> Authored: Tue Oct 16 21:35:48 2018 +0800 Committer: Weixin-Xu <[email protected]> Committed: Tue Oct 16 21:35:48 2018 +0800 ---------------------------------------------------------------------- win-odbc64/odbcclient/Drvr35Res/Drvr35Res_os.vcxproj | 6 +++--- .../odbcclient/TranslationDll/TranslationDll_os.vcxproj | 8 ++++---- win-odbc64/odbcclient/drvr35/TCPIPV4/TCPIPV4_os.vcxproj | 8 ++++---- win-odbc64/odbcclient/drvr35/TCPIPV6/TCPIPV6_os.vcxproj | 8 ++++---- win-odbc64/odbcclient/drvr35/drvr35_os.vcxproj | 6 +++--- win-odbc64/odbcclient/drvr35/sqltocconv.h | 1 + win-odbc64/odbcclient/drvr35adm/Drvr35Adm_os.vcxproj | 10 +++++----- win-odbc64/odbcclient/drvr35msg/Drvr35Msg_os.vcxproj | 6 +++--- win-odbc64/odbcclient/odbcclient_os.sln | 6 +++--- 9 files changed, 30 insertions(+), 29 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafodion/blob/3d132b80/win-odbc64/odbcclient/Drvr35Res/Drvr35Res_os.vcxproj ---------------------------------------------------------------------- diff --git a/win-odbc64/odbcclient/Drvr35Res/Drvr35Res_os.vcxproj b/win-odbc64/odbcclient/Drvr35Res/Drvr35Res_os.vcxproj index 880d8f2..970db42 100755 --- a/win-odbc64/odbcclient/Drvr35Res/Drvr35Res_os.vcxproj +++ b/win-odbc64/odbcclient/Drvr35Res/Drvr35Res_os.vcxproj @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003";> +<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003";> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|Win32"> <Configuration>Debug</Configuration> @@ -39,13 +39,13 @@ <ConfigurationType>DynamicLibrary</ConfigurationType> <UseOfMfc>Dynamic</UseOfMfc> <CharacterSet>MultiByte</CharacterSet> - <PlatformToolset>v140</PlatformToolset> + <PlatformToolset>v120</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> <UseOfMfc>Dynamic</UseOfMfc> <CharacterSet>MultiByte</CharacterSet> - <PlatformToolset>v140</PlatformToolset> + <PlatformToolset>v120</PlatformToolset> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <ImportGroup Label="ExtensionSettings"> http://git-wip-us.apache.org/repos/asf/trafodion/blob/3d132b80/win-odbc64/odbcclient/TranslationDll/TranslationDll_os.vcxproj ---------------------------------------------------------------------- diff --git a/win-odbc64/odbcclient/TranslationDll/TranslationDll_os.vcxproj b/win-odbc64/odbcclient/TranslationDll/TranslationDll_os.vcxproj index 951ce36..2f2b797 100755 --- a/win-odbc64/odbcclient/TranslationDll/TranslationDll_os.vcxproj +++ b/win-odbc64/odbcclient/TranslationDll/TranslationDll_os.vcxproj @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003";> +<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003";> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|Win32"> <Configuration>Debug</Configuration> @@ -27,17 +27,17 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> - <PlatformToolset>v140</PlatformToolset> + <PlatformToolset>v120</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> - <PlatformToolset>v140</PlatformToolset> + <PlatformToolset>v120</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> - <PlatformToolset>v140</PlatformToolset> + <PlatformToolset>v120</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> http://git-wip-us.apache.org/repos/asf/trafodion/blob/3d132b80/win-odbc64/odbcclient/drvr35/TCPIPV4/TCPIPV4_os.vcxproj ---------------------------------------------------------------------- diff --git a/win-odbc64/odbcclient/drvr35/TCPIPV4/TCPIPV4_os.vcxproj b/win-odbc64/odbcclient/drvr35/TCPIPV4/TCPIPV4_os.vcxproj index c74d916..e9489d8 100755 --- a/win-odbc64/odbcclient/drvr35/TCPIPV4/TCPIPV4_os.vcxproj +++ b/win-odbc64/odbcclient/drvr35/TCPIPV4/TCPIPV4_os.vcxproj @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003";> +<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003";> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|Win32"> <Configuration>Debug</Configuration> @@ -27,17 +27,17 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> - <PlatformToolset>v140</PlatformToolset> + <PlatformToolset>v120</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> - <PlatformToolset>v140</PlatformToolset> + <PlatformToolset>v120</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> - <PlatformToolset>v140</PlatformToolset> + <PlatformToolset>v120</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> http://git-wip-us.apache.org/repos/asf/trafodion/blob/3d132b80/win-odbc64/odbcclient/drvr35/TCPIPV6/TCPIPV6_os.vcxproj ---------------------------------------------------------------------- diff --git a/win-odbc64/odbcclient/drvr35/TCPIPV6/TCPIPV6_os.vcxproj b/win-odbc64/odbcclient/drvr35/TCPIPV6/TCPIPV6_os.vcxproj index 2db2996..70f3522 100755 --- a/win-odbc64/odbcclient/drvr35/TCPIPV6/TCPIPV6_os.vcxproj +++ b/win-odbc64/odbcclient/drvr35/TCPIPV6/TCPIPV6_os.vcxproj @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003";> +<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003";> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|Win32"> <Configuration>Debug</Configuration> @@ -27,7 +27,7 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> - <PlatformToolset>v140</PlatformToolset> + <PlatformToolset>v120</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> @@ -37,12 +37,12 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> - <PlatformToolset>v140</PlatformToolset> + <PlatformToolset>v120</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> - <PlatformToolset>v140</PlatformToolset> + <PlatformToolset>v120</PlatformToolset> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <ImportGroup Label="ExtensionSettings"> http://git-wip-us.apache.org/repos/asf/trafodion/blob/3d132b80/win-odbc64/odbcclient/drvr35/drvr35_os.vcxproj ---------------------------------------------------------------------- diff --git a/win-odbc64/odbcclient/drvr35/drvr35_os.vcxproj b/win-odbc64/odbcclient/drvr35/drvr35_os.vcxproj index 8613089..a1bbed7 100755 --- a/win-odbc64/odbcclient/drvr35/drvr35_os.vcxproj +++ b/win-odbc64/odbcclient/drvr35/drvr35_os.vcxproj @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003";> +<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003";> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|Win32"> <Configuration>Debug</Configuration> @@ -26,11 +26,11 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> - <PlatformToolset>v140</PlatformToolset> + <PlatformToolset>v120</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> - <PlatformToolset>v140</PlatformToolset> + <PlatformToolset>v120</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> http://git-wip-us.apache.org/repos/asf/trafodion/blob/3d132b80/win-odbc64/odbcclient/drvr35/sqltocconv.h ---------------------------------------------------------------------- diff --git a/win-odbc64/odbcclient/drvr35/sqltocconv.h b/win-odbc64/odbcclient/drvr35/sqltocconv.h index 6ef1fe2..2509585 100644 --- a/win-odbc64/odbcclient/drvr35/sqltocconv.h +++ b/win-odbc64/odbcclient/drvr35/sqltocconv.h @@ -28,6 +28,7 @@ #include <sqlExt.h> #include "DrvrGlobal.h" #include "charsetconv.h" +#include "cconnect.h" #define ENDIAN_PRECISION_MAX 39 http://git-wip-us.apache.org/repos/asf/trafodion/blob/3d132b80/win-odbc64/odbcclient/drvr35adm/Drvr35Adm_os.vcxproj ---------------------------------------------------------------------- diff --git a/win-odbc64/odbcclient/drvr35adm/Drvr35Adm_os.vcxproj b/win-odbc64/odbcclient/drvr35adm/Drvr35Adm_os.vcxproj index 9dd4942..3a12c73 100755 --- a/win-odbc64/odbcclient/drvr35adm/Drvr35Adm_os.vcxproj +++ b/win-odbc64/odbcclient/drvr35adm/Drvr35Adm_os.vcxproj @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003";> +<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003";> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|Win32"> <Configuration>Debug</Configuration> @@ -36,12 +36,12 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Template|x64'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> <UseOfMfc>Dynamic</UseOfMfc> - <PlatformToolset>v140</PlatformToolset> + <PlatformToolset>v120</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Template|Win32'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> <UseOfMfc>Dynamic</UseOfMfc> - <PlatformToolset>v140</PlatformToolset> + <PlatformToolset>v120</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> @@ -61,11 +61,11 @@ </PropertyGroup> <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <UseOfMfc>Dynamic</UseOfMfc> - <PlatformToolset>v140</PlatformToolset> + <PlatformToolset>v120</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <UseOfMfc>Dynamic</UseOfMfc> - <PlatformToolset>v140</PlatformToolset> + <PlatformToolset>v120</PlatformToolset> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <ImportGroup Label="ExtensionSettings"> http://git-wip-us.apache.org/repos/asf/trafodion/blob/3d132b80/win-odbc64/odbcclient/drvr35msg/Drvr35Msg_os.vcxproj ---------------------------------------------------------------------- diff --git a/win-odbc64/odbcclient/drvr35msg/Drvr35Msg_os.vcxproj b/win-odbc64/odbcclient/drvr35msg/Drvr35Msg_os.vcxproj index 7dc1f5e..6938ac8 100755 --- a/win-odbc64/odbcclient/drvr35msg/Drvr35Msg_os.vcxproj +++ b/win-odbc64/odbcclient/drvr35msg/Drvr35Msg_os.vcxproj @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003";> +<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003";> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|Win32"> <Configuration>Debug</Configuration> @@ -34,11 +34,11 @@ </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> - <PlatformToolset>v140</PlatformToolset> + <PlatformToolset>v120</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> - <PlatformToolset>v140</PlatformToolset> + <PlatformToolset>v120</PlatformToolset> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <ImportGroup Label="ExtensionSettings"> http://git-wip-us.apache.org/repos/asf/trafodion/blob/3d132b80/win-odbc64/odbcclient/odbcclient_os.sln ---------------------------------------------------------------------- diff --git a/win-odbc64/odbcclient/odbcclient_os.sln b/win-odbc64/odbcclient/odbcclient_os.sln index f8fa376..ffb4225 100755 --- a/win-odbc64/odbcclient/odbcclient_os.sln +++ b/win-odbc64/odbcclient/odbcclient_os.sln @@ -1,8 +1,8 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.25420.1 -MinimumVisualStudioVersion = 10.0.40219.1 +# Visual Studio 2013 +VisualStudioVersion = 12.0.40629 +MinimumVisualStudioVersion = 12.0.40629 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "drvr35_os", "drvr35\drvr35_os.vcxproj", "{4B7C62D7-1C63-4319-9818-98BFBB322CED}" ProjectSection(ProjectDependencies) = postProject {B83DDF3C-8D5C-45AB-868B-4B70BB258647} = {B83DDF3C-8D5C-45AB-868B-4B70BB258647}
