Repository: incubator-trafodion Updated Branches: refs/heads/master 8f4343882 -> ad9f4efeb
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/cba9de3d/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 old mode 100644 new mode 100755 index 3e6459a..9dd4942 --- a/win-odbc64/odbcclient/drvr35adm/Drvr35Adm_os.vcxproj +++ b/win-odbc64/odbcclient/drvr35adm/Drvr35Adm_os.vcxproj @@ -1,14 +1,26 @@ <?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003";> +<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003";> <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug|Win32"> + <Configuration>Debug</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> <ProjectConfiguration Include="Debug|x64"> <Configuration>Debug</Configuration> <Platform>x64</Platform> </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> <ProjectConfiguration Include="Release|x64"> <Configuration>Release</Configuration> <Platform>x64</Platform> </ProjectConfiguration> + <ProjectConfiguration Include="Template|Win32"> + <Configuration>Template</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> <ProjectConfiguration Include="Template|x64"> <Configuration>Template</Configuration> <Platform>x64</Platform> @@ -18,24 +30,42 @@ <ProjectGuid>{38202379-9F93-46CB-90CF-5CA40FF4D20D}</ProjectGuid> <RootNamespace>Drvr35Adm</RootNamespace> <Keyword>MFCProj</Keyword> + <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Template|x64'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> <UseOfMfc>Dynamic</UseOfMfc> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Template|Win32'" Label="Configuration"> + <ConfigurationType>DynamicLibrary</ConfigurationType> + <UseOfMfc>Dynamic</UseOfMfc> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> <UseOfMfc>Dynamic</UseOfMfc> <PlatformToolset>v120</PlatformToolset> </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>DynamicLibrary</ConfigurationType> + <UseOfMfc>Dynamic</UseOfMfc> + <PlatformToolset>v120</PlatformToolset> + </PropertyGroup> <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <ConfigurationType>DynamicLibrary</ConfigurationType> </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>DynamicLibrary</ConfigurationType> + </PropertyGroup> <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <UseOfMfc>Dynamic</UseOfMfc> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <UseOfMfc>Dynamic</UseOfMfc> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <ImportGroup Label="ExtensionSettings"> @@ -43,23 +73,36 @@ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Template|x64'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Template|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" /> </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" /> + </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" /> </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" /> + </ImportGroup> <PropertyGroup Label="UserMacros" /> <PropertyGroup> <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion> <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\x64\Debug\</OutDir> <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\x64\Debug\</IntDir> <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental> + <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental> <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\x64\Release\</OutDir> <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\x64\Release\</IntDir> <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental> + <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <ClCompile> @@ -95,6 +138,39 @@ <OutputFile>.\x64\Debug/Drvr35Adm.bsc</OutputFile> </Bscmake> </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <Optimization>Disabled</Optimization> + <PreprocessorDefinitions>_WIN64;_DEBUG;_WINDOWS;_USRDLL;NEO;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <MinimalRebuild>true</MinimalRebuild> + <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> + <PrecompiledHeader>Use</PrecompiledHeader> + <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile> + <PrecompiledHeaderOutputFile>.\x64\Debug/Drvr35Adm.pch</PrecompiledHeaderOutputFile> + <AssemblerListingLocation>.\x64\Debug/</AssemblerListingLocation> + <ObjectFileName>.\x64\Debug/</ObjectFileName> + <ProgramDataBaseFileName>.\x64\Debug/</ProgramDataBaseFileName> + <BrowseInformation>true</BrowseInformation> + <WarningLevel>Level3</WarningLevel> + <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> + </ClCompile> + <ResourceCompile> + <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <Culture>0x0409</Culture> + </ResourceCompile> + <Link> + <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies> + <OutputFile>..\..\..\lib\x64\Debug/trfoadm1.dll</OutputFile> + <ModuleDefinitionFile>.\drvr35adm.def</ModuleDefinitionFile> + <GenerateDebugInformation>true</GenerateDebugInformation> + <ProgramDatabaseFile>..\..\..\..\lib\x64\Debug/trfoadm1.pdb</ProgramDatabaseFile> + <SubSystem>Windows</SubSystem> + <ImportLibrary>..\..\..\..\lib\x64\Debug/trfoadm1.lib</ImportLibrary> + </Link> + <Bscmake> + <OutputFile>.\x64\Debug/Drvr35Adm.bsc</OutputFile> + </Bscmake> + </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <ClCompile> <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> @@ -128,54 +204,102 @@ <OutputFile>.\x64\Release/Drvr35Adm.bsc</OutputFile> </Bscmake> </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> + <PreprocessorDefinitions>_WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <StringPooling>true</StringPooling> + <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> + <PrecompiledHeader>Create</PrecompiledHeader> + <PrecompiledHeaderOutputFile>.\x86\Release/Drvr35Adm.pch</PrecompiledHeaderOutputFile> + <AssemblerListingLocation>.\x86\Release/</AssemblerListingLocation> + <ObjectFileName>.\x86\Release/</ObjectFileName> + <ProgramDataBaseFileName>.\x86\Release/</ProgramDataBaseFileName> + <BrowseInformation>true</BrowseInformation> + <WarningLevel>Level3</WarningLevel> + </ClCompile> + <ResourceCompile> + <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <Culture>0x0409</Culture> + </ResourceCompile> + <Link> + <AdditionalDependencies>Htmlhelp.lib;%(AdditionalDependencies)</AdditionalDependencies> + <OutputFile>..\..\..\lib\x86\Release/trfoadm1.dll</OutputFile> + <ModuleDefinitionFile>.\drvr35adm.def</ModuleDefinitionFile> + <GenerateDebugInformation>true</GenerateDebugInformation> + <ProgramDatabaseFile>..\..\..\..\lib\x86\Release/trfoadm1.pdb</ProgramDatabaseFile> + <SubSystem>Windows</SubSystem> + <ImportLibrary>..\..\..\..\lib\x86\Release/trfoadm1.lib</ImportLibrary> + <AllowIsolation>true</AllowIsolation> + </Link> + <Bscmake> + <OutputFile>.\x86\Release/Drvr35Adm.bsc</OutputFile> + </Bscmake> + </ItemDefinitionGroup> <ItemGroup> <ClCompile Include="drvr35adm.cpp"> <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Use</PrecompiledHeader> + <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Use</PrecompiledHeader> </ClCompile> <ClCompile Include="odbcsvcdlg.cpp"> <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Use</PrecompiledHeader> + <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Use</PrecompiledHeader> </ClCompile> <ClCompile Include="pagegeneral.cpp"> <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Use</PrecompiledHeader> + <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Use</PrecompiledHeader> </ClCompile> <ClCompile Include="pagelocaltr.cpp"> <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Use</PrecompiledHeader> + <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Use</PrecompiledHeader> </ClCompile> <ClCompile Include="pagenetwork.cpp"> <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Use</PrecompiledHeader> + <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Use</PrecompiledHeader> </ClCompile> <ClCompile Include="pageoptions.cpp"> <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Use</PrecompiledHeader> + <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Use</PrecompiledHeader> </ClCompile> <ClCompile Include="pagetracing.cpp"> <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Use</PrecompiledHeader> + <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Use</PrecompiledHeader> </ClCompile> <ClCompile Include="propsheet.cpp"> <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Use</PrecompiledHeader> + <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Use</PrecompiledHeader> </ClCompile> <ClCompile Include="stdafx.cpp"> <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader> + <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader> </ClCompile> <ClCompile Include="tabpagegeneral.cpp"> <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Use</PrecompiledHeader> + <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Use</PrecompiledHeader> </ClCompile> <ClCompile Include="tabpagelocaltr.cpp"> <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Use</PrecompiledHeader> + <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Use</PrecompiledHeader> </ClCompile> <ClCompile Include="tabpagenetwork.cpp"> <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Use</PrecompiledHeader> + <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Use</PrecompiledHeader> </ClCompile> <ClCompile Include="tabpageoptions.cpp"> <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Use</PrecompiledHeader> + <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Use</PrecompiledHeader> </ClCompile> <ClCompile Include="tabpagetesting.cpp"> <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Use</PrecompiledHeader> + <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Use</PrecompiledHeader> </ClCompile> <ClCompile Include="tabpagetracing.cpp"> <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Use</PrecompiledHeader> + <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Use</PrecompiledHeader> </ClCompile> <ClCompile Include="testdialog.cpp"> <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Use</PrecompiledHeader> + <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Use</PrecompiledHeader> </ClCompile> </ItemGroup> <ItemGroup> http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/cba9de3d/win-odbc64/odbcclient/drvr35adm/Drvr35Adm_os.vcxproj.user ---------------------------------------------------------------------- diff --git a/win-odbc64/odbcclient/drvr35adm/Drvr35Adm_os.vcxproj.user b/win-odbc64/odbcclient/drvr35adm/Drvr35Adm_os.vcxproj.user old mode 100644 new mode 100755 index 0e456bc..aaabcc8 --- a/win-odbc64/odbcclient/drvr35adm/Drvr35Adm_os.vcxproj.user +++ b/win-odbc64/odbcclient/drvr35adm/Drvr35Adm_os.vcxproj.user @@ -3,8 +3,15 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <LocalDebuggerCommand>c:\windows\system32\odbcad32.exe</LocalDebuggerCommand> </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <LocalDebuggerCommand>c:\windows\system32\odbcad32.exe</LocalDebuggerCommand> + </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <LocalDebuggerWorkingDirectory>c:\windows\system32</LocalDebuggerWorkingDirectory> <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor> </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <LocalDebuggerWorkingDirectory>c:\windows\system32</LocalDebuggerWorkingDirectory> + <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor> + </PropertyGroup> </Project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/cba9de3d/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 old mode 100644 new mode 100755 index 1ac0493..7dc1f5e --- a/win-odbc64/odbcclient/drvr35msg/Drvr35Msg_os.vcxproj +++ b/win-odbc64/odbcclient/drvr35msg/Drvr35Msg_os.vcxproj @@ -1,10 +1,18 @@ <?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003";> +<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003";> <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug|Win32"> + <Configuration>Debug</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> <ProjectConfiguration Include="Debug|x64"> <Configuration>Debug</Configuration> <Platform>x64</Platform> </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> <ProjectConfiguration Include="Release|x64"> <Configuration>Release</Configuration> <Platform>x64</Platform> @@ -13,16 +21,25 @@ <PropertyGroup Label="Globals"> <ProjectGuid>{B83DDF3C-8D5C-45AB-868B-4B70BB258647}</ProjectGuid> <RootNamespace>Drvr35Msg</RootNamespace> + <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> <PlatformToolset>v120</PlatformToolset> </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> <PlatformToolset>v120</PlatformToolset> </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> + <ConfigurationType>DynamicLibrary</ConfigurationType> + <PlatformToolset>v140</PlatformToolset> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>DynamicLibrary</ConfigurationType> + <PlatformToolset>v140</PlatformToolset> + </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <ImportGroup Label="ExtensionSettings"> </ImportGroup> @@ -30,19 +47,29 @@ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" /> </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" /> + </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" /> </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" /> + </ImportGroup> <PropertyGroup Label="UserMacros" /> <PropertyGroup> <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion> <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\x64\Debug\</OutDir> <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\x64\Debug\</IntDir> <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental> + <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental> <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\x64\Release\</OutDir> <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\x64\Release\</IntDir> <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental> + <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <ResourceCompile> @@ -64,6 +91,25 @@ <OutputFile>.\x64\Debug/Drvr35Msg.bsc</OutputFile> </Bscmake> </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ResourceCompile> + <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <Culture>0x0409</Culture> + </ResourceCompile> + <Link> + <AdditionalDependencies>msvcrt.lib;%(AdditionalDependencies)</AdditionalDependencies> + <OutputFile>..\..\..\lib\x64\Debug/traf_odbcDrvMsg_intl0100.dll</OutputFile> + <GenerateDebugInformation>true</GenerateDebugInformation> + <ProgramDatabaseFile>..\..\..\..\lib\x64\Debug/traf_odbcDrvMsg_intl0100.pdb</ProgramDatabaseFile> + <GenerateMapFile>true</GenerateMapFile> + <MapExports>true</MapExports> + <SubSystem>Windows</SubSystem> + <ImportLibrary>..\..\..\..\lib\x64\Debug/traf_odbcDrvMsg_intl.lib</ImportLibrary> + </Link> + <Bscmake> + <OutputFile>.\x64\Debug/Drvr35Msg.bsc</OutputFile> + </Bscmake> + </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <ResourceCompile> <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> @@ -82,19 +128,44 @@ <OutputFile>.\x64\Release/Drvr35Msg.bsc</OutputFile> </Bscmake> </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ResourceCompile> + <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <Culture>0x0409</Culture> + </ResourceCompile> + <Link> + <AdditionalDependencies>msvcrt.lib;%(AdditionalDependencies)</AdditionalDependencies> + <OutputFile>..\..\..\lib\x86\Release/traf_odbcDrvMsg_intl0100.dll</OutputFile> + <GenerateDebugInformation>true</GenerateDebugInformation> + <ProgramDatabaseFile>..\..\..\..\lib\x86\Release/traf_odbcDrvMsg_intl0100.pdb</ProgramDatabaseFile> + <SubSystem>Windows</SubSystem> + <ImportLibrary>..\..\..\..\lib\x86\Release/traf_odbcDrvMsg_intl.lib</ImportLibrary> + </Link> + <Bscmake> + <OutputFile>.\x86\Release/Drvr35Msg.bsc</OutputFile> + </Bscmake> + </ItemDefinitionGroup> <ItemGroup> <ResourceCompile Include="DrvMsg35.rc" /> </ItemGroup> <ItemGroup> <CustomBuild Include="tdm_odbcdrvmsg.mc"> <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Building Odbc Drv Message DLL</Message> + <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Building Odbc Drv Message DLL</Message> <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">mc -v -u -U tdm_odbcdrvmsg.mc </Command> + <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">mc -v -u -U tdm_odbcdrvmsg.mc +</Command> <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectDir)tdm_odbcDrvMsg.h;$(ProjectDir)tdm_odbcDrvMsg.rc;$(ProjectDir)MSG00001.BIN;%(Outputs)</Outputs> + <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)tdm_odbcDrvMsg.h;$(ProjectDir)tdm_odbcDrvMsg.rc;$(ProjectDir)MSG00001.BIN;%(Outputs)</Outputs> <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Building Odbc Drv Message DLL</Message> + <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Building Odbc Drv Message DLL</Message> <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">mc -v -u -U tdm_odbcdrvmsg.mc </Command> + <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">mc -v -u -U tdm_odbcdrvmsg.mc +</Command> <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectDir)tdm_odbcDrvMsg.h;$(ProjectDir)tdm_odbcDrvMsg.rc;$(ProjectDir)MSG00001.BIN;%(Outputs)</Outputs> + <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)tdm_odbcDrvMsg.h;$(ProjectDir)tdm_odbcDrvMsg.rc;$(ProjectDir)MSG00001.BIN;%(Outputs)</Outputs> </CustomBuild> </ItemGroup> <ItemGroup> http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/cba9de3d/win-odbc64/odbcclient/odbcclient_os.sln ---------------------------------------------------------------------- diff --git a/win-odbc64/odbcclient/odbcclient_os.sln b/win-odbc64/odbcclient/odbcclient_os.sln old mode 100644 new mode 100755 index 38990db..f8fa376 --- a/win-odbc64/odbcclient/odbcclient_os.sln +++ b/win-odbc64/odbcclient/odbcclient_os.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2013 -VisualStudioVersion = 12.0.40629.0 +# Visual Studio 14 +VisualStudioVersion = 14.0.25420.1 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "drvr35_os", "drvr35\drvr35_os.vcxproj", "{4B7C62D7-1C63-4319-9818-98BFBB322CED}" ProjectSection(ProjectDependencies) = postProject @@ -35,64 +35,72 @@ Global Template|x64 = Template|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {4B7C62D7-1C63-4319-9818-98BFBB322CED}.Debug|Win32.ActiveCfg = Debug|x64 + {4B7C62D7-1C63-4319-9818-98BFBB322CED}.Debug|Win32.ActiveCfg = Debug|Win32 + {4B7C62D7-1C63-4319-9818-98BFBB322CED}.Debug|Win32.Build.0 = Debug|Win32 {4B7C62D7-1C63-4319-9818-98BFBB322CED}.Debug|x64.ActiveCfg = Debug|x64 {4B7C62D7-1C63-4319-9818-98BFBB322CED}.Debug|x64.Build.0 = Debug|x64 - {4B7C62D7-1C63-4319-9818-98BFBB322CED}.Release|Win32.ActiveCfg = Release|x64 + {4B7C62D7-1C63-4319-9818-98BFBB322CED}.Release|Win32.ActiveCfg = Release|Win32 + {4B7C62D7-1C63-4319-9818-98BFBB322CED}.Release|Win32.Build.0 = Release|Win32 {4B7C62D7-1C63-4319-9818-98BFBB322CED}.Release|x64.ActiveCfg = Release|x64 {4B7C62D7-1C63-4319-9818-98BFBB322CED}.Release|x64.Build.0 = Release|x64 {4B7C62D7-1C63-4319-9818-98BFBB322CED}.Template|Win32.ActiveCfg = Release|x64 {4B7C62D7-1C63-4319-9818-98BFBB322CED}.Template|x64.ActiveCfg = Release|x64 {4B7C62D7-1C63-4319-9818-98BFBB322CED}.Template|x64.Build.0 = Release|x64 - {38202379-9F93-46CB-90CF-5CA40FF4D20D}.Debug|Win32.ActiveCfg = Debug|x64 + {38202379-9F93-46CB-90CF-5CA40FF4D20D}.Debug|Win32.ActiveCfg = Debug|Win32 {38202379-9F93-46CB-90CF-5CA40FF4D20D}.Debug|x64.ActiveCfg = Debug|x64 {38202379-9F93-46CB-90CF-5CA40FF4D20D}.Debug|x64.Build.0 = Debug|x64 - {38202379-9F93-46CB-90CF-5CA40FF4D20D}.Release|Win32.ActiveCfg = Release|x64 + {38202379-9F93-46CB-90CF-5CA40FF4D20D}.Release|Win32.ActiveCfg = Release|Win32 + {38202379-9F93-46CB-90CF-5CA40FF4D20D}.Release|Win32.Build.0 = Release|Win32 {38202379-9F93-46CB-90CF-5CA40FF4D20D}.Release|x64.ActiveCfg = Release|x64 {38202379-9F93-46CB-90CF-5CA40FF4D20D}.Release|x64.Build.0 = Release|x64 {38202379-9F93-46CB-90CF-5CA40FF4D20D}.Template|Win32.ActiveCfg = Template|x64 {38202379-9F93-46CB-90CF-5CA40FF4D20D}.Template|x64.ActiveCfg = Template|x64 {38202379-9F93-46CB-90CF-5CA40FF4D20D}.Template|x64.Build.0 = Template|x64 - {B83DDF3C-8D5C-45AB-868B-4B70BB258647}.Debug|Win32.ActiveCfg = Debug|x64 + {B83DDF3C-8D5C-45AB-868B-4B70BB258647}.Debug|Win32.ActiveCfg = Debug|Win32 {B83DDF3C-8D5C-45AB-868B-4B70BB258647}.Debug|x64.ActiveCfg = Debug|x64 {B83DDF3C-8D5C-45AB-868B-4B70BB258647}.Debug|x64.Build.0 = Debug|x64 - {B83DDF3C-8D5C-45AB-868B-4B70BB258647}.Release|Win32.ActiveCfg = Release|x64 + {B83DDF3C-8D5C-45AB-868B-4B70BB258647}.Release|Win32.ActiveCfg = Release|Win32 + {B83DDF3C-8D5C-45AB-868B-4B70BB258647}.Release|Win32.Build.0 = Release|Win32 {B83DDF3C-8D5C-45AB-868B-4B70BB258647}.Release|x64.ActiveCfg = Release|x64 {B83DDF3C-8D5C-45AB-868B-4B70BB258647}.Release|x64.Build.0 = Release|x64 {B83DDF3C-8D5C-45AB-868B-4B70BB258647}.Template|Win32.ActiveCfg = Release|x64 {B83DDF3C-8D5C-45AB-868B-4B70BB258647}.Template|x64.ActiveCfg = Release|x64 {B83DDF3C-8D5C-45AB-868B-4B70BB258647}.Template|x64.Build.0 = Release|x64 - {94A32EC1-7A1A-40A6-9C12-1FDB7D4B0F8F}.Debug|Win32.ActiveCfg = Debug|x64 + {94A32EC1-7A1A-40A6-9C12-1FDB7D4B0F8F}.Debug|Win32.ActiveCfg = Debug|Win32 {94A32EC1-7A1A-40A6-9C12-1FDB7D4B0F8F}.Debug|x64.ActiveCfg = Debug|x64 {94A32EC1-7A1A-40A6-9C12-1FDB7D4B0F8F}.Debug|x64.Build.0 = Debug|x64 - {94A32EC1-7A1A-40A6-9C12-1FDB7D4B0F8F}.Release|Win32.ActiveCfg = Release|x64 + {94A32EC1-7A1A-40A6-9C12-1FDB7D4B0F8F}.Release|Win32.ActiveCfg = Release|Win32 + {94A32EC1-7A1A-40A6-9C12-1FDB7D4B0F8F}.Release|Win32.Build.0 = Release|Win32 {94A32EC1-7A1A-40A6-9C12-1FDB7D4B0F8F}.Release|x64.ActiveCfg = Release|x64 {94A32EC1-7A1A-40A6-9C12-1FDB7D4B0F8F}.Release|x64.Build.0 = Release|x64 {94A32EC1-7A1A-40A6-9C12-1FDB7D4B0F8F}.Template|Win32.ActiveCfg = Release|x64 {94A32EC1-7A1A-40A6-9C12-1FDB7D4B0F8F}.Template|x64.ActiveCfg = Release|x64 {94A32EC1-7A1A-40A6-9C12-1FDB7D4B0F8F}.Template|x64.Build.0 = Release|x64 - {48E698EA-784C-4838-B37A-2D19791257AD}.Debug|Win32.ActiveCfg = Debug|x64 + {48E698EA-784C-4838-B37A-2D19791257AD}.Debug|Win32.ActiveCfg = Debug|Win32 {48E698EA-784C-4838-B37A-2D19791257AD}.Debug|x64.ActiveCfg = Debug|x64 {48E698EA-784C-4838-B37A-2D19791257AD}.Debug|x64.Build.0 = Debug|x64 - {48E698EA-784C-4838-B37A-2D19791257AD}.Release|Win32.ActiveCfg = Release|x64 + {48E698EA-784C-4838-B37A-2D19791257AD}.Release|Win32.ActiveCfg = Release|Win32 + {48E698EA-784C-4838-B37A-2D19791257AD}.Release|Win32.Build.0 = Release|Win32 {48E698EA-784C-4838-B37A-2D19791257AD}.Release|x64.ActiveCfg = Release|x64 {48E698EA-784C-4838-B37A-2D19791257AD}.Release|x64.Build.0 = Release|x64 {48E698EA-784C-4838-B37A-2D19791257AD}.Template|Win32.ActiveCfg = Release|x64 {48E698EA-784C-4838-B37A-2D19791257AD}.Template|x64.ActiveCfg = Release|x64 {48E698EA-784C-4838-B37A-2D19791257AD}.Template|x64.Build.0 = Release|x64 - {27BC11EE-55F5-4FC8-AADE-C8EB71BFED3B}.Debug|Win32.ActiveCfg = Debug|x64 + {27BC11EE-55F5-4FC8-AADE-C8EB71BFED3B}.Debug|Win32.ActiveCfg = Debug|Win32 {27BC11EE-55F5-4FC8-AADE-C8EB71BFED3B}.Debug|x64.ActiveCfg = Debug|x64 {27BC11EE-55F5-4FC8-AADE-C8EB71BFED3B}.Debug|x64.Build.0 = Debug|x64 - {27BC11EE-55F5-4FC8-AADE-C8EB71BFED3B}.Release|Win32.ActiveCfg = Release|x64 + {27BC11EE-55F5-4FC8-AADE-C8EB71BFED3B}.Release|Win32.ActiveCfg = Release|Win32 + {27BC11EE-55F5-4FC8-AADE-C8EB71BFED3B}.Release|Win32.Build.0 = Release|Win32 {27BC11EE-55F5-4FC8-AADE-C8EB71BFED3B}.Release|x64.ActiveCfg = Release|x64 {27BC11EE-55F5-4FC8-AADE-C8EB71BFED3B}.Release|x64.Build.0 = Release|x64 {27BC11EE-55F5-4FC8-AADE-C8EB71BFED3B}.Template|Win32.ActiveCfg = Release|x64 {27BC11EE-55F5-4FC8-AADE-C8EB71BFED3B}.Template|x64.ActiveCfg = Release|x64 {27BC11EE-55F5-4FC8-AADE-C8EB71BFED3B}.Template|x64.Build.0 = Release|x64 - {1B37AEE5-7E3E-46C8-AA71-85CDED07183B}.Debug|Win32.ActiveCfg = Debug|x64 + {1B37AEE5-7E3E-46C8-AA71-85CDED07183B}.Debug|Win32.ActiveCfg = Debug|Win32 {1B37AEE5-7E3E-46C8-AA71-85CDED07183B}.Debug|x64.ActiveCfg = Debug|x64 {1B37AEE5-7E3E-46C8-AA71-85CDED07183B}.Debug|x64.Build.0 = Debug|x64 - {1B37AEE5-7E3E-46C8-AA71-85CDED07183B}.Release|Win32.ActiveCfg = Release|x64 + {1B37AEE5-7E3E-46C8-AA71-85CDED07183B}.Release|Win32.ActiveCfg = Release|Win32 + {1B37AEE5-7E3E-46C8-AA71-85CDED07183B}.Release|Win32.Build.0 = Release|Win32 {1B37AEE5-7E3E-46C8-AA71-85CDED07183B}.Release|x64.ActiveCfg = Release|x64 {1B37AEE5-7E3E-46C8-AA71-85CDED07183B}.Release|x64.Build.0 = Release|x64 {1B37AEE5-7E3E-46C8-AA71-85CDED07183B}.Template|Win32.ActiveCfg = Release|x64
