diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2013-05-25 19:16:59 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2013-05-25 23:16:59 +0200 |
| commit | a4c615c61d85293e0cfdedc6bb54f2c40c3e8578 (patch) | |
| tree | 51839d67c866f2aa888ddffb415ca0ae3849500c | |
| parent | d35c1b69f6f7e30ba44709a477f9a4daabc30669 (diff) | |
| download | cppunit-a4c615c61d85293e0cfdedc6bb54f2c40c3e8578.tar.gz | |
add configuration for 64bit windows builds
| -rw-r--r-- | src/CppUnitLibraries2010.sln | 66 | ||||
| -rw-r--r-- | src/DllPlugInTester/DllPlugInTester.vcxproj | 371 | ||||
| -rw-r--r-- | src/cppunit/cppunit.vcxproj | 105 | ||||
| -rw-r--r-- | src/cppunit/cppunit_dll.vcxproj | 129 | ||||
| -rw-r--r-- | src/msvc6/testpluginrunner/TestPlugInRunner.vcxproj | 159 | ||||
| -rw-r--r-- | src/msvc6/testrunner/TestRunner.vcxproj | 313 |
6 files changed, 1143 insertions, 0 deletions
diff --git a/src/CppUnitLibraries2010.sln b/src/CppUnitLibraries2010.sln index 03c58f9..633f721 100644 --- a/src/CppUnitLibraries2010.sln +++ b/src/CppUnitLibraries2010.sln @@ -25,73 +25,139 @@ EndProject Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug Static|Win32 = Debug Static|Win32
+ Debug Static|x64 = Debug Static|x64 Debug Unicode|Win32 = Debug Unicode|Win32
+ Debug Unicode|x64 = Debug Unicode|x64 Debug|Win32 = Debug|Win32
+ Debug|x64 = Debug|x64 Release Static|Win32 = Release Static|Win32
+ Release Static|x64 = Release Static|x64 Release Unicode|Win32 = Release Unicode|Win32
+ Release Unicode|x64 = Release Unicode|x64 Release|Win32 = Release|Win32
+ Release|x64 = Release|x64 EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{26047E59-ECD5-9E22-A3E3-D624038A5572}.Debug Static|Win32.ActiveCfg = Debug Static|Win32
{26047E59-ECD5-9E22-A3E3-D624038A5572}.Debug Static|Win32.Build.0 = Debug Static|Win32
+ {26047E59-ECD5-9E22-A3E3-D624038A5572}.Debug Static|x64.ActiveCfg = Debug Static|x64 + {26047E59-ECD5-9E22-A3E3-D624038A5572}.Debug Static|x64.Build.0 = Debug Static|x64 {26047E59-ECD5-9E22-A3E3-D624038A5572}.Debug Unicode|Win32.ActiveCfg = Debug Unicode|Win32
{26047E59-ECD5-9E22-A3E3-D624038A5572}.Debug Unicode|Win32.Build.0 = Debug Unicode|Win32
+ {26047E59-ECD5-9E22-A3E3-D624038A5572}.Debug Unicode|x64.ActiveCfg = Debug Unicode|x64 + {26047E59-ECD5-9E22-A3E3-D624038A5572}.Debug Unicode|x64.Build.0 = Debug Unicode|x64 {26047E59-ECD5-9E22-A3E3-D624038A5572}.Debug|Win32.ActiveCfg = Debug|Win32
{26047E59-ECD5-9E22-A3E3-D624038A5572}.Debug|Win32.Build.0 = Debug|Win32
+ {26047E59-ECD5-9E22-A3E3-D624038A5572}.Debug|x64.ActiveCfg = Debug|x64 + {26047E59-ECD5-9E22-A3E3-D624038A5572}.Debug|x64.Build.0 = Debug|x64 {26047E59-ECD5-9E22-A3E3-D624038A5572}.Release Static|Win32.ActiveCfg = Release Static|Win32
{26047E59-ECD5-9E22-A3E3-D624038A5572}.Release Static|Win32.Build.0 = Release Static|Win32
+ {26047E59-ECD5-9E22-A3E3-D624038A5572}.Release Static|x64.ActiveCfg = Release Static|x64 + {26047E59-ECD5-9E22-A3E3-D624038A5572}.Release Static|x64.Build.0 = Release Static|x64 {26047E59-ECD5-9E22-A3E3-D624038A5572}.Release Unicode|Win32.ActiveCfg = Release Unicode|Win32
{26047E59-ECD5-9E22-A3E3-D624038A5572}.Release Unicode|Win32.Build.0 = Release Unicode|Win32
+ {26047E59-ECD5-9E22-A3E3-D624038A5572}.Release Unicode|x64.ActiveCfg = Release Unicode|x64 + {26047E59-ECD5-9E22-A3E3-D624038A5572}.Release Unicode|x64.Build.0 = Release Unicode|x64 {26047E59-ECD5-9E22-A3E3-D624038A5572}.Release|Win32.ActiveCfg = Release|Win32
{26047E59-ECD5-9E22-A3E3-D624038A5572}.Release|Win32.Build.0 = Release|Win32
+ {26047E59-ECD5-9E22-A3E3-D624038A5572}.Release|x64.ActiveCfg = Release|x64 + {26047E59-ECD5-9E22-A3E3-D624038A5572}.Release|x64.Build.0 = Release|x64 {8FEDF6A8-2D35-C692-2CC3-B71090935E66}.Debug Static|Win32.ActiveCfg = Debug|Win32
{8FEDF6A8-2D35-C692-2CC3-B71090935E66}.Debug Static|Win32.Build.0 = Debug|Win32
+ {8FEDF6A8-2D35-C692-2CC3-B71090935E66}.Debug Static|x64.ActiveCfg = Debug|x64 + {8FEDF6A8-2D35-C692-2CC3-B71090935E66}.Debug Static|x64.Build.0 = Debug|x64 {8FEDF6A8-2D35-C692-2CC3-B71090935E66}.Debug Unicode|Win32.ActiveCfg = Debug|Win32
{8FEDF6A8-2D35-C692-2CC3-B71090935E66}.Debug Unicode|Win32.Build.0 = Debug|Win32
+ {8FEDF6A8-2D35-C692-2CC3-B71090935E66}.Debug Unicode|x64.ActiveCfg = Debug|x64 + {8FEDF6A8-2D35-C692-2CC3-B71090935E66}.Debug Unicode|x64.Build.0 = Debug|x64 {8FEDF6A8-2D35-C692-2CC3-B71090935E66}.Debug|Win32.ActiveCfg = Debug|Win32
{8FEDF6A8-2D35-C692-2CC3-B71090935E66}.Debug|Win32.Build.0 = Debug|Win32
+ {8FEDF6A8-2D35-C692-2CC3-B71090935E66}.Debug|x64.ActiveCfg = Debug|x64 + {8FEDF6A8-2D35-C692-2CC3-B71090935E66}.Debug|x64.Build.0 = Debug|x64 {8FEDF6A8-2D35-C692-2CC3-B71090935E66}.Release Static|Win32.ActiveCfg = Release|Win32
{8FEDF6A8-2D35-C692-2CC3-B71090935E66}.Release Static|Win32.Build.0 = Release|Win32
+ {8FEDF6A8-2D35-C692-2CC3-B71090935E66}.Release Static|x64.ActiveCfg = Release|x64 + {8FEDF6A8-2D35-C692-2CC3-B71090935E66}.Release Static|x64.Build.0 = Release|x64 {8FEDF6A8-2D35-C692-2CC3-B71090935E66}.Release Unicode|Win32.ActiveCfg = Release|Win32
{8FEDF6A8-2D35-C692-2CC3-B71090935E66}.Release Unicode|Win32.Build.0 = Release|Win32
+ {8FEDF6A8-2D35-C692-2CC3-B71090935E66}.Release Unicode|x64.ActiveCfg = Release|x64 + {8FEDF6A8-2D35-C692-2CC3-B71090935E66}.Release Unicode|x64.Build.0 = Release|x64 {8FEDF6A8-2D35-C692-2CC3-B71090935E66}.Release|Win32.ActiveCfg = Release|Win32
{8FEDF6A8-2D35-C692-2CC3-B71090935E66}.Release|Win32.Build.0 = Release|Win32
+ {8FEDF6A8-2D35-C692-2CC3-B71090935E66}.Release|x64.ActiveCfg = Release|x64 + {8FEDF6A8-2D35-C692-2CC3-B71090935E66}.Release|x64.Build.0 = Release|x64 {71E8BC4A-C01E-61B8-6C5B-682FD03A6DCB}.Debug Static|Win32.ActiveCfg = Debug Unicode|Win32
{71E8BC4A-C01E-61B8-6C5B-682FD03A6DCB}.Debug Static|Win32.Build.0 = Debug Unicode|Win32
+ {71E8BC4A-C01E-61B8-6C5B-682FD03A6DCB}.Debug Static|x64.ActiveCfg = Debug Unicode|x64 + {71E8BC4A-C01E-61B8-6C5B-682FD03A6DCB}.Debug Static|x64.Build.0 = Debug Unicode|x64 {71E8BC4A-C01E-61B8-6C5B-682FD03A6DCB}.Debug Unicode|Win32.ActiveCfg = Debug Unicode|Win32
{71E8BC4A-C01E-61B8-6C5B-682FD03A6DCB}.Debug Unicode|Win32.Build.0 = Debug Unicode|Win32
+ {71E8BC4A-C01E-61B8-6C5B-682FD03A6DCB}.Debug Unicode|x64.ActiveCfg = Debug Unicode|x64 + {71E8BC4A-C01E-61B8-6C5B-682FD03A6DCB}.Debug Unicode|x64.Build.0 = Debug Unicode|x64 {71E8BC4A-C01E-61B8-6C5B-682FD03A6DCB}.Debug|Win32.ActiveCfg = Debug|Win32
{71E8BC4A-C01E-61B8-6C5B-682FD03A6DCB}.Debug|Win32.Build.0 = Debug|Win32
+ {71E8BC4A-C01E-61B8-6C5B-682FD03A6DCB}.Debug|x64.ActiveCfg = Debug|x64 + {71E8BC4A-C01E-61B8-6C5B-682FD03A6DCB}.Debug|x64.Build.0 = Debug|x64 {71E8BC4A-C01E-61B8-6C5B-682FD03A6DCB}.Release Static|Win32.ActiveCfg = Release Unicode|Win32
{71E8BC4A-C01E-61B8-6C5B-682FD03A6DCB}.Release Static|Win32.Build.0 = Release Unicode|Win32
+ {71E8BC4A-C01E-61B8-6C5B-682FD03A6DCB}.Release Static|x64.ActiveCfg = Release Unicode|x64 + {71E8BC4A-C01E-61B8-6C5B-682FD03A6DCB}.Release Static|x64.Build.0 = Release Unicode|x64 {71E8BC4A-C01E-61B8-6C5B-682FD03A6DCB}.Release Unicode|Win32.ActiveCfg = Release Unicode|Win32
{71E8BC4A-C01E-61B8-6C5B-682FD03A6DCB}.Release Unicode|Win32.Build.0 = Release Unicode|Win32
+ {71E8BC4A-C01E-61B8-6C5B-682FD03A6DCB}.Release Unicode|x64.ActiveCfg = Release Unicode|x64 + {71E8BC4A-C01E-61B8-6C5B-682FD03A6DCB}.Release Unicode|x64.Build.0 = Release Unicode|x64 {71E8BC4A-C01E-61B8-6C5B-682FD03A6DCB}.Release|Win32.ActiveCfg = Release|Win32
{71E8BC4A-C01E-61B8-6C5B-682FD03A6DCB}.Release|Win32.Build.0 = Release|Win32
+ {71E8BC4A-C01E-61B8-6C5B-682FD03A6DCB}.Release|x64.ActiveCfg = Release|x64 + {71E8BC4A-C01E-61B8-6C5B-682FD03A6DCB}.Release|x64.Build.0 = Release|x64 {338B9353-C5CC-FCA6-A584-73425CEDD569}.Debug Static|Win32.ActiveCfg = Debug|Win32
{338B9353-C5CC-FCA6-A584-73425CEDD569}.Debug Static|Win32.Build.0 = Debug|Win32
+ {338B9353-C5CC-FCA6-A584-73425CEDD569}.Debug Static|x64.ActiveCfg = Debug|x64 + {338B9353-C5CC-FCA6-A584-73425CEDD569}.Debug Static|x64.Build.0 = Debug|x64 {338B9353-C5CC-FCA6-A584-73425CEDD569}.Debug Unicode|Win32.ActiveCfg = Debug|Win32
{338B9353-C5CC-FCA6-A584-73425CEDD569}.Debug Unicode|Win32.Build.0 = Debug|Win32
+ {338B9353-C5CC-FCA6-A584-73425CEDD569}.Debug Unicode|x64.ActiveCfg = Debug|x64 + {338B9353-C5CC-FCA6-A584-73425CEDD569}.Debug Unicode|x64.Build.0 = Debug|x64 {338B9353-C5CC-FCA6-A584-73425CEDD569}.Debug|Win32.ActiveCfg = Debug|Win32
{338B9353-C5CC-FCA6-A584-73425CEDD569}.Debug|Win32.Build.0 = Debug|Win32
+ {338B9353-C5CC-FCA6-A584-73425CEDD569}.Debug|x64.ActiveCfg = Debug|x64 + {338B9353-C5CC-FCA6-A584-73425CEDD569}.Debug|x64.Build.0 = Debug|x64 {338B9353-C5CC-FCA6-A584-73425CEDD569}.Release Static|Win32.ActiveCfg = Release|Win32
{338B9353-C5CC-FCA6-A584-73425CEDD569}.Release Static|Win32.Build.0 = Release|Win32
+ {338B9353-C5CC-FCA6-A584-73425CEDD569}.Release Static|x64.ActiveCfg = Release|x64 + {338B9353-C5CC-FCA6-A584-73425CEDD569}.Release Static|x64.Build.0 = Release|x64 {338B9353-C5CC-FCA6-A584-73425CEDD569}.Release Unicode|Win32.ActiveCfg = Release|Win32
{338B9353-C5CC-FCA6-A584-73425CEDD569}.Release Unicode|Win32.Build.0 = Release|Win32
+ {338B9353-C5CC-FCA6-A584-73425CEDD569}.Release Unicode|x64.ActiveCfg = Release|x64 + {338B9353-C5CC-FCA6-A584-73425CEDD569}.Release Unicode|x64.Build.0 = Release|x64 {338B9353-C5CC-FCA6-A584-73425CEDD569}.Release|Win32.ActiveCfg = Release|Win32
{338B9353-C5CC-FCA6-A584-73425CEDD569}.Release|Win32.Build.0 = Release|Win32
+ {338B9353-C5CC-FCA6-A584-73425CEDD569}.Release|x64.ActiveCfg = Release|x64 + {338B9353-C5CC-FCA6-A584-73425CEDD569}.Release|x64.Build.0 = Release|x64 {EB329AF7-E267-3B00-09A4-FF1F909E4FB5}.Debug Static|Win32.ActiveCfg = Debug|Win32
{EB329AF7-E267-3B00-09A4-FF1F909E4FB5}.Debug Static|Win32.Build.0 = Debug|Win32
+ {EB329AF7-E267-3B00-09A4-FF1F909E4FB5}.Debug Static|x64.ActiveCfg = Debug|x64 + {EB329AF7-E267-3B00-09A4-FF1F909E4FB5}.Debug Static|x64.Build.0 = Debug|x64 {EB329AF7-E267-3B00-09A4-FF1F909E4FB5}.Debug Unicode|Win32.ActiveCfg = Debug|Win32
{EB329AF7-E267-3B00-09A4-FF1F909E4FB5}.Debug Unicode|Win32.Build.0 = Debug|Win32
+ {EB329AF7-E267-3B00-09A4-FF1F909E4FB5}.Debug Unicode|x64.ActiveCfg = Debug|x64 + {EB329AF7-E267-3B00-09A4-FF1F909E4FB5}.Debug Unicode|x64.Build.0 = Debug|x64 {EB329AF7-E267-3B00-09A4-FF1F909E4FB5}.Debug|Win32.ActiveCfg = Debug|Win32
{EB329AF7-E267-3B00-09A4-FF1F909E4FB5}.Debug|Win32.Build.0 = Debug|Win32
+ {EB329AF7-E267-3B00-09A4-FF1F909E4FB5}.Debug|x64.ActiveCfg = Debug|x64 + {EB329AF7-E267-3B00-09A4-FF1F909E4FB5}.Debug|x64.Build.0 = Debug|x64 {EB329AF7-E267-3B00-09A4-FF1F909E4FB5}.Release Static|Win32.ActiveCfg = Release|Win32
{EB329AF7-E267-3B00-09A4-FF1F909E4FB5}.Release Static|Win32.Build.0 = Release|Win32
+ {EB329AF7-E267-3B00-09A4-FF1F909E4FB5}.Release Static|x64.ActiveCfg = Release|x64 + {EB329AF7-E267-3B00-09A4-FF1F909E4FB5}.Release Static|x64.Build.0 = Release|x64 {EB329AF7-E267-3B00-09A4-FF1F909E4FB5}.Release Unicode|Win32.ActiveCfg = Release|Win32
{EB329AF7-E267-3B00-09A4-FF1F909E4FB5}.Release Unicode|Win32.Build.0 = Release|Win32
+ {EB329AF7-E267-3B00-09A4-FF1F909E4FB5}.Release Unicode|x64.ActiveCfg = Release|x64 + {EB329AF7-E267-3B00-09A4-FF1F909E4FB5}.Release Unicode|x64.Build.0 = Release|x64 {EB329AF7-E267-3B00-09A4-FF1F909E4FB5}.Release|Win32.ActiveCfg = Release|Win32
{EB329AF7-E267-3B00-09A4-FF1F909E4FB5}.Release|Win32.Build.0 = Release|Win32
+ {EB329AF7-E267-3B00-09A4-FF1F909E4FB5}.Release|x64.ActiveCfg = Release|x64 + {EB329AF7-E267-3B00-09A4-FF1F909E4FB5}.Release|x64.Build.0 = Release|x64 EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/src/DllPlugInTester/DllPlugInTester.vcxproj b/src/DllPlugInTester/DllPlugInTester.vcxproj index 6a48731..6af947d 100644 --- a/src/DllPlugInTester/DllPlugInTester.vcxproj +++ b/src/DllPlugInTester/DllPlugInTester.vcxproj @@ -5,26 +5,50 @@ <Configuration>Debug Static</Configuration> <Platform>Win32</Platform> </ProjectConfiguration> + <ProjectConfiguration Include="Debug Static|x64"> + <Configuration>Debug Static</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> <ProjectConfiguration Include="Debug Unicode|Win32"> <Configuration>Debug Unicode</Configuration> <Platform>Win32</Platform> </ProjectConfiguration> + <ProjectConfiguration Include="Debug Unicode|x64"> + <Configuration>Debug Unicode</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> <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 Static|Win32"> <Configuration>Release Static</Configuration> <Platform>Win32</Platform> </ProjectConfiguration> + <ProjectConfiguration Include="Release Static|x64"> + <Configuration>Release Static</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> <ProjectConfiguration Include="Release Unicode|Win32"> <Configuration>Release Unicode</Configuration> <Platform>Win32</Platform> </ProjectConfiguration> + <ProjectConfiguration Include="Release Unicode|x64"> + <Configuration>Release Unicode</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> </ItemGroup> <PropertyGroup Label="Globals"> <SccProjectName /> @@ -37,31 +61,61 @@ <UseOfMfc>false</UseOfMfc> <CharacterSet>MultiByte</CharacterSet> </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|x64'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseOfMfc>false</UseOfMfc> + <CharacterSet>MultiByte</CharacterSet> + </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <UseOfMfc>false</UseOfMfc> <CharacterSet>MultiByte</CharacterSet> </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseOfMfc>false</UseOfMfc> + <CharacterSet>MultiByte</CharacterSet> + </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <UseOfMfc>false</UseOfMfc> <CharacterSet>MultiByte</CharacterSet> </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseOfMfc>false</UseOfMfc> + <CharacterSet>MultiByte</CharacterSet> + </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Static|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <UseOfMfc>false</UseOfMfc> <CharacterSet>MultiByte</CharacterSet> </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Static|x64'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseOfMfc>false</UseOfMfc> + <CharacterSet>MultiByte</CharacterSet> + </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Static|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <UseOfMfc>false</UseOfMfc> <CharacterSet>MultiByte</CharacterSet> </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Static|x64'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseOfMfc>false</UseOfMfc> + <CharacterSet>MultiByte</CharacterSet> + </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Unicode|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <UseOfMfc>false</UseOfMfc> <CharacterSet>MultiByte</CharacterSet> </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Unicode|x64'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseOfMfc>false</UseOfMfc> + <CharacterSet>MultiByte</CharacterSet> + </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <ImportGroup Label="ExtensionSettings"> </ImportGroup> @@ -69,26 +123,50 @@ <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 Unicode|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)'=='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)'=='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> + <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)'=='Release Static|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)'=='Release Static|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 Static|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 Static|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 Unicode|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)'=='Release Unicode|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> <PropertyGroup Label="UserMacros" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Unicode|Win32'"> <OutDir>.\ReleaseUnicode\</OutDir> @@ -96,35 +174,70 @@ <LinkIncremental>false</LinkIncremental> <TargetName>$(ProjectName)u</TargetName> </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Unicode|x64'"> + <OutDir>.\ReleaseUnicode\</OutDir> + <IntDir>.\ReleaseUnicode\</IntDir> + <LinkIncremental>false</LinkIncremental> + <TargetName>$(ProjectName)u</TargetName> + </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Static|Win32'"> <OutDir>.\Debug\</OutDir> <IntDir>.\Debug\</IntDir> <LinkIncremental>false</LinkIncremental> <TargetName>$(ProjectName)d</TargetName> </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Static|x64'"> + <OutDir>.\Debug\</OutDir> + <IntDir>.\Debug\</IntDir> + <LinkIncremental>false</LinkIncremental> + <TargetName>$(ProjectName)d</TargetName> + </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Static|Win32'"> <OutDir>.\Release\</OutDir> <IntDir>.\Release\</IntDir> <LinkIncremental>false</LinkIncremental> </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Static|x64'"> + <OutDir>.\Release\</OutDir> + <IntDir>.\Release\</IntDir> + <LinkIncremental>false</LinkIncremental> + </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <OutDir>.\DebugDll\</OutDir> <IntDir>.\DebugDll\</IntDir> <LinkIncremental>false</LinkIncremental> <TargetName>DllPlugInTesterd_dll</TargetName> </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <OutDir>.\DebugDll\</OutDir> + <IntDir>.\DebugDll\</IntDir> + <LinkIncremental>false</LinkIncremental> + <TargetName>DllPlugInTesterd_dll</TargetName> + </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <OutDir>.\ReleaseDll\</OutDir> <IntDir>.\ReleaseDll\</IntDir> <LinkIncremental>false</LinkIncremental> <TargetName>$(ProjectName)_dll</TargetName> </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <OutDir>.\ReleaseDll\</OutDir> + <IntDir>.\ReleaseDll\</IntDir> + <LinkIncremental>false</LinkIncremental> + <TargetName>$(ProjectName)_dll</TargetName> + </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|Win32'"> <OutDir>.\DebugUnicode\</OutDir> <IntDir>.\DebugUnicode\</IntDir> <LinkIncremental>false</LinkIncremental> <TargetName>$(ProjectName)ud</TargetName> </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|x64'"> + <OutDir>.\DebugUnicode\</OutDir> + <IntDir>.\DebugUnicode\</IntDir> + <LinkIncremental>false</LinkIncremental> + <TargetName>$(ProjectName)ud</TargetName> + </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Unicode|Win32'"> <ClCompile> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> @@ -168,6 +281,49 @@ <AdditionalDependencies>odbc32.lib;odbccp32.lib;cppunit.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Unicode|x64'"> + <ClCompile> + <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> + <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> + <StringPooling>true</StringPooling> + <FunctionLevelLinking>true</FunctionLevelLinking> + <Optimization>MinSpace</Optimization> + <SuppressStartupBanner>true</SuppressStartupBanner> + <WarningLevel>Level3</WarningLevel> + <RuntimeTypeInfo>true</RuntimeTypeInfo> + <DebugInformationFormat>OldStyle</DebugInformationFormat> + <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AssemblerListingLocation>.\ReleaseUnicode\</AssemblerListingLocation> + <PrecompiledHeaderOutputFile>.\ReleaseUnicode\DllPlugInTester.pch</PrecompiledHeaderOutputFile> + <PrecompiledHeader> + </PrecompiledHeader> + <ObjectFileName>.\ReleaseUnicode\</ObjectFileName> + <ProgramDataBaseFileName>.\ReleaseUnicode\</ProgramDataBaseFileName> + </ClCompile> + <PostBuildEvent> + <Command>copy "$(TargetPath)" ..\..\lib\$(TargetName).exe</Command> + <Message>Copying target to lib/</Message> + </PostBuildEvent> + <Midl> + <TypeLibraryName>.\ReleaseUnicode\DllPlugInTester.tlb</TypeLibraryName> + </Midl> + <ResourceCompile> + <Culture>0x040c</Culture> + <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + </ResourceCompile> + <Bscmake> + <SuppressStartupBanner>true</SuppressStartupBanner> + <OutputFile>.\ReleaseUnicode\DllPlugInTester.bsc</OutputFile> + </Bscmake> + <Link> + <SuppressStartupBanner>true</SuppressStartupBanner> + <SubSystem>Console</SubSystem> + <OutputFile>ReleaseUnicode\DllPlugInTesteru.exe</OutputFile> + <AdditionalLibraryDirectories>../../lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <AdditionalDependencies>odbc32.lib;odbccp32.lib;cppunit.lib;%(AdditionalDependencies)</AdditionalDependencies> + </Link> + </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Static|Win32'"> <ClCompile> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> @@ -212,6 +368,49 @@ <AdditionalDependencies>odbc32.lib;odbccp32.lib;cppunitd.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Static|x64'"> + <ClCompile> + <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> + <InlineFunctionExpansion>Default</InlineFunctionExpansion> + <FunctionLevelLinking>false</FunctionLevelLinking> + <Optimization>Disabled</Optimization> + <SuppressStartupBanner>true</SuppressStartupBanner> + <WarningLevel>Level3</WarningLevel> + <RuntimeTypeInfo>true</RuntimeTypeInfo> + <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AssemblerListingLocation>.\Debug\</AssemblerListingLocation> + <PrecompiledHeaderOutputFile>.\Debug\DllPlugInTester.pch</PrecompiledHeaderOutputFile> + <PrecompiledHeader> + </PrecompiledHeader> + <ObjectFileName>.\Debug\</ObjectFileName> + <ProgramDataBaseFileName>.\Debug\</ProgramDataBaseFileName> + <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> + </ClCompile> + <PostBuildEvent> + <Command>copy $(TargetPath) ..\..\lib\$(TargetName).exe</Command> + <Message>Copying target to lib/</Message> + </PostBuildEvent> + <Midl> + <TypeLibraryName>.\Debug\DllPlugInTester.tlb</TypeLibraryName> + </Midl> + <ResourceCompile> + <Culture>0x040c</Culture> + <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + </ResourceCompile> + <Bscmake> + <SuppressStartupBanner>true</SuppressStartupBanner> + <OutputFile>.\Debug\DllPlugInTester.bsc</OutputFile> + </Bscmake> + <Link> + <SuppressStartupBanner>true</SuppressStartupBanner> + <GenerateDebugInformation>true</GenerateDebugInformation> + <SubSystem>Console</SubSystem> + <OutputFile>Debug\DllPlugInTesterd.exe</OutputFile> + <AdditionalLibraryDirectories>../../lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <AdditionalDependencies>odbc32.lib;odbccp32.lib;cppunitd.lib;%(AdditionalDependencies)</AdditionalDependencies> + </Link> + </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Static|Win32'"> <ClCompile> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> @@ -255,6 +454,49 @@ <AdditionalDependencies>odbc32.lib;odbccp32.lib;cppunit.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Static|x64'"> + <ClCompile> + <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> + <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> + <StringPooling>true</StringPooling> + <FunctionLevelLinking>true</FunctionLevelLinking> + <Optimization>MinSpace</Optimization> + <SuppressStartupBanner>true</SuppressStartupBanner> + <WarningLevel>Level3</WarningLevel> + <RuntimeTypeInfo>true</RuntimeTypeInfo> + <DebugInformationFormat>OldStyle</DebugInformationFormat> + <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AssemblerListingLocation>.\Release\</AssemblerListingLocation> + <PrecompiledHeaderOutputFile>.\Release\DllPlugInTester.pch</PrecompiledHeaderOutputFile> + <PrecompiledHeader> + </PrecompiledHeader> + <ObjectFileName>.\Release\</ObjectFileName> + <ProgramDataBaseFileName>.\Release\</ProgramDataBaseFileName> + </ClCompile> + <PostBuildEvent> + <Command>copy $(TargetPath) ..\..\lib\$(TargetName).exe</Command> + <Message>Copying target to lib/</Message> + </PostBuildEvent> + <Midl> + <TypeLibraryName>.\Release\DllPlugInTester.tlb</TypeLibraryName> + </Midl> + <ResourceCompile> + <Culture>0x040c</Culture> + <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + </ResourceCompile> + <Bscmake> + <SuppressStartupBanner>true</SuppressStartupBanner> + <OutputFile>.\Release\DllPlugInTester.bsc</OutputFile> + </Bscmake> + <Link> + <SuppressStartupBanner>true</SuppressStartupBanner> + <SubSystem>Console</SubSystem> + <OutputFile>.\Release\DllPlugInTester.exe</OutputFile> + <AdditionalLibraryDirectories>../../lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <AdditionalDependencies>odbc32.lib;odbccp32.lib;cppunit.lib;%(AdditionalDependencies)</AdditionalDependencies> + </Link> + </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> @@ -299,6 +541,49 @@ <AdditionalDependencies>odbc32.lib;odbccp32.lib;cppunitd_dll.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <ClCompile> + <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> + <InlineFunctionExpansion>Default</InlineFunctionExpansion> + <FunctionLevelLinking>false</FunctionLevelLinking> + <Optimization>Disabled</Optimization> + <SuppressStartupBanner>true</SuppressStartupBanner> + <WarningLevel>Level3</WarningLevel> + <RuntimeTypeInfo>true</RuntimeTypeInfo> + <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;CPPUNIT_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AssemblerListingLocation>.\DebugDll\</AssemblerListingLocation> + <PrecompiledHeaderOutputFile>.\DebugDll\DllPlugInTester.pch</PrecompiledHeaderOutputFile> + <PrecompiledHeader> + </PrecompiledHeader> + <ObjectFileName>.\DebugDll\</ObjectFileName> + <ProgramDataBaseFileName>.\DebugDll\</ProgramDataBaseFileName> + <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> + </ClCompile> + <PostBuildEvent> + <Command>copy "$(TargetPath)" ..\..\lib\$(TargetName).exe</Command> + <Message>Copying target to lib/</Message> + </PostBuildEvent> + <Midl> + <TypeLibraryName>.\DebugDll\DllPlugInTester.tlb</TypeLibraryName> + </Midl> + <ResourceCompile> + <Culture>0x040c</Culture> + <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + </ResourceCompile> + <Bscmake> + <SuppressStartupBanner>true</SuppressStartupBanner> + <OutputFile>.\DebugDll\DllPlugInTester.bsc</OutputFile> + </Bscmake> + <Link> + <SuppressStartupBanner>true</SuppressStartupBanner> + <GenerateDebugInformation>true</GenerateDebugInformation> + <SubSystem>Console</SubSystem> + <OutputFile>DebugDll\DllPlugInTesterd_dll.exe</OutputFile> + <AdditionalLibraryDirectories>../../lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <AdditionalDependencies>odbc32.lib;odbccp32.lib;cppunitd_dll.lib;%(AdditionalDependencies)</AdditionalDependencies> + </Link> + </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ClCompile> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> @@ -342,6 +627,49 @@ <AdditionalDependencies>odbc32.lib;odbccp32.lib;cppunit_dll.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <ClCompile> + <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> + <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> + <StringPooling>true</StringPooling> + <FunctionLevelLinking>true</FunctionLevelLinking> + <Optimization>MinSpace</Optimization> + <SuppressStartupBanner>true</SuppressStartupBanner> + <WarningLevel>Level3</WarningLevel> + <RuntimeTypeInfo>true</RuntimeTypeInfo> + <DebugInformationFormat>OldStyle</DebugInformationFormat> + <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;CPPUNIT_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AssemblerListingLocation>.\ReleaseDll\</AssemblerListingLocation> + <PrecompiledHeaderOutputFile>.\ReleaseDll\DllPlugInTester.pch</PrecompiledHeaderOutputFile> + <PrecompiledHeader> + </PrecompiledHeader> + <ObjectFileName>.\ReleaseDll\</ObjectFileName> + <ProgramDataBaseFileName>.\ReleaseDll\</ProgramDataBaseFileName> + </ClCompile> + <PostBuildEvent> + <Command>copy "$(TargetPath)" ..\..\lib\$(TargetName).exe</Command> + <Message>Copying target to lib/</Message> + </PostBuildEvent> + <Midl> + <TypeLibraryName>.\ReleaseDll\DllPlugInTester.tlb</TypeLibraryName> + </Midl> + <ResourceCompile> + <Culture>0x040c</Culture> + <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + </ResourceCompile> + <Bscmake> + <SuppressStartupBanner>true</SuppressStartupBanner> + <OutputFile>.\ReleaseDll\DllPlugInTester.bsc</OutputFile> + </Bscmake> + <Link> + <SuppressStartupBanner>true</SuppressStartupBanner> + <SubSystem>Console</SubSystem> + <OutputFile>ReleaseDll\DllPlugInTester_dll.exe</OutputFile> + <AdditionalLibraryDirectories>../../lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <AdditionalDependencies>odbc32.lib;odbccp32.lib;cppunit_dll.lib;%(AdditionalDependencies)</AdditionalDependencies> + </Link> + </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|Win32'"> <ClCompile> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> @@ -386,6 +714,49 @@ <AdditionalDependencies>odbc32.lib;odbccp32.lib;cppunitd.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|x64'"> + <ClCompile> + <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> + <InlineFunctionExpansion>Default</InlineFunctionExpansion> + <FunctionLevelLinking>false</FunctionLevelLinking> + <Optimization>Disabled</Optimization> + <SuppressStartupBanner>true</SuppressStartupBanner> + <WarningLevel>Level3</WarningLevel> + <RuntimeTypeInfo>true</RuntimeTypeInfo> + <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AssemblerListingLocation>.\DebugUnicode\</AssemblerListingLocation> + <PrecompiledHeaderOutputFile>.\DebugUnicode\DllPlugInTester.pch</PrecompiledHeaderOutputFile> + <PrecompiledHeader> + </PrecompiledHeader> + <ObjectFileName>.\DebugUnicode\</ObjectFileName> + <ProgramDataBaseFileName>.\DebugUnicode\</ProgramDataBaseFileName> + <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> + </ClCompile> + <PostBuildEvent> + <Command>copy "$(TargetPath)" ..\..\lib\$(TargetName).exe</Command> + <Message>Copying target to lib/</Message> + </PostBuildEvent> + <Midl> + <TypeLibraryName>.\DebugUnicode\DllPlugInTester.tlb</TypeLibraryName> + </Midl> + <ResourceCompile> + <Culture>0x040c</Culture> + <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + </ResourceCompile> + <Bscmake> + <SuppressStartupBanner>true</SuppressStartupBanner> + <OutputFile>.\DebugUnicode\DllPlugInTester.bsc</OutputFile> + </Bscmake> + <Link> + <SuppressStartupBanner>true</SuppressStartupBanner> + <GenerateDebugInformation>true</GenerateDebugInformation> + <SubSystem>Console</SubSystem> + <OutputFile>DebugUnicode\DllPlugInTesterud.exe</OutputFile> + <AdditionalLibraryDirectories>../../lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <AdditionalDependencies>odbc32.lib;odbccp32.lib;cppunitd.lib;%(AdditionalDependencies)</AdditionalDependencies> + </Link> + </ItemDefinitionGroup> <ItemGroup> <ClCompile Include="CommandLineParser.cpp" /> <ClCompile Include="DllPlugInTester.cpp" /> diff --git a/src/cppunit/cppunit.vcxproj b/src/cppunit/cppunit.vcxproj index e0a1420..0367d20 100644 --- a/src/cppunit/cppunit.vcxproj +++ b/src/cppunit/cppunit.vcxproj @@ -5,10 +5,18 @@ <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> </ItemGroup> <PropertyGroup Label="Globals"> <SccProjectName /> @@ -21,11 +29,21 @@ <UseOfMfc>false</UseOfMfc> <CharacterSet>MultiByte</CharacterSet> </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> + <ConfigurationType>StaticLibrary</ConfigurationType> + <UseOfMfc>false</UseOfMfc> + <CharacterSet>MultiByte</CharacterSet> + </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <ConfigurationType>StaticLibrary</ConfigurationType> <UseOfMfc>false</UseOfMfc> <CharacterSet>MultiByte</CharacterSet> </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> + <ConfigurationType>StaticLibrary</ConfigurationType> + <UseOfMfc>false</UseOfMfc> + <CharacterSet>MultiByte</CharacterSet> + </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <ImportGroup Label="ExtensionSettings"> </ImportGroup> @@ -33,20 +51,37 @@ <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)'=='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)'=='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> <PropertyGroup Label="UserMacros" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <OutDir>.\Release\</OutDir> <IntDir>.\Release\</IntDir> </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <OutDir>.\Release\</OutDir> + <IntDir>.\Release\</IntDir> + </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <OutDir>.\Debug\</OutDir> <IntDir>.\Debug\</IntDir> <TargetName>$(ProjectName)d</TargetName> </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <OutDir>.\Debug\</OutDir> + <IntDir>.\Debug\</IntDir> + <TargetName>$(ProjectName)d</TargetName> + </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ClCompile> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> @@ -82,6 +117,41 @@ <OutputFile>.\Release\cppunit.lib</OutputFile> </Lib> </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <ClCompile> + <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> + <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> + <StringPooling>true</StringPooling> + <FunctionLevelLinking>true</FunctionLevelLinking> + <Optimization>MaxSpeed</Optimization> + <SuppressStartupBanner>true</SuppressStartupBanner> + <WarningLevel>Level3</WarningLevel> + <RuntimeTypeInfo>true</RuntimeTypeInfo> + <DebugInformationFormat>OldStyle</DebugInformationFormat> + <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>NDEBUG;_LIB;WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AssemblerListingLocation>.\Release\</AssemblerListingLocation> + <PrecompiledHeaderOutputFile>.\Release\cppunit.pch</PrecompiledHeaderOutputFile> + <ObjectFileName>.\Release\</ObjectFileName> + <ProgramDataBaseFileName>.\Release\</ProgramDataBaseFileName> + </ClCompile> + <PostBuildEvent> + <Command>copy "$(TargetPath)" ..\..\lib\$(TargetName).lib</Command> + <Message>Copying target to lib/</Message> + </PostBuildEvent> + <ResourceCompile> + <Culture>0x040c</Culture> + <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + </ResourceCompile> + <Bscmake> + <SuppressStartupBanner>true</SuppressStartupBanner> + <OutputFile>.\Release\cppunit.bsc</OutputFile> + </Bscmake> + <Lib> + <SuppressStartupBanner>true</SuppressStartupBanner> + <OutputFile>.\Release\cppunit.lib</OutputFile> + </Lib> + </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> @@ -117,6 +187,40 @@ <OutputFile>Debug\$(TargetName).lib</OutputFile> </Lib> </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <ClCompile> + <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> + <InlineFunctionExpansion>Default</InlineFunctionExpansion> + <FunctionLevelLinking>false</FunctionLevelLinking> + <Optimization>Disabled</Optimization> + <SuppressStartupBanner>true</SuppressStartupBanner> + <WarningLevel>Level3</WarningLevel> + <RuntimeTypeInfo>true</RuntimeTypeInfo> + <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>_DEBUG;_LIB;WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AssemblerListingLocation>.\Debug\</AssemblerListingLocation> + <PrecompiledHeaderOutputFile>.\Debug\cppunit.pch</PrecompiledHeaderOutputFile> + <ObjectFileName>.\Debug\</ObjectFileName> + <ProgramDataBaseFileName>.\Debug\</ProgramDataBaseFileName> + <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> + </ClCompile> + <PostBuildEvent> + <Command>copy "$(TargetPath)" ..\..\lib\$(TargetName).lib</Command> + <Message>Copying target to lib/</Message> + </PostBuildEvent> + <ResourceCompile> + <Culture>0x040c</Culture> + <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + </ResourceCompile> + <Bscmake> + <SuppressStartupBanner>true</SuppressStartupBanner> + <OutputFile>.\Debug\cppunit.bsc</OutputFile> + </Bscmake> + <Lib> + <SuppressStartupBanner>true</SuppressStartupBanner> + <OutputFile>Debug\$(TargetName).lib</OutputFile> + </Lib> + </ItemDefinitionGroup> <ItemGroup> <CustomBuild Include="..\..\ChangeLog"> <FileType>Document</FileType> @@ -168,6 +272,7 @@ <ClCompile Include="TextOutputter.cpp" /> <ClCompile Include="XmlOutputter.cpp"> <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Level3</WarningLevel> + <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Level3</WarningLevel> </ClCompile> <ClCompile Include="XmlOutputterHook.cpp" /> <ClCompile Include="AdditionalMessage.cpp" /> diff --git a/src/cppunit/cppunit_dll.vcxproj b/src/cppunit/cppunit_dll.vcxproj index 2101923..292e62f 100644 --- a/src/cppunit/cppunit_dll.vcxproj +++ b/src/cppunit/cppunit_dll.vcxproj @@ -5,10 +5,18 @@ <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> </ItemGroup> <PropertyGroup Label="Globals"> <SccProjectName /> @@ -21,11 +29,21 @@ <UseOfMfc>false</UseOfMfc> <CharacterSet>MultiByte</CharacterSet> </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> + <ConfigurationType>DynamicLibrary</ConfigurationType> + <UseOfMfc>false</UseOfMfc> + <CharacterSet>MultiByte</CharacterSet> + </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> <UseOfMfc>false</UseOfMfc> <CharacterSet>MultiByte</CharacterSet> </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> + <ConfigurationType>DynamicLibrary</ConfigurationType> + <UseOfMfc>false</UseOfMfc> + <CharacterSet>MultiByte</CharacterSet> + </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <ImportGroup Label="ExtensionSettings"> </ImportGroup> @@ -33,10 +51,18 @@ <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|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> + <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> <PropertyGroup Label="UserMacros" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <OutDir>.\DebugDll\</OutDir> @@ -44,11 +70,22 @@ <LinkIncremental>true</LinkIncremental> <TargetName>cppunitd_dll</TargetName> </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <OutDir>.\DebugDll\</OutDir> + <IntDir>.\DebugDll\</IntDir> + <LinkIncremental>true</LinkIncremental> + <TargetName>cppunitd_dll</TargetName> + </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <OutDir>.\ReleaseDll\</OutDir> <IntDir>.\ReleaseDll\</IntDir> <LinkIncremental>false</LinkIncremental> </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <OutDir>.\ReleaseDll\</OutDir> + <IntDir>.\ReleaseDll\</IntDir> + <LinkIncremental>false</LinkIncremental> + </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> @@ -97,6 +134,52 @@ copy "$(TargetDir)$(TargetName).lib" ..\..\lib\$(TargetName).lib</Command> <AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <ClCompile> + <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> + <InlineFunctionExpansion>Default</InlineFunctionExpansion> + <FunctionLevelLinking>false</FunctionLevelLinking> + <Optimization>Disabled</Optimization> + <SuppressStartupBanner>true</SuppressStartupBanner> + <WarningLevel>Level3</WarningLevel> + <RuntimeTypeInfo>true</RuntimeTypeInfo> + <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;CPPUNIT_BUILD_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AssemblerListingLocation>.\DebugDll\</AssemblerListingLocation> + <PrecompiledHeaderOutputFile>.\DebugDll\cppunit_dll.pch</PrecompiledHeaderOutputFile> + <ObjectFileName>.\DebugDll\</ObjectFileName> + <ProgramDataBaseFileName>.\DebugDll\</ProgramDataBaseFileName> + <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> + </ClCompile> + <PostBuildEvent> + <Command>copy "$(TargetPath)" ..\..\lib\$(TargetName).dll +copy "$(TargetDir)$(TargetName).lib" ..\..\lib\$(TargetName).lib</Command> + <Message>Copying target to lib/</Message> + </PostBuildEvent> + <Midl> + <SuppressStartupBanner>true</SuppressStartupBanner> + <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <TypeLibraryName>.\DebugDll\cppunit_dll.tlb</TypeLibraryName> + <MkTypLibCompatible>true</MkTypLibCompatible> + </Midl> + <ResourceCompile> + <Culture>0x040c</Culture> + <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + </ResourceCompile> + <Bscmake> + <SuppressStartupBanner>true</SuppressStartupBanner> + <OutputFile>.\DebugDll\cppunit_dll.bsc</OutputFile> + </Bscmake> + <Link> + <SuppressStartupBanner>true</SuppressStartupBanner> + <LinkDLL>true</LinkDLL> + <GenerateDebugInformation>true</GenerateDebugInformation> + <SubSystem>Console</SubSystem> + <OutputFile>DebugDll\cppunitd_dll.dll</OutputFile> + <ImportLibrary>.\DebugDll\cppunitd_dll.lib</ImportLibrary> + <AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> + </Link> + </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ClCompile> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> @@ -144,6 +227,52 @@ copy "$(TargetDir)$(TargetName).lib" ..\..\lib\$(TargetName).lib</Command> <AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <ClCompile> + <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> + <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> + <StringPooling>true</StringPooling> + <FunctionLevelLinking>true</FunctionLevelLinking> + <Optimization>MaxSpeed</Optimization> + <SuppressStartupBanner>true</SuppressStartupBanner> + <WarningLevel>Level3</WarningLevel> + <RuntimeTypeInfo>true</RuntimeTypeInfo> + <DebugInformationFormat>OldStyle</DebugInformationFormat> + <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;CPPUNIT_BUILD_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AssemblerListingLocation>.\ReleaseDll\</AssemblerListingLocation> + <PrecompiledHeaderOutputFile>.\ReleaseDll\cppunit_dll.pch</PrecompiledHeaderOutputFile> + <ObjectFileName>.\ReleaseDll\</ObjectFileName> + <ProgramDataBaseFileName>.\ReleaseDll\</ProgramDataBaseFileName> + </ClCompile> + <PostBuildEvent> + <Command>copy "$(TargetPath)" ..\..\lib\$(TargetName).dll +copy "$(TargetDir)$(TargetName).lib" ..\..\lib\$(TargetName).lib</Command> + <Message>Copying target to lib/</Message> + </PostBuildEvent> + <Midl> + <SuppressStartupBanner>true</SuppressStartupBanner> + <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <TypeLibraryName>.\ReleaseDll\cppunit_dll.tlb</TypeLibraryName> + <MkTypLibCompatible>true</MkTypLibCompatible> + </Midl> + <ResourceCompile> + <Culture>0x040c</Culture> + <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + </ResourceCompile> + <Bscmake> + <SuppressStartupBanner>true</SuppressStartupBanner> + <OutputFile>.\ReleaseDll\cppunit_dll.bsc</OutputFile> + </Bscmake> + <Link> + <SuppressStartupBanner>true</SuppressStartupBanner> + <LinkDLL>true</LinkDLL> + <SubSystem>Console</SubSystem> + <OutputFile>.\ReleaseDll\cppunit_dll.dll</OutputFile> + <ImportLibrary>.\ReleaseDll\cppunit_dll.lib</ImportLibrary> + <AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> + </Link> + </ItemDefinitionGroup> <ItemGroup> <ClCompile Include="DllMain.cpp" /> <ClCompile Include="RepeatedTest.cpp" /> diff --git a/src/msvc6/testpluginrunner/TestPlugInRunner.vcxproj b/src/msvc6/testpluginrunner/TestPlugInRunner.vcxproj index 97955e8..91defd0 100644 --- a/src/msvc6/testpluginrunner/TestPlugInRunner.vcxproj +++ b/src/msvc6/testpluginrunner/TestPlugInRunner.vcxproj @@ -5,10 +5,18 @@ <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> </ItemGroup> <PropertyGroup Label="Globals"> <SccProjectName /> @@ -22,11 +30,21 @@ <UseOfMfc>Dynamic</UseOfMfc> <CharacterSet>MultiByte</CharacterSet> </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseOfMfc>Dynamic</UseOfMfc> + <CharacterSet>MultiByte</CharacterSet> + </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <UseOfMfc>Dynamic</UseOfMfc> <CharacterSet>MultiByte</CharacterSet> </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseOfMfc>Dynamic</UseOfMfc> + <CharacterSet>MultiByte</CharacterSet> + </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <ImportGroup Label="ExtensionSettings"> </ImportGroup> @@ -34,22 +52,41 @@ <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)'=='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)'=='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> <PropertyGroup Label="UserMacros" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <OutDir>.\Release\</OutDir> <IntDir>.\Release\</IntDir> <LinkIncremental>false</LinkIncremental> </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <OutDir>.\Release\</OutDir> + <IntDir>.\Release\</IntDir> + <LinkIncremental>false</LinkIncremental> + </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <OutDir>.\Debug\</OutDir> <IntDir>.\Debug\</IntDir> <LinkIncremental>false</LinkIncremental> <TargetName>$(ProjectName)d</TargetName> </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <OutDir>.\Debug\</OutDir> + <IntDir>.\Debug\</IntDir> + <LinkIncremental>false</LinkIncremental> + <TargetName>$(ProjectName)d</TargetName> + </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ClCompile> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> @@ -97,6 +134,52 @@ <AdditionalDependencies>cppunit_dll.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <ClCompile> + <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> + <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> + <StringPooling>true</StringPooling> + <FunctionLevelLinking>true</FunctionLevelLinking> + <Optimization>MaxSpeed</Optimization> + <SuppressStartupBanner>true</SuppressStartupBanner> + <WarningLevel>Level3</WarningLevel> + <RuntimeTypeInfo>true</RuntimeTypeInfo> + <DebugInformationFormat>OldStyle</DebugInformationFormat> + <AdditionalIncludeDirectories>../../include;../TestRunner;..\..\..\include;..\..\..\include\msvc6;..\TestRunner;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;CPPUNIT_SUBCLASSING_TESTRUNNERDLG_BUILD;CPPUNIT_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AssemblerListingLocation>.\Release\</AssemblerListingLocation> + <PrecompiledHeaderOutputFile>.\Release\TestPlugInRunner.pch</PrecompiledHeaderOutputFile> + <PrecompiledHeader>Use</PrecompiledHeader> + <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile> + <ObjectFileName>.\Release\</ObjectFileName> + <ProgramDataBaseFileName>.\Release\</ProgramDataBaseFileName> + </ClCompile> + <PostBuildEvent> + <Command>copy "$(TargetPath)" ..\..\..\lib\$(TargetName).exe</Command> + <Message>Copying target to lib/</Message> + </PostBuildEvent> + <Midl> + <SuppressStartupBanner>true</SuppressStartupBanner> + <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <TypeLibraryName>.\Release\TestPlugInRunner.tlb</TypeLibraryName> + <MkTypLibCompatible>true</MkTypLibCompatible> + </Midl> + <ResourceCompile> + <Culture>0x040c</Culture> + <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + </ResourceCompile> + <Bscmake> + <SuppressStartupBanner>true</SuppressStartupBanner> + <OutputFile>.\Release\TestPlugInRunner.bsc</OutputFile> + </Bscmake> + <Link> + <SuppressStartupBanner>true</SuppressStartupBanner> + <SubSystem>Windows</SubSystem> + <OutputFile>.\Release\TestPlugInRunner.exe</OutputFile> + <AdditionalLibraryDirectories>../../../lib/;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <AdditionalDependencies>cppunit_dll.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies> + </Link> + </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> @@ -145,6 +228,52 @@ <AdditionalDependencies>cppunitd_dll.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <ClCompile> + <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> + <InlineFunctionExpansion>Default</InlineFunctionExpansion> + <FunctionLevelLinking>false</FunctionLevelLinking> + <Optimization>Disabled</Optimization> + <SuppressStartupBanner>true</SuppressStartupBanner> + <WarningLevel>Level3</WarningLevel> + <RuntimeTypeInfo>true</RuntimeTypeInfo> + <AdditionalIncludeDirectories>..\..\..\include;..\..\..\include\msvc6;..\TestRunner;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>_DEBUG;CPPUNIT_TESTPLUGINRUNNER_BUILD;WIN32;_WINDOWS;CPPUNIT_SUBCLASSING_TESTRUNNERDLG_BUILD;CPPUNIT_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AssemblerListingLocation>.\Debug\</AssemblerListingLocation> + <PrecompiledHeaderOutputFile>.\Debug\TestPlugInRunner.pch</PrecompiledHeaderOutputFile> + <PrecompiledHeader>Use</PrecompiledHeader> + <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile> + <ObjectFileName>.\Debug\</ObjectFileName> + <ProgramDataBaseFileName>.\Debug\</ProgramDataBaseFileName> + <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> + </ClCompile> + <PostBuildEvent> + <Command>copy "$(TargetPath)" ..\..\..\lib\$(TargetName).exe</Command> + <Message>Copying target to lib/</Message> + </PostBuildEvent> + <Midl> + <SuppressStartupBanner>true</SuppressStartupBanner> + <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <TypeLibraryName>.\Debug\TestPlugInRunner.tlb</TypeLibraryName> + <MkTypLibCompatible>true</MkTypLibCompatible> + </Midl> + <ResourceCompile> + <Culture>0x040c</Culture> + <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + </ResourceCompile> + <Bscmake> + <SuppressStartupBanner>true</SuppressStartupBanner> + <OutputFile>.\Debug\TestPlugInRunner.bsc</OutputFile> + </Bscmake> + <Link> + <SuppressStartupBanner>true</SuppressStartupBanner> + <GenerateDebugInformation>true</GenerateDebugInformation> + <SubSystem>Windows</SubSystem> + <OutputFile>Debug/TestPlugInRunnerd.exe</OutputFile> + <AdditionalLibraryDirectories>../../../lib/;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <AdditionalDependencies>cppunitd_dll.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies> + </Link> + </ItemDefinitionGroup> <ItemGroup> <CustomBuild Include="res\errortype.bmp" /> <CustomBuild Include="res\ico00001.ico" /> @@ -161,26 +290,38 @@ <CustomBuild Include="..\..\..\lib\cppunit_dll.dll"> <FileType>Document</FileType> <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">copy %(FullPath) $(IntDir)%(Filename).dll</Command> + <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">copy %(FullPath) $(IntDir)%(Filename).dll</Command> <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Updating %(FullPath)</Message> + <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Updating %(FullPath)</Message> <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)\$(InputName).dll;%(Outputs)</Outputs> + <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)\$(InputName).dll;%(Outputs)</Outputs> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> </CustomBuild> <CustomBuild Include="..\..\..\lib\cppunitd_dll.dll"> <FileType>Document</FileType> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy %(FullPath) $(IntDir)%(Filename).dll</Command> + <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">copy %(FullPath) $(IntDir)%(Filename).dll</Command> <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Updating %(FullPath)</Message> + <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Updating %(FullPath)</Message> <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)\$(InputName).dll;%(Outputs)</Outputs> + <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)\$(InputName).dll;%(Outputs)</Outputs> </CustomBuild> <CustomBuild Include="..\..\..\lib\testrunner.dll"> <FileType>Document</FileType> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> </CustomBuild> <CustomBuild Include="..\..\..\lib\testrunnerd.dll"> <FileType>Document</FileType> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> </CustomBuild> <CustomBuild Include="ReadMe.txt" /> </ItemGroup> @@ -217,9 +358,13 @@ <ItemGroup> <ClCompile Include="StdAfx.cpp"> <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader> + <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader> <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">stdafx.h</PrecompiledHeaderFile> + <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">stdafx.h</PrecompiledHeaderFile> <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader> + <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader> <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">stdafx.h</PrecompiledHeaderFile> + <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">stdafx.h</PrecompiledHeaderFile> </ClCompile> <ClCompile Include="TestPlugInRunnerApp.cpp" /> <ClCompile Include="TestPlugInRunnerDlg.cpp" /> @@ -228,27 +373,37 @@ <ClCompile Include="TestPlugInRunnerModel.cpp" /> <ClCompile Include="..\testrunner\DynamicWindow\cdxCDynamicBar.cpp"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> </ClCompile> <ClCompile Include="..\testrunner\DynamicWindow\cdxCDynamicControlsManager.cpp"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> </ClCompile> <ClCompile Include="..\testrunner\DynamicWindow\cdxCDynamicDialog.cpp" /> <ClCompile Include="..\testrunner\DynamicWindow\cdxCDynamicFormView.cpp"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> </ClCompile> <ClCompile Include="..\testrunner\DynamicWindow\cdxCDynamicPropSheet.cpp"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> </ClCompile> <ClCompile Include="..\testrunner\DynamicWindow\cdxCDynamicWnd.cpp" /> <ClCompile Include="..\testrunner\DynamicWindow\cdxCDynamicWndEx.cpp" /> <ClCompile Include="..\testrunner\DynamicWindow\cdxCSizeIconCtrl.cpp" /> <ClCompile Include="..\testrunner\DynamicWindow\SizeCBar.cpp"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> </ClCompile> <ClCompile Include="..\testrunner\ListCtrlFormatter.cpp" /> <ClCompile Include="..\testrunner\ListCtrlSetter.cpp" /> @@ -263,8 +418,12 @@ <ClCompile Include="..\..\..\include\msvc6\DSPlugin\TestRunnerDSPluginVC6_i.c"> <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> </PrecompiledHeader> + <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + </PrecompiledHeader> <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> </PrecompiledHeader> + <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + </PrecompiledHeader> </ClCompile> </ItemGroup> <ItemGroup> diff --git a/src/msvc6/testrunner/TestRunner.vcxproj b/src/msvc6/testrunner/TestRunner.vcxproj index 6875ecc..320dc85 100644 --- a/src/msvc6/testrunner/TestRunner.vcxproj +++ b/src/msvc6/testrunner/TestRunner.vcxproj @@ -5,18 +5,34 @@ <Configuration>Debug Unicode</Configuration> <Platform>Win32</Platform> </ProjectConfiguration> + <ProjectConfiguration Include="Debug Unicode|x64"> + <Configuration>Debug Unicode</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> <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 Unicode|Win32"> <Configuration>Release Unicode</Configuration> <Platform>Win32</Platform> </ProjectConfiguration> + <ProjectConfiguration Include="Release Unicode|x64"> + <Configuration>Release Unicode</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> </ItemGroup> <PropertyGroup Label="Globals"> <SccProjectName /> @@ -29,20 +45,38 @@ <ConfigurationType>DynamicLibrary</ConfigurationType> <UseOfMfc>Dynamic</UseOfMfc> </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> + <ConfigurationType>DynamicLibrary</ConfigurationType> + <UseOfMfc>Dynamic</UseOfMfc> + </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|Win32'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> <UseOfMfc>Dynamic</UseOfMfc> <CharacterSet>Unicode</CharacterSet> </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|x64'" Label="Configuration"> + <ConfigurationType>DynamicLibrary</ConfigurationType> + <UseOfMfc>Dynamic</UseOfMfc> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Unicode|Win32'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> <UseOfMfc>Dynamic</UseOfMfc> <CharacterSet>Unicode</CharacterSet> </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Unicode|x64'" Label="Configuration"> + <ConfigurationType>DynamicLibrary</ConfigurationType> + <UseOfMfc>Dynamic</UseOfMfc> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> <UseOfMfc>Dynamic</UseOfMfc> </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> + <ConfigurationType>DynamicLibrary</ConfigurationType> + <UseOfMfc>Dynamic</UseOfMfc> + </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <ImportGroup Label="ExtensionSettings"> </ImportGroup> @@ -50,18 +84,34 @@ <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|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 Unicode|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 Unicode|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 Unicode|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)'=='Release Unicode|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> + <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> <PropertyGroup Label="UserMacros" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <OutDir>.\Debug\</OutDir> @@ -69,23 +119,46 @@ <LinkIncremental>false</LinkIncremental> <TargetName>testrunnerd</TargetName> </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <OutDir>.\Debug\</OutDir> + <IntDir>.\Debug\</IntDir> + <LinkIncremental>false</LinkIncremental> + <TargetName>testrunnerd</TargetName> + </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Unicode|Win32'"> <OutDir>.\ReleaseUnicode\</OutDir> <IntDir>.\ReleaseUnicode\</IntDir> <LinkIncremental>false</LinkIncremental> <TargetName>testrunneru</TargetName> </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Unicode|x64'"> + <OutDir>.\ReleaseUnicode\</OutDir> + <IntDir>.\ReleaseUnicode\</IntDir> + <LinkIncremental>false</LinkIncremental> + <TargetName>testrunneru</TargetName> + </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|Win32'"> <OutDir>.\DebugUnicode\</OutDir> <IntDir>.\DebugUnicode\</IntDir> <LinkIncremental>false</LinkIncremental> <TargetName>testrunnerud</TargetName> </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|x64'"> + <OutDir>.\DebugUnicode\</OutDir> + <IntDir>.\DebugUnicode\</IntDir> + <LinkIncremental>false</LinkIncremental> + <TargetName>testrunnerud</TargetName> + </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <OutDir>.\Release\</OutDir> <IntDir>.\Release\</IntDir> <LinkIncremental>false</LinkIncremental> </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <OutDir>.\Release\</OutDir> + <IntDir>.\Release\</IntDir> + <LinkIncremental>false</LinkIncremental> + </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> @@ -138,6 +211,56 @@ copy "$(TargetDir)$(TargetName).lib" ..\..\..\lib\$(TargetName).lib</Command> <AdditionalDependencies>..\..\..\lib\cppunitd.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <ClCompile> + <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> + <InlineFunctionExpansion>Default</InlineFunctionExpansion> + <FunctionLevelLinking>false</FunctionLevelLinking> + <Optimization>Disabled</Optimization> + <SuppressStartupBanner>true</SuppressStartupBanner> + <WarningLevel>Level3</WarningLevel> + <RuntimeTypeInfo>true</RuntimeTypeInfo> + <AdditionalIncludeDirectories>..\..\..\include;..\..\..\include\msvc6;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>_DEBUG;_AFXEXT;_WINDOWS;_WINDLL;WIN32;OEMRESOURCE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AssemblerListingLocation>.\Debug\</AssemblerListingLocation> + <BrowseInformation>true</BrowseInformation> + <PrecompiledHeaderOutputFile>.\Debug\TestRunner.pch</PrecompiledHeaderOutputFile> + <PrecompiledHeader>Use</PrecompiledHeader> + <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile> + <ObjectFileName>.\Debug\</ObjectFileName> + <ProgramDataBaseFileName>.\Debug\</ProgramDataBaseFileName> + </ClCompile> + <PostBuildEvent> + <Command>copy "$(TargetPath)" ..\..\..\lib\$(TargetName).dll +copy "$(TargetDir)$(TargetName).lib" ..\..\..\lib\$(TargetName).lib</Command> + <Message>Copying target to lib/</Message> + </PostBuildEvent> + <Midl> + <SuppressStartupBanner>true</SuppressStartupBanner> + <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <TypeLibraryName>.\Debug\TestRunner.tlb</TypeLibraryName> + <MkTypLibCompatible>true</MkTypLibCompatible> + <RedirectOutputAndErrors>NUL</RedirectOutputAndErrors> + </Midl> + <ResourceCompile> + <Culture>0x0409</Culture> + <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + </ResourceCompile> + <Bscmake> + <SuppressStartupBanner>true</SuppressStartupBanner> + <OutputFile>.\Debug\TestRunner.bsc</OutputFile> + </Bscmake> + <Link> + <SuppressStartupBanner>true</SuppressStartupBanner> + <LinkDLL>true</LinkDLL> + <GenerateDebugInformation>true</GenerateDebugInformation> + <SubSystem>Windows</SubSystem> + <ModuleDefinitionFile>.\TestRunner.def</ModuleDefinitionFile> + <OutputFile>Debug\testrunnerd.dll</OutputFile> + <ImportLibrary>.\Debug\testrunnerd.lib</ImportLibrary> + <AdditionalDependencies>..\..\..\lib\cppunitd.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies> + </Link> + </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Unicode|Win32'"> <ClCompile> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> @@ -189,6 +312,56 @@ copy "$(TargetDir)$(TargetName).lib" ..\..\..\lib\$(TargetName).lib</Command> <AdditionalDependencies>..\..\..\lib\cppunit.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Unicode|x64'"> + <ClCompile> + <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> + <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> + <StringPooling>true</StringPooling> + <FunctionLevelLinking>true</FunctionLevelLinking> + <Optimization>MaxSpeed</Optimization> + <SuppressStartupBanner>true</SuppressStartupBanner> + <WarningLevel>Level3</WarningLevel> + <RuntimeTypeInfo>true</RuntimeTypeInfo> + <DebugInformationFormat>OldStyle</DebugInformationFormat> + <AdditionalIncludeDirectories>..\..\..\include;..\..\..\include\msvc6;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>NDEBUG;_AFXEXT;_WINDOWS;_WINDLL;WIN32;OEMRESOURCE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AssemblerListingLocation>.\ReleaseUnicode\</AssemblerListingLocation> + <PrecompiledHeaderOutputFile>.\ReleaseUnicode\TestRunner.pch</PrecompiledHeaderOutputFile> + <PrecompiledHeader>Use</PrecompiledHeader> + <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile> + <ObjectFileName>.\ReleaseUnicode\</ObjectFileName> + <ProgramDataBaseFileName>.\ReleaseUnicode\</ProgramDataBaseFileName> + </ClCompile> + <PostBuildEvent> + <Command>copy "$(TargetPath)" ..\..\..\lib\$(TargetName).dll +copy "$(TargetDir)$(TargetName).lib" ..\..\..\lib\$(TargetName).lib</Command> + <Message>Copying target to lib/</Message> + </PostBuildEvent> + <Midl> + <SuppressStartupBanner>true</SuppressStartupBanner> + <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <TypeLibraryName>.\ReleaseUnicode\TestRunner.tlb</TypeLibraryName> + <MkTypLibCompatible>true</MkTypLibCompatible> + <RedirectOutputAndErrors>NUL</RedirectOutputAndErrors> + </Midl> + <ResourceCompile> + <Culture>0x0409</Culture> + <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + </ResourceCompile> + <Bscmake> + <SuppressStartupBanner>true</SuppressStartupBanner> + <OutputFile>.\ReleaseUnicode\TestRunner.bsc</OutputFile> + </Bscmake> + <Link> + <SuppressStartupBanner>true</SuppressStartupBanner> + <LinkDLL>true</LinkDLL> + <SubSystem>Windows</SubSystem> + <ModuleDefinitionFile>.\TestRunner.def</ModuleDefinitionFile> + <OutputFile>ReleaseUnicode\testrunneru.dll</OutputFile> + <ImportLibrary>.\ReleaseUnicode\testrunneru.lib</ImportLibrary> + <AdditionalDependencies>..\..\..\lib\cppunit.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies> + </Link> + </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|Win32'"> <ClCompile> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> @@ -241,6 +414,56 @@ copy "$(TargetDir)$(TargetName).lib" ..\..\..\lib\$(TargetName).lib</Command> <AdditionalDependencies>..\..\..\lib\cppunitd.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|x64'"> + <ClCompile> + <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> + <InlineFunctionExpansion>Default</InlineFunctionExpansion> + <FunctionLevelLinking>false</FunctionLevelLinking> + <Optimization>Disabled</Optimization> + <SuppressStartupBanner>true</SuppressStartupBanner> + <WarningLevel>Level3</WarningLevel> + <RuntimeTypeInfo>true</RuntimeTypeInfo> + <AdditionalIncludeDirectories>..\..\..\include;..\..\..\include\msvc6;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>_DEBUG;_AFXEXT;_WINDOWS;_WINDLL;WIN32;OEMRESOURCE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AssemblerListingLocation>.\DebugUnicode\</AssemblerListingLocation> + <BrowseInformation>true</BrowseInformation> + <PrecompiledHeaderOutputFile>.\DebugUnicode\TestRunner.pch</PrecompiledHeaderOutputFile> + <PrecompiledHeader>Use</PrecompiledHeader> + <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile> + <ObjectFileName>.\DebugUnicode\</ObjectFileName> + <ProgramDataBaseFileName>.\DebugUnicode\</ProgramDataBaseFileName> + </ClCompile> + <PostBuildEvent> + <Command>copy "$(TargetPath)" ..\..\..\lib\$(TargetName).dll +copy "$(TargetDir)$(TargetName).lib" ..\..\..\lib\$(TargetName).lib</Command> + <Message>Copying target to lib/</Message> + </PostBuildEvent> + <Midl> + <SuppressStartupBanner>true</SuppressStartupBanner> + <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <TypeLibraryName>.\DebugUnicode\TestRunner.tlb</TypeLibraryName> + <MkTypLibCompatible>true</MkTypLibCompatible> + <RedirectOutputAndErrors>NUL</RedirectOutputAndErrors> + </Midl> + <ResourceCompile> + <Culture>0x0409</Culture> + <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + </ResourceCompile> + <Bscmake> + <SuppressStartupBanner>true</SuppressStartupBanner> + <OutputFile>.\DebugUnicode\TestRunner.bsc</OutputFile> + </Bscmake> + <Link> + <SuppressStartupBanner>true</SuppressStartupBanner> + <LinkDLL>true</LinkDLL> + <GenerateDebugInformation>true</GenerateDebugInformation> + <SubSystem>Windows</SubSystem> + <ModuleDefinitionFile>.\TestRunner.def</ModuleDefinitionFile> + <OutputFile>DebugUnicode\testrunnerud.dll</OutputFile> + <ImportLibrary>.\DebugUnicode\testrunnerud.lib</ImportLibrary> + <AdditionalDependencies>..\..\..\lib\cppunitd.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies> + </Link> + </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ClCompile> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> @@ -292,6 +515,56 @@ copy "$(TargetDir)$(TargetName).lib" ..\..\..\lib\$(TargetName).lib</Command> <AdditionalDependencies>..\..\..\lib\cppunit.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <ClCompile> + <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> + <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> + <StringPooling>true</StringPooling> + <FunctionLevelLinking>true</FunctionLevelLinking> + <Optimization>MaxSpeed</Optimization> + <SuppressStartupBanner>true</SuppressStartupBanner> + <WarningLevel>Level3</WarningLevel> + <RuntimeTypeInfo>true</RuntimeTypeInfo> + <DebugInformationFormat>OldStyle</DebugInformationFormat> + <AdditionalIncludeDirectories>..\..\..\include;..\..\..\include\msvc6;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>NDEBUG;_AFXEXT;_WINDOWS;_WINDLL;WIN32;OEMRESOURCE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AssemblerListingLocation>.\Release\</AssemblerListingLocation> + <PrecompiledHeaderOutputFile>.\Release\TestRunner.pch</PrecompiledHeaderOutputFile> + <PrecompiledHeader>Use</PrecompiledHeader> + <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile> + <ObjectFileName>.\Release\</ObjectFileName> + <ProgramDataBaseFileName>.\Release\</ProgramDataBaseFileName> + </ClCompile> + <PostBuildEvent> + <Command>copy "$(TargetPath)" ..\..\..\lib\$(TargetName).dll +copy "$(TargetDir)$(TargetName).lib" ..\..\..\lib\$(TargetName).lib</Command> + <Message>Copying target to lib/</Message> + </PostBuildEvent> + <Midl> + <SuppressStartupBanner>true</SuppressStartupBanner> + <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <TypeLibraryName>.\Release\TestRunner.tlb</TypeLibraryName> + <MkTypLibCompatible>true</MkTypLibCompatible> + <RedirectOutputAndErrors>NUL</RedirectOutputAndErrors> + </Midl> + <ResourceCompile> + <Culture>0x0409</Culture> + <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + </ResourceCompile> + <Bscmake> + <SuppressStartupBanner>true</SuppressStartupBanner> + <OutputFile>.\Release\TestRunner.bsc</OutputFile> + </Bscmake> + <Link> + <SuppressStartupBanner>true</SuppressStartupBanner> + <LinkDLL>true</LinkDLL> + <SubSystem>Windows</SubSystem> + <ModuleDefinitionFile>.\TestRunner.def</ModuleDefinitionFile> + <OutputFile>.\Release\TestRunner.dll</OutputFile> + <ImportLibrary>.\Release\TestRunner.lib</ImportLibrary> + <AdditionalDependencies>..\..\..\lib\cppunit.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies> + </Link> + </ItemDefinitionGroup> <ItemGroup> <CustomBuild Include="res\errortype.bmp" /> <CustomBuild Include="res\test_type.bmp" /> @@ -301,46 +574,70 @@ copy "$(TargetDir)$(TargetName).lib" ..\..\..\lib\$(TargetName).lib</Command> <CustomBuild Include="res\tfwkui_r.bmp" /> <CustomBuild Include="TestRunner.def"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release Unicode|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release Unicode|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> </CustomBuild> <CustomBuild Include="ReadMe.txt" /> </ItemGroup> <ItemGroup> <ClCompile Include="DynamicWindow\cdxCDynamicBar.cpp"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release Unicode|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release Unicode|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> </ClCompile> <ClCompile Include="DynamicWindow\cdxCDynamicControlsManager.cpp"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release Unicode|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release Unicode|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> </ClCompile> <ClCompile Include="DynamicWindow\cdxCDynamicDialog.cpp" /> <ClCompile Include="DynamicWindow\cdxCDynamicFormView.cpp"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release Unicode|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release Unicode|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> </ClCompile> <ClCompile Include="DynamicWindow\cdxCDynamicPropSheet.cpp"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release Unicode|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release Unicode|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> </ClCompile> <ClCompile Include="DynamicWindow\cdxCDynamicWnd.cpp" /> <ClCompile Include="DynamicWindow\cdxCDynamicWndEx.cpp" /> <ClCompile Include="DynamicWindow\cdxCSizeIconCtrl.cpp" /> <ClCompile Include="DynamicWindow\SizeCBar.cpp"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release Unicode|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release Unicode|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> </ClCompile> <ClCompile Include="ListCtrlFormatter.cpp" /> <ClCompile Include="ListCtrlSetter.cpp" /> @@ -349,13 +646,21 @@ copy "$(TargetDir)$(TargetName).lib" ..\..\..\lib\$(TargetName).lib</Command> <ClCompile Include="ResourceLoaders.cpp" /> <ClCompile Include="StdAfx.cpp"> <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader> + <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader> <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">stdafx.h</PrecompiledHeaderFile> + <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">stdafx.h</PrecompiledHeaderFile> <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release Unicode|Win32'">Create</PrecompiledHeader> + <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release Unicode|x64'">Create</PrecompiledHeader> <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release Unicode|Win32'">stdafx.h</PrecompiledHeaderFile> + <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release Unicode|x64'">stdafx.h</PrecompiledHeaderFile> <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|Win32'">Create</PrecompiledHeader> + <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|x64'">Create</PrecompiledHeader> <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|Win32'">stdafx.h</PrecompiledHeaderFile> + <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|x64'">stdafx.h</PrecompiledHeaderFile> <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader> + <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader> <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">stdafx.h</PrecompiledHeaderFile> + <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">stdafx.h</PrecompiledHeaderFile> </ClCompile> <ClCompile Include="TestRunnerApp.cpp" /> <ClCompile Include="TestRunnerDlg.cpp" /> @@ -367,12 +672,20 @@ copy "$(TargetDir)$(TargetName).lib" ..\..\..\lib\$(TargetName).lib</Command> <ClCompile Include="..\..\..\include\msvc6\DSPlugin\TestRunnerDSPluginVC6_i.c"> <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> </PrecompiledHeader> + <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + </PrecompiledHeader> <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release Unicode|Win32'"> </PrecompiledHeader> + <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release Unicode|x64'"> + </PrecompiledHeader> <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|Win32'"> </PrecompiledHeader> + <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|x64'"> + </PrecompiledHeader> <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> </PrecompiledHeader> + <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + </PrecompiledHeader> </ClCompile> </ItemGroup> <ItemGroup> |