[Mobies-commit] [commit] r3861 - in UDM/trunk: Projects/Win32/VC10/tests Projects/Win32/VC10/tests/CreateLampDiagram Projects/Win32/VC10/tests/testGetAdjacentObjects Projects/Win32/VC10/tests/testOCL Projects/Win32/VC10/tests/testUdmCint Projects/Win32/VC10/tests/test_assocInheritanceMGA Projects/Win32/VC10/tests/test_childrenorder Projects/Win32/VC10/tests/test_cintstring Projects/Win32/VC10/tests/test_domstringdn Projects/Win32/VC10/tests/test_generic Projects/Win32/VC10/tests/test_libs Projects/Win32/VC10/tests/test_ns Projects/Win32/VC10/tests/test_ns2 Projects/Win32/VC10/tests/test_refports Projects/Win32/VC10/tests/test_simpleudmops Projects/Win32/VC10/tests/test_staticleaks Projects/Win32/VC10/tests/test_staticleaksdll tests/test_generic tests/test_libs tests/test_refports tests/test_staticleaks
ksmyth at redhat1.isis.vanderbilt.edu
ksmyth at redhat1.isis.vanderbilt.edu
Fri Aug 26 16:42:26 CDT 2011
Author: ksmyth
Date: Fri Aug 26 16:42:25 2011
New Revision: 3861
Log:
Test on x64
Modified:
UDM/trunk/Projects/Win32/VC10/tests/CreateLampDiagram/CreateLampDiagram.vcxproj
UDM/trunk/Projects/Win32/VC10/tests/UdmTests.props
UDM/trunk/Projects/Win32/VC10/tests/UdmTests.sln
UDM/trunk/Projects/Win32/VC10/tests/cppunit.props
UDM/trunk/Projects/Win32/VC10/tests/testGetAdjacentObjects/testGetAdjacentObjects.vcxproj
UDM/trunk/Projects/Win32/VC10/tests/testOCL/testOCL.vcxproj
UDM/trunk/Projects/Win32/VC10/tests/testUdmCint/testUdmCint.vcxproj
UDM/trunk/Projects/Win32/VC10/tests/test_assocInheritanceMGA/TestSignalFlow.vcxproj
UDM/trunk/Projects/Win32/VC10/tests/test_childrenorder/test_childrenorder.vcxproj
UDM/trunk/Projects/Win32/VC10/tests/test_cintstring/test_cintstring.vcxproj
UDM/trunk/Projects/Win32/VC10/tests/test_domstringdn/test_domstringdn.vcxproj
UDM/trunk/Projects/Win32/VC10/tests/test_generic/test_generic.vcxproj
UDM/trunk/Projects/Win32/VC10/tests/test_libs/test_libs.vcxproj
UDM/trunk/Projects/Win32/VC10/tests/test_ns/test_ns.vcxproj
UDM/trunk/Projects/Win32/VC10/tests/test_ns2/test_ns2.vcxproj
UDM/trunk/Projects/Win32/VC10/tests/test_refports/test_refports.vcxproj
UDM/trunk/Projects/Win32/VC10/tests/test_simpleudmops/LampTest.vcxproj
UDM/trunk/Projects/Win32/VC10/tests/test_staticleaks/test_staticleaks.vcxproj
UDM/trunk/Projects/Win32/VC10/tests/test_staticleaksdll/test_staticleaksdll.vcxproj
UDM/trunk/tests/test_generic/genericTest.h
UDM/trunk/tests/test_libs/LibsTest.h
UDM/trunk/tests/test_refports/RefPortsTest.h
UDM/trunk/tests/test_staticleaks/main.cpp
UDM/trunk/tests/test_staticleaks/test_staticleaks.cpp
Modified: UDM/trunk/Projects/Win32/VC10/tests/CreateLampDiagram/CreateLampDiagram.vcxproj
==============================================================================
--- UDM/trunk/Projects/Win32/VC10/tests/CreateLampDiagram/CreateLampDiagram.vcxproj Fri Aug 26 16:42:02 2011 (r3860)
+++ UDM/trunk/Projects/Win32/VC10/tests/CreateLampDiagram/CreateLampDiagram.vcxproj Fri Aug 26 16:42:25 2011 (r3861)
@@ -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">
<ProjectGuid>{3FB0A5A6-8815-45A3-8D68-777C708410FB}</ProjectGuid>
@@ -20,12 +28,23 @@
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>StaticLibrary</ConfigurationType>
+ <UseDebugLibraries>true</UseDebugLibraries>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>StaticLibrary</ConfigurationType>
+ <UseDebugLibraries>false</UseDebugLibraries>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
<Import Project="..\..\..\..\..\common-scripts\build_customization\udm.props" />
@@ -36,18 +55,34 @@
<Import Project="..\cppunit.props" />
<Import Project="..\UdmTests.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="..\cppunit.props" />
+ <Import Project="..\UdmTests.props" />
+ </ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="..\cppunit.props" />
<Import Project="..\UdmTests.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="..\cppunit.props" />
+ <Import Project="..\UdmTests.props" />
+ </ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<udm_RuleAfterTargets>mga2udmxml</udm_RuleAfterTargets>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <udm_RuleAfterTargets>mga2udmxml</udm_RuleAfterTargets>
+ </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<udm_RuleAfterTargets>mga2udmxml</udm_RuleAfterTargets>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <udm_RuleAfterTargets>mga2udmxml</udm_RuleAfterTargets>
+ </PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
@@ -60,6 +95,25 @@
<AdditionalDependencies>
</AdditionalDependencies>
</mga2udmxml>
+ <PreBuildEvent>
+ <Command>mkdir "$(OutDir)Gen\samples"</Command>
+ </PreBuildEvent>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <ClCompile>
+ <WarningLevel>Level3</WarningLevel>
+ <Optimization>Disabled</Optimization>
+ </ClCompile>
+ <Link>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ </Link>
+ <mga2udmxml>
+ <AdditionalDependencies>
+ </AdditionalDependencies>
+ </mga2udmxml>
+ <PreBuildEvent>
+ <Command>mkdir "$(OutDir)Gen\samples"</Command>
+ </PreBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
@@ -77,24 +131,57 @@
<AdditionalDependencies>
</AdditionalDependencies>
</mga2udmxml>
+ <PreBuildEvent>
+ <Command>mkdir "$(OutDir)Gen\samples"</Command>
+ </PreBuildEvent>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <ClCompile>
+ <WarningLevel>Level3</WarningLevel>
+ <Optimization>MaxSpeed</Optimization>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ </ClCompile>
+ <Link>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <OptimizeReferences>true</OptimizeReferences>
+ </Link>
+ <mga2udmxml>
+ <AdditionalDependencies>
+ </AdditionalDependencies>
+ </mga2udmxml>
+ <PreBuildEvent>
+ <Command>mkdir "$(OutDir)Gen\samples"</Command>
+ </PreBuildEvent>
</ItemDefinitionGroup>
<ItemGroup>
<mga2udmxml Include="..\..\..\..\..\samples\CreateLampModel\LampDiagramUML.xme">
<FileType>Document</FileType>
<MetaName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">LampDiagram</MetaName>
+ <MetaName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">LampDiagram</MetaName>
<AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
</AdditionalDependencies>
+ <AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ </AdditionalDependencies>
<MetaName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">LampDiagram</MetaName>
+ <MetaName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">LampDiagram</MetaName>
<AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
</AdditionalDependencies>
+ <AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ </AdditionalDependencies>
</mga2udmxml>
</ItemGroup>
<ItemGroup>
<udm Include="..\..\..\..\..\samples\CreateLampModel\LampDiagram_udm.xml">
<MetaName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">LampDiagram</MetaName>
+ <MetaName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">LampDiagram</MetaName>
<IntegrateXSD Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</IntegrateXSD>
+ <IntegrateXSD Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</IntegrateXSD>
<MetaName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">LampDiagram</MetaName>
+ <MetaName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">LampDiagram</MetaName>
<IntegrateXSD Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</IntegrateXSD>
+ <IntegrateXSD Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</IntegrateXSD>
</udm>
</ItemGroup>
<ItemGroup>
Modified: UDM/trunk/Projects/Win32/VC10/tests/UdmTests.props
==============================================================================
--- UDM/trunk/Projects/Win32/VC10/tests/UdmTests.props Fri Aug 26 16:42:02 2011 (r3860)
+++ UDM/trunk/Projects/Win32/VC10/tests/UdmTests.props Fri Aug 26 16:42:25 2011 (r3861)
@@ -3,8 +3,8 @@
<ImportGroup Label="PropertySheets" />
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
- <IntDir>$([System.IO.Path]::GetFullPath($(UDM_PATH)\Build\Win32\VC10\$(Configuration)\obj\tests\$(ProjectName)\))</IntDir>
- <OutDir>$([System.IO.Path]::GetFullPath($(UDM_PATH)\Build\Win32\VC10\$(Configuration)\))</OutDir>
+ <IntDir>$([System.IO.Path]::GetFullPath($(UDM_PATH)\Build\$(Platform)\VC10\$(Configuration)\obj\tests\$(ProjectName)\))</IntDir>
+ <OutDir>$([System.IO.Path]::GetFullPath($(UDM_PATH)\Build\$(Platform)\VC10\$(Configuration)\))</OutDir>
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
Modified: UDM/trunk/Projects/Win32/VC10/tests/UdmTests.sln
==============================================================================
--- UDM/trunk/Projects/Win32/VC10/tests/UdmTests.sln Fri Aug 26 16:42:02 2011 (r3860)
+++ UDM/trunk/Projects/Win32/VC10/tests/UdmTests.sln Fri Aug 26 16:42:25 2011 (r3861)
@@ -35,73 +35,139 @@
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
+ Debug|x64 = Debug|x64
Release|Win32 = Release|Win32
+ Release|x64 = Release|x64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{B3186C4B-EF81-4474-BDA7-AC44B4339C98}.Debug|Win32.ActiveCfg = Debug|Win32
{B3186C4B-EF81-4474-BDA7-AC44B4339C98}.Debug|Win32.Build.0 = Debug|Win32
+ {B3186C4B-EF81-4474-BDA7-AC44B4339C98}.Debug|x64.ActiveCfg = Debug|x64
+ {B3186C4B-EF81-4474-BDA7-AC44B4339C98}.Debug|x64.Build.0 = Debug|x64
{B3186C4B-EF81-4474-BDA7-AC44B4339C98}.Release|Win32.ActiveCfg = Release|Win32
{B3186C4B-EF81-4474-BDA7-AC44B4339C98}.Release|Win32.Build.0 = Release|Win32
+ {B3186C4B-EF81-4474-BDA7-AC44B4339C98}.Release|x64.ActiveCfg = Release|x64
+ {B3186C4B-EF81-4474-BDA7-AC44B4339C98}.Release|x64.Build.0 = Release|x64
{EFA8EF1E-C593-425D-AFAE-E3AE6B9AC546}.Debug|Win32.ActiveCfg = Debug|Win32
{EFA8EF1E-C593-425D-AFAE-E3AE6B9AC546}.Debug|Win32.Build.0 = Debug|Win32
+ {EFA8EF1E-C593-425D-AFAE-E3AE6B9AC546}.Debug|x64.ActiveCfg = Debug|x64
+ {EFA8EF1E-C593-425D-AFAE-E3AE6B9AC546}.Debug|x64.Build.0 = Debug|x64
{EFA8EF1E-C593-425D-AFAE-E3AE6B9AC546}.Release|Win32.ActiveCfg = Release|Win32
{EFA8EF1E-C593-425D-AFAE-E3AE6B9AC546}.Release|Win32.Build.0 = Release|Win32
+ {EFA8EF1E-C593-425D-AFAE-E3AE6B9AC546}.Release|x64.ActiveCfg = Release|x64
+ {EFA8EF1E-C593-425D-AFAE-E3AE6B9AC546}.Release|x64.Build.0 = Release|x64
{C4C77F9B-540F-4D02-A6E0-90F25740CA6C}.Debug|Win32.ActiveCfg = Debug|Win32
{C4C77F9B-540F-4D02-A6E0-90F25740CA6C}.Debug|Win32.Build.0 = Debug|Win32
+ {C4C77F9B-540F-4D02-A6E0-90F25740CA6C}.Debug|x64.ActiveCfg = Debug|x64
+ {C4C77F9B-540F-4D02-A6E0-90F25740CA6C}.Debug|x64.Build.0 = Debug|x64
{C4C77F9B-540F-4D02-A6E0-90F25740CA6C}.Release|Win32.ActiveCfg = Release|Win32
{C4C77F9B-540F-4D02-A6E0-90F25740CA6C}.Release|Win32.Build.0 = Release|Win32
+ {C4C77F9B-540F-4D02-A6E0-90F25740CA6C}.Release|x64.ActiveCfg = Release|x64
+ {C4C77F9B-540F-4D02-A6E0-90F25740CA6C}.Release|x64.Build.0 = Release|x64
{D38D6A95-8FAA-4437-88B5-BE24C6CB591A}.Debug|Win32.ActiveCfg = Debug|Win32
{D38D6A95-8FAA-4437-88B5-BE24C6CB591A}.Debug|Win32.Build.0 = Debug|Win32
+ {D38D6A95-8FAA-4437-88B5-BE24C6CB591A}.Debug|x64.ActiveCfg = Debug|x64
+ {D38D6A95-8FAA-4437-88B5-BE24C6CB591A}.Debug|x64.Build.0 = Debug|x64
{D38D6A95-8FAA-4437-88B5-BE24C6CB591A}.Release|Win32.ActiveCfg = Release|Win32
{D38D6A95-8FAA-4437-88B5-BE24C6CB591A}.Release|Win32.Build.0 = Release|Win32
+ {D38D6A95-8FAA-4437-88B5-BE24C6CB591A}.Release|x64.ActiveCfg = Release|x64
+ {D38D6A95-8FAA-4437-88B5-BE24C6CB591A}.Release|x64.Build.0 = Release|x64
{CCB8B735-7EBB-4A60-A7E7-B8EAF1B11232}.Debug|Win32.ActiveCfg = Debug|Win32
{CCB8B735-7EBB-4A60-A7E7-B8EAF1B11232}.Debug|Win32.Build.0 = Debug|Win32
+ {CCB8B735-7EBB-4A60-A7E7-B8EAF1B11232}.Debug|x64.ActiveCfg = Debug|x64
+ {CCB8B735-7EBB-4A60-A7E7-B8EAF1B11232}.Debug|x64.Build.0 = Debug|x64
{CCB8B735-7EBB-4A60-A7E7-B8EAF1B11232}.Release|Win32.ActiveCfg = Release|Win32
{CCB8B735-7EBB-4A60-A7E7-B8EAF1B11232}.Release|Win32.Build.0 = Release|Win32
+ {CCB8B735-7EBB-4A60-A7E7-B8EAF1B11232}.Release|x64.ActiveCfg = Release|x64
+ {CCB8B735-7EBB-4A60-A7E7-B8EAF1B11232}.Release|x64.Build.0 = Release|x64
{546D0AC9-934F-472D-B443-27FCF4AF2471}.Debug|Win32.ActiveCfg = Debug|Win32
{546D0AC9-934F-472D-B443-27FCF4AF2471}.Debug|Win32.Build.0 = Debug|Win32
+ {546D0AC9-934F-472D-B443-27FCF4AF2471}.Debug|x64.ActiveCfg = Debug|x64
+ {546D0AC9-934F-472D-B443-27FCF4AF2471}.Debug|x64.Build.0 = Debug|x64
{546D0AC9-934F-472D-B443-27FCF4AF2471}.Release|Win32.ActiveCfg = Release|Win32
{546D0AC9-934F-472D-B443-27FCF4AF2471}.Release|Win32.Build.0 = Release|Win32
+ {546D0AC9-934F-472D-B443-27FCF4AF2471}.Release|x64.ActiveCfg = Release|x64
+ {546D0AC9-934F-472D-B443-27FCF4AF2471}.Release|x64.Build.0 = Release|x64
{7724A08A-C9BC-4D56-8C93-21F35C583B5F}.Debug|Win32.ActiveCfg = Debug|Win32
{7724A08A-C9BC-4D56-8C93-21F35C583B5F}.Debug|Win32.Build.0 = Debug|Win32
+ {7724A08A-C9BC-4D56-8C93-21F35C583B5F}.Debug|x64.ActiveCfg = Debug|x64
+ {7724A08A-C9BC-4D56-8C93-21F35C583B5F}.Debug|x64.Build.0 = Debug|x64
{7724A08A-C9BC-4D56-8C93-21F35C583B5F}.Release|Win32.ActiveCfg = Release|Win32
{7724A08A-C9BC-4D56-8C93-21F35C583B5F}.Release|Win32.Build.0 = Release|Win32
+ {7724A08A-C9BC-4D56-8C93-21F35C583B5F}.Release|x64.ActiveCfg = Release|x64
+ {7724A08A-C9BC-4D56-8C93-21F35C583B5F}.Release|x64.Build.0 = Release|x64
{200FCF3E-FE47-45ED-B42C-E49BBC4C8A0B}.Debug|Win32.ActiveCfg = Debug|Win32
{200FCF3E-FE47-45ED-B42C-E49BBC4C8A0B}.Debug|Win32.Build.0 = Debug|Win32
+ {200FCF3E-FE47-45ED-B42C-E49BBC4C8A0B}.Debug|x64.ActiveCfg = Debug|x64
+ {200FCF3E-FE47-45ED-B42C-E49BBC4C8A0B}.Debug|x64.Build.0 = Debug|x64
{200FCF3E-FE47-45ED-B42C-E49BBC4C8A0B}.Release|Win32.ActiveCfg = Release|Win32
{200FCF3E-FE47-45ED-B42C-E49BBC4C8A0B}.Release|Win32.Build.0 = Release|Win32
+ {200FCF3E-FE47-45ED-B42C-E49BBC4C8A0B}.Release|x64.ActiveCfg = Release|x64
+ {200FCF3E-FE47-45ED-B42C-E49BBC4C8A0B}.Release|x64.Build.0 = Release|x64
{9FBA3BBE-2FAD-4E8A-B766-7067EC217617}.Debug|Win32.ActiveCfg = Debug|Win32
{9FBA3BBE-2FAD-4E8A-B766-7067EC217617}.Debug|Win32.Build.0 = Debug|Win32
+ {9FBA3BBE-2FAD-4E8A-B766-7067EC217617}.Debug|x64.ActiveCfg = Debug|x64
+ {9FBA3BBE-2FAD-4E8A-B766-7067EC217617}.Debug|x64.Build.0 = Debug|x64
{9FBA3BBE-2FAD-4E8A-B766-7067EC217617}.Release|Win32.ActiveCfg = Release|Win32
{9FBA3BBE-2FAD-4E8A-B766-7067EC217617}.Release|Win32.Build.0 = Release|Win32
+ {9FBA3BBE-2FAD-4E8A-B766-7067EC217617}.Release|x64.ActiveCfg = Release|x64
+ {9FBA3BBE-2FAD-4E8A-B766-7067EC217617}.Release|x64.Build.0 = Release|x64
{461D768D-AEE4-4011-9AAF-8DC70E292F5A}.Debug|Win32.ActiveCfg = Debug|Win32
{461D768D-AEE4-4011-9AAF-8DC70E292F5A}.Debug|Win32.Build.0 = Debug|Win32
+ {461D768D-AEE4-4011-9AAF-8DC70E292F5A}.Debug|x64.ActiveCfg = Debug|x64
+ {461D768D-AEE4-4011-9AAF-8DC70E292F5A}.Debug|x64.Build.0 = Debug|x64
{461D768D-AEE4-4011-9AAF-8DC70E292F5A}.Release|Win32.ActiveCfg = Release|Win32
{461D768D-AEE4-4011-9AAF-8DC70E292F5A}.Release|Win32.Build.0 = Release|Win32
+ {461D768D-AEE4-4011-9AAF-8DC70E292F5A}.Release|x64.ActiveCfg = Release|x64
+ {461D768D-AEE4-4011-9AAF-8DC70E292F5A}.Release|x64.Build.0 = Release|x64
{F2B871C3-36D2-4781-B82D-FC6C572A9290}.Debug|Win32.ActiveCfg = Debug|Win32
{F2B871C3-36D2-4781-B82D-FC6C572A9290}.Debug|Win32.Build.0 = Debug|Win32
+ {F2B871C3-36D2-4781-B82D-FC6C572A9290}.Debug|x64.ActiveCfg = Debug|x64
+ {F2B871C3-36D2-4781-B82D-FC6C572A9290}.Debug|x64.Build.0 = Debug|x64
{F2B871C3-36D2-4781-B82D-FC6C572A9290}.Release|Win32.ActiveCfg = Release|Win32
{F2B871C3-36D2-4781-B82D-FC6C572A9290}.Release|Win32.Build.0 = Release|Win32
+ {F2B871C3-36D2-4781-B82D-FC6C572A9290}.Release|x64.ActiveCfg = Release|x64
+ {F2B871C3-36D2-4781-B82D-FC6C572A9290}.Release|x64.Build.0 = Release|x64
{AB116304-9B33-45FE-BA7C-08F3A56844DE}.Debug|Win32.ActiveCfg = Debug|Win32
{AB116304-9B33-45FE-BA7C-08F3A56844DE}.Debug|Win32.Build.0 = Debug|Win32
+ {AB116304-9B33-45FE-BA7C-08F3A56844DE}.Debug|x64.ActiveCfg = Debug|x64
+ {AB116304-9B33-45FE-BA7C-08F3A56844DE}.Debug|x64.Build.0 = Debug|x64
{AB116304-9B33-45FE-BA7C-08F3A56844DE}.Release|Win32.ActiveCfg = Release|Win32
{AB116304-9B33-45FE-BA7C-08F3A56844DE}.Release|Win32.Build.0 = Release|Win32
+ {AB116304-9B33-45FE-BA7C-08F3A56844DE}.Release|x64.ActiveCfg = Release|x64
+ {AB116304-9B33-45FE-BA7C-08F3A56844DE}.Release|x64.Build.0 = Release|x64
{95B70B72-F65E-44F1-AF18-FCE1ED1B4FC7}.Debug|Win32.ActiveCfg = Debug|Win32
{95B70B72-F65E-44F1-AF18-FCE1ED1B4FC7}.Debug|Win32.Build.0 = Debug|Win32
+ {95B70B72-F65E-44F1-AF18-FCE1ED1B4FC7}.Debug|x64.ActiveCfg = Debug|x64
+ {95B70B72-F65E-44F1-AF18-FCE1ED1B4FC7}.Debug|x64.Build.0 = Debug|x64
{95B70B72-F65E-44F1-AF18-FCE1ED1B4FC7}.Release|Win32.ActiveCfg = Release|Win32
{95B70B72-F65E-44F1-AF18-FCE1ED1B4FC7}.Release|Win32.Build.0 = Release|Win32
+ {95B70B72-F65E-44F1-AF18-FCE1ED1B4FC7}.Release|x64.ActiveCfg = Release|x64
+ {95B70B72-F65E-44F1-AF18-FCE1ED1B4FC7}.Release|x64.Build.0 = Release|x64
{3FB0A5A6-8815-45A3-8D68-777C708410FB}.Debug|Win32.ActiveCfg = Debug|Win32
{3FB0A5A6-8815-45A3-8D68-777C708410FB}.Debug|Win32.Build.0 = Debug|Win32
+ {3FB0A5A6-8815-45A3-8D68-777C708410FB}.Debug|x64.ActiveCfg = Debug|x64
+ {3FB0A5A6-8815-45A3-8D68-777C708410FB}.Debug|x64.Build.0 = Debug|x64
{3FB0A5A6-8815-45A3-8D68-777C708410FB}.Release|Win32.ActiveCfg = Release|Win32
{3FB0A5A6-8815-45A3-8D68-777C708410FB}.Release|Win32.Build.0 = Release|Win32
+ {3FB0A5A6-8815-45A3-8D68-777C708410FB}.Release|x64.ActiveCfg = Release|x64
+ {3FB0A5A6-8815-45A3-8D68-777C708410FB}.Release|x64.Build.0 = Release|x64
{A4DE0E8A-C59B-4B1F-9A2A-775C547DFF39}.Debug|Win32.ActiveCfg = Debug|Win32
{A4DE0E8A-C59B-4B1F-9A2A-775C547DFF39}.Debug|Win32.Build.0 = Debug|Win32
+ {A4DE0E8A-C59B-4B1F-9A2A-775C547DFF39}.Debug|x64.ActiveCfg = Debug|x64
+ {A4DE0E8A-C59B-4B1F-9A2A-775C547DFF39}.Debug|x64.Build.0 = Debug|x64
{A4DE0E8A-C59B-4B1F-9A2A-775C547DFF39}.Release|Win32.ActiveCfg = Debug|Win32
{A4DE0E8A-C59B-4B1F-9A2A-775C547DFF39}.Release|Win32.Build.0 = Debug|Win32
+ {A4DE0E8A-C59B-4B1F-9A2A-775C547DFF39}.Release|x64.ActiveCfg = Debug|x64
+ {A4DE0E8A-C59B-4B1F-9A2A-775C547DFF39}.Release|x64.Build.0 = Debug|x64
{4F3BF916-A9BC-44BA-B867-BA14BE2EE074}.Debug|Win32.ActiveCfg = Debug|Win32
{4F3BF916-A9BC-44BA-B867-BA14BE2EE074}.Debug|Win32.Build.0 = Debug|Win32
+ {4F3BF916-A9BC-44BA-B867-BA14BE2EE074}.Debug|x64.ActiveCfg = Debug|x64
+ {4F3BF916-A9BC-44BA-B867-BA14BE2EE074}.Debug|x64.Build.0 = Debug|x64
{4F3BF916-A9BC-44BA-B867-BA14BE2EE074}.Release|Win32.ActiveCfg = Debug|Win32
{4F3BF916-A9BC-44BA-B867-BA14BE2EE074}.Release|Win32.Build.0 = Debug|Win32
+ {4F3BF916-A9BC-44BA-B867-BA14BE2EE074}.Release|x64.ActiveCfg = Debug|x64
+ {4F3BF916-A9BC-44BA-B867-BA14BE2EE074}.Release|x64.Build.0 = Debug|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Modified: UDM/trunk/Projects/Win32/VC10/tests/cppunit.props
==============================================================================
--- UDM/trunk/Projects/Win32/VC10/tests/cppunit.props Fri Aug 26 16:42:02 2011 (r3860)
+++ UDM/trunk/Projects/Win32/VC10/tests/cppunit.props Fri Aug 26 16:42:25 2011 (r3861)
@@ -4,7 +4,9 @@
<PropertyGroup Label="UserMacros">
<UDM_EXE>$(UDM_PATH)\bin\Udm.exe</UDM_EXE>
</PropertyGroup>
- <PropertyGroup />
+ <PropertyGroup>
+ <ExecutablePath>$(UDM_3RDPARTY_PATH)\cppunit-1.12.1\bin;$(ExecutablePath)</ExecutablePath>
+ </PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
<AdditionalIncludeDirectories>$(UDM_3RDPARTY_PATH)\cppunit-1.12.1\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
Modified: UDM/trunk/Projects/Win32/VC10/tests/testGetAdjacentObjects/testGetAdjacentObjects.vcxproj
==============================================================================
--- UDM/trunk/Projects/Win32/VC10/tests/testGetAdjacentObjects/testGetAdjacentObjects.vcxproj Fri Aug 26 16:42:02 2011 (r3860)
+++ UDM/trunk/Projects/Win32/VC10/tests/testGetAdjacentObjects/testGetAdjacentObjects.vcxproj Fri Aug 26 16:42:25 2011 (r3861)
@@ -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">
<ProjectGuid>{9FBA3BBE-2FAD-4E8A-B766-7067EC217617}</ProjectGuid>
@@ -20,10 +28,18 @@
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
@@ -31,21 +47,29 @@
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
<Import Project="..\cppunit.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')" />
+ <Import Project="..\cppunit.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')" />
<Import Project="..\cppunit.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')" />
+ <Import Project="..\cppunit.props" />
+ </ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.21006.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\..\..\Build\Win32\VC10\Debug\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)obj\tests\$(ProjectName)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\..\..\Build\Win32\VC10\Release\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)obj\tests\$(ProjectName)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectName)</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)D</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectName)D</TargetName>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<PreBuildEvent>
@@ -93,6 +117,50 @@
<Outputs>NONE</Outputs>
</CustomBuildStep>
</ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <PreBuildEvent>
+ <Message>Create directory for generated files</Message>
+ <Command>mkdir "$(OutDir)Gen\tests\testGetAdjacentObjects"
+exit 0
+</Command>
+ </PreBuildEvent>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>..\..\..\..\..\include;$(OutDir)Gen\tests\testGetAdjacentObjects;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>UDM_DYNAMIC_LINKING;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <WarningLevel>Level3</WarningLevel>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ </ClCompile>
+ <Link>
+ <AdditionalDependencies>cppunitd_dllx64.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(OutDir)testGetAdjacentObjects.pdb</ProgramDatabaseFile>
+ <SubSystem>Console</SubSystem>
+ <RandomizedBaseAddress>false</RandomizedBaseAddress>
+ <DataExecutionPrevention>
+ </DataExecutionPrevention>
+ </Link>
+ <PostBuildEvent>
+ <Command>
+ </Command>
+ </PostBuildEvent>
+ <CustomBuildStep>
+ <Command>cd "$(OutDir)Gen\tests\testGetAdjacentObjects"
+"$(TargetPath)"
+</Command>
+ </CustomBuildStep>
+ <CustomBuildStep>
+ <Message>Running $(TargetName)</Message>
+ </CustomBuildStep>
+ <CustomBuildStep>
+ <Outputs>NONE</Outputs>
+ </CustomBuildStep>
+ </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<PreBuildEvent>
<Message>Create directory for generated files</Message>
@@ -138,46 +206,102 @@
<Outputs>NONE</Outputs>
</CustomBuildStep>
</ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <PreBuildEvent>
+ <Message>Create directory for generated files</Message>
+ <Command>mkdir "$(OutDir)Gen\tests\testGetAdjacentObjects"
+exit 0
+</Command>
+ </PreBuildEvent>
+ <ClCompile>
+ <AdditionalIncludeDirectories>..\..\..\..\..\include;$(OutDir)Gen\tests\testGetAdjacentObjects;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>UDM_DYNAMIC_LINKING;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <WarningLevel>Level3</WarningLevel>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ </ClCompile>
+ <Link>
+ <AdditionalDependencies>cppunit.lib</AdditionalDependencies>
+ <OutputFile>$(OutDir)testGetAdjacentObjects.exe</OutputFile>
+ <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <SubSystem>Console</SubSystem>
+ <OptimizeReferences>true</OptimizeReferences>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <RandomizedBaseAddress>false</RandomizedBaseAddress>
+ <DataExecutionPrevention>
+ </DataExecutionPrevention>
+ </Link>
+ <PostBuildEvent>
+ <Command>
+ </Command>
+ </PostBuildEvent>
+ <CustomBuildStep>
+ <Command>cd "$(OutDir)Gen\tests\testGetAdjacentObjects"
+"$(TargetPath)"
+</Command>
+ </CustomBuildStep>
+ <CustomBuildStep>
+ <Message>Running $(TargetName)</Message>
+ </CustomBuildStep>
+ <CustomBuildStep>
+ <Outputs>NONE</Outputs>
+ </CustomBuildStep>
+ </ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\..\..\..\..\tests\testGetAdjacentObjects\main.cpp" />
<ClCompile Include="..\..\..\..\..\Build\Win32\VC10\Release\Gen\tests\testGetAdjacentObjects\PackageA.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\..\Build\Win32\VC10\Debug\Gen\tests\testGetAdjacentObjects\PackageA.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\..\Build\Win32\VC10\Release\Gen\tests\testGetAdjacentObjects\PackageB.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\..\Build\Win32\VC10\Debug\Gen\tests\testGetAdjacentObjects\PackageB.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\..\Build\Win32\VC10\Release\Gen\tests\testGetAdjacentObjects\testAssociationScenarios.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\..\Build\Win32\VC10\Debug\Gen\tests\testGetAdjacentObjects\testAssociationScenarios.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\..\tests\testGetAdjacentObjects\TestGetAdjacentObjects.cpp" />
</ItemGroup>
<ItemGroup>
<CustomBuild Include="..\..\..\..\..\Build\Win32\VC10\Release\Gen\tests\testGetAdjacentObjects\PackageA.h">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
</CustomBuild>
<CustomBuild Include="..\..\..\..\..\Build\Win32\VC10\Debug\Gen\tests\testGetAdjacentObjects\PackageA.h">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</CustomBuild>
<CustomBuild Include="..\..\..\..\..\Build\Win32\VC10\Release\Gen\tests\testGetAdjacentObjects\PackageB.h">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
</CustomBuild>
<CustomBuild Include="..\..\..\..\..\Build\Win32\VC10\Debug\Gen\tests\testGetAdjacentObjects\PackageB.h">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</CustomBuild>
<CustomBuild Include="..\..\..\..\..\Build\Win32\VC10\Release\Gen\tests\testGetAdjacentObjects\testAssociationScenarios.h">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
</CustomBuild>
<CustomBuild Include="..\..\..\..\..\Build\Win32\VC10\Debug\Gen\tests\testGetAdjacentObjects\testAssociationScenarios.h">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</CustomBuild>
<ClInclude Include="..\..\..\..\..\tests\testGetAdjacentObjects\testGetAdjacentObjects.h" />
</ItemGroup>
@@ -185,33 +309,55 @@
<CustomBuild Include="..\..\..\..\..\tests\testGetAdjacentObjects\testAssociationScenarios.xme">
<FileType>Document</FileType>
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Converting %(FullPath) to $(OutDir)Gen\tests\testGetAdjacentObjects\%(FileName)_udm.udm</Message>
+ <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Converting %(FullPath) to $(OutDir)Gen\tests\testGetAdjacentObjects\%(FileName)_udm.udm</Message>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">cd "$(TargetDir)\Gen\tests\testGetAdjacentObjects"
"$(UDM_PATH)\etc\Xme2UdmXml" "%(FullPath)" "%(FileName).mga"
</Command>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">cd "$(TargetDir)\Gen\tests\testGetAdjacentObjects"
+"$(UDM_PATH)\etc\Xme2UdmXml" "%(FullPath)" "%(FileName).mga"
+</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)Gen\tests\testGetAdjacentObjects\%(FileName).mga;$(OutDir)Gen\tests\testGetAdjacentObjects\%(FileName)_udm.udm;%(Outputs)</Outputs>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)Gen\tests\testGetAdjacentObjects\%(FileName).mga;$(OutDir)Gen\tests\testGetAdjacentObjects\%(FileName)_udm.udm;%(Outputs)</Outputs>
<Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Converting %(FullPath) to $(OutDir)Gen\tests\testGetAdjacentObjects\%(FileName)_udm.udm</Message>
+ <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Converting %(FullPath) to $(OutDir)Gen\tests\testGetAdjacentObjects\%(FileName)_udm.udm</Message>
<Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">cd "$(TargetDir)\Gen\tests\testGetAdjacentObjects"
"$(UDM_PATH)\etc\Xme2UdmXml" "%(FullPath)" "%(FileName).mga"
</Command>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">cd "$(TargetDir)\Gen\tests\testGetAdjacentObjects"
+"$(UDM_PATH)\etc\Xme2UdmXml" "%(FullPath)" "%(FileName).mga"
+</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)Gen\tests\testGetAdjacentObjects\%(FileName).mga;$(OutDir)Gen\tests\testGetAdjacentObjects\%(FileName)_udm.udm;%(Outputs)</Outputs>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)Gen\tests\testGetAdjacentObjects\%(FileName).mga;$(OutDir)Gen\tests\testGetAdjacentObjects\%(FileName)_udm.udm;%(Outputs)</Outputs>
</CustomBuild>
<CustomBuild Include="..\..\..\..\..\Build\Win32\VC10\Release\Gen\tests\testGetAdjacentObjects\testAssociationScenarios_udm.udm">
<FileType>Document</FileType>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Generating UDM API files...</Message>
+ <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Generating UDM API files...</Message>
<Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">"$(OutDir)udm.exe" -o "$(OutDir)Gen\tests\testGetAdjacentObjects" %(FullPath)
</Command>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(OutDir)udm.exe" -o "$(OutDir)Gen\tests\testGetAdjacentObjects" %(FullPath)
+</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)Gen\tests\testGetAdjacentObjects\PackageA.cpp;$(OutDir)Gen\tests\testGetAdjacentObjects\PackageA.h;$(OutDir)Gen\tests\testGetAdjacentObjects\PackageA.xsd;$(OutDir)Gen\tests\testGetAdjacentObjects\PackageB.cpp;$(OutDir)Gen\tests\testGetAdjacentObjects\PackageB.h;$(OutDir)Gen\tests\testGetAdjacentObjects\PackageB.xsd;$(OutDir)Gen\tests\testGetAdjacentObjects\testAssociationScenarios.cpp;$(OutDir)Gen\tests\testGetAdjacentObjects\testAssociationScenarios.h;$(OutDir)Gen\tests\testGetAdjacentObjects\testAssociationScenarios.xsd;%(Outputs)</Outputs>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)Gen\tests\testGetAdjacentObjects\PackageA.cpp;$(OutDir)Gen\tests\testGetAdjacentObjects\PackageA.h;$(OutDir)Gen\tests\testGetAdjacentObjects\PackageA.xsd;$(OutDir)Gen\tests\testGetAdjacentObjects\PackageB.cpp;$(OutDir)Gen\tests\testGetAdjacentObjects\PackageB.h;$(OutDir)Gen\tests\testGetAdjacentObjects\PackageB.xsd;$(OutDir)Gen\tests\testGetAdjacentObjects\testAssociationScenarios.cpp;$(OutDir)Gen\tests\testGetAdjacentObjects\testAssociationScenarios.h;$(OutDir)Gen\tests\testGetAdjacentObjects\testAssociationScenarios.xsd;%(Outputs)</Outputs>
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)Udm.exe</AdditionalInputs>
+ <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)Udm.exe</AdditionalInputs>
</CustomBuild>
<CustomBuild Include="..\..\..\..\..\Build\Win32\VC10\Debug\Gen\tests\testGetAdjacentObjects\testAssociationScenarios_udm.udm">
<FileType>Document</FileType>
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating UDM API files...</Message>
+ <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Generating UDM API files...</Message>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(OutDir)udmD.exe" -o "$(OutDir)Gen\tests\testGetAdjacentObjects" %(FullPath)
</Command>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(OutDir)udmD.exe" -o "$(OutDir)Gen\tests\testGetAdjacentObjects" %(FullPath)
+</Command>
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)UdmD.exe</AdditionalInputs>
+ <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)UdmD.exe</AdditionalInputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)Gen\tests\testGetAdjacentObjects\PackageA.cpp;$(OutDir)Gen\tests\testGetAdjacentObjects\PackageA.h;$(OutDir)Gen\tests\testGetAdjacentObjects\PackageA.xsd;$(OutDir)Gen\tests\testGetAdjacentObjects\PackageB.cpp;$(OutDir)Gen\tests\testGetAdjacentObjects\PackageB.h;$(OutDir)Gen\tests\testGetAdjacentObjects\PackageB.xsd;$(OutDir)Gen\tests\testGetAdjacentObjects\testAssociationScenarios.cpp;$(OutDir)Gen\tests\testGetAdjacentObjects\testAssociationScenarios.h;$(OutDir)Gen\tests\testGetAdjacentObjects\testAssociationScenarios.xsd;%(Outputs)</Outputs>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)Gen\tests\testGetAdjacentObjects\PackageA.cpp;$(OutDir)Gen\tests\testGetAdjacentObjects\PackageA.h;$(OutDir)Gen\tests\testGetAdjacentObjects\PackageA.xsd;$(OutDir)Gen\tests\testGetAdjacentObjects\PackageB.cpp;$(OutDir)Gen\tests\testGetAdjacentObjects\PackageB.h;$(OutDir)Gen\tests\testGetAdjacentObjects\PackageB.xsd;$(OutDir)Gen\tests\testGetAdjacentObjects\testAssociationScenarios.cpp;$(OutDir)Gen\tests\testGetAdjacentObjects\testAssociationScenarios.h;$(OutDir)Gen\tests\testGetAdjacentObjects\testAssociationScenarios.xsd;%(Outputs)</Outputs>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</CustomBuild>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
Modified: UDM/trunk/Projects/Win32/VC10/tests/testOCL/testOCL.vcxproj
==============================================================================
--- UDM/trunk/Projects/Win32/VC10/tests/testOCL/testOCL.vcxproj Fri Aug 26 16:42:02 2011 (r3860)
+++ UDM/trunk/Projects/Win32/VC10/tests/testOCL/testOCL.vcxproj Fri Aug 26 16:42:25 2011 (r3861)
@@ -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">
<ProjectGuid>{461D768D-AEE4-4011-9AAF-8DC70E292F5A}</ProjectGuid>
@@ -20,10 +28,18 @@
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
@@ -32,22 +48,32 @@
<Import Project="..\cppunit.props" />
<Import Project="..\UdmTests.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')" />
+ <Import Project="..\cppunit.props" />
+ <Import Project="..\UdmTests.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')" />
<Import Project="..\cppunit.props" />
<Import Project="..\UdmTests.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')" />
+ <Import Project="..\cppunit.props" />
+ <Import Project="..\UdmTests.props" />
+ </ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.21006.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\..\..\Build\Win32\VC10\Debug\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)obj\tests\$(ProjectName)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\..\..\Build\Win32\VC10\Release\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)obj\tests\$(ProjectName)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectName)</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)D</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectName)D</TargetName>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<PreBuildEvent>
@@ -85,6 +111,40 @@
</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <PreBuildEvent>
+ <Message>Create directory for generated files</Message>
+ <Command>mkdir "$(OutDir)Gen\tests\testOCL"
+exit 0
+</Command>
+ </PreBuildEvent>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>..\..\..\..\..\include;$(OutDir)Gen\tests\testOCL;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;UDM_DYNAMIC_LINKING;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <WarningLevel>Level3</WarningLevel>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ </ClCompile>
+ <Link>
+ <AdditionalDependencies>cppunitd_dllx64.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(OutDir)testOCL.pdb</ProgramDatabaseFile>
+ <SubSystem>Console</SubSystem>
+ <RandomizedBaseAddress>false</RandomizedBaseAddress>
+ <DataExecutionPrevention>
+ </DataExecutionPrevention>
+ </Link>
+ <PostBuildEvent>
+ <Command>cd $(SolutionDir)..\..\..\..\tests\testOCL
+"$(TargetPath)"
+</Command>
+ </PostBuildEvent>
+ </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<PreBuildEvent>
<Message>Create directory for generated files</Message>
@@ -120,50 +180,106 @@
</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <PreBuildEvent>
+ <Message>Create directory for generated files</Message>
+ <Command>mkdir "$(OutDir)Gen\tests\testOCL"
+exit 0
+</Command>
+ </PreBuildEvent>
+ <ClCompile>
+ <AdditionalIncludeDirectories>..\..\..\..\..\include;$(OutDir)Gen\tests\testOCL;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;UDM_DYNAMIC_LINKING;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <WarningLevel>Level3</WarningLevel>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ </ClCompile>
+ <Link>
+ <AdditionalDependencies>cppunit.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)testOCL.exe</OutputFile>
+ <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <SubSystem>Console</SubSystem>
+ <OptimizeReferences>true</OptimizeReferences>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <RandomizedBaseAddress>false</RandomizedBaseAddress>
+ <DataExecutionPrevention>
+ </DataExecutionPrevention>
+ </Link>
+ <PostBuildEvent>
+ <Command>cd $(SolutionDir)..\..\..\..\tests\testOCL
+"$(TargetPath)"
+</Command>
+ </PostBuildEvent>
+ </ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\..\..\..\..\tests\testOCL\main.cpp" />
<ClCompile Include="..\..\..\..\..\Build\Win32\VC10\Release\Gen\tests\testOCL\SBML2.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\..\Build\Win32\VC10\Debug\Gen\tests\testOCL\SBML2.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\..\tests\testOCL\Test.cpp" />
</ItemGroup>
<ItemGroup>
<CustomBuild Include="..\..\..\..\..\Build\Win32\VC10\Release\Gen\tests\testOCL\SBML2.h">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
</CustomBuild>
<CustomBuild Include="..\..\..\..\..\Build\Win32\VC10\Debug\Gen\tests\testOCL\SBML2.h">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</CustomBuild>
<ClInclude Include="..\..\..\..\..\tests\testOCL\Test.h" />
</ItemGroup>
<ItemGroup>
<CustomBuild Include="..\..\..\..\..\Build\Win32\VC10\Release\Gen\tests\testOCL\SBML2_udm.xml">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">"$(OutDir)Udm.exe" -o "$(OutDir)Gen\tests\testOCL" "%(FullPath)" -t -v -u math=http://www.w3.org/1998/Math/MathML -u sbml=http://www.sbml.org/sbml/level2 -g
</Command>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(OutDir)Udm.exe" -o "$(OutDir)Gen\tests\testOCL" "%(FullPath)" -t -v -u math=http://www.w3.org/1998/Math/MathML -u sbml=http://www.sbml.org/sbml/level2 -g
+</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)Gen\tests\testOCL\SBML2.cpp;$(OutDir)Gen\tests\testOCL\SBML2.h;$(OutDir)Gen\tests\testOCL\SBML2.dtd;$(OutDir)Gen\tests\testOCL\SBML2.xsd;$(OutDir)Gen\tests\testOCL\SBML2_xsd.h;$(OutDir)Gen\tests\testOCL\SBML2_math.dtd;$(OutDir)Gen\tests\testOCL\SBML2_math.xsd;$(OutDir)Gen\tests\testOCL\SBML2_math_xsd.h;$(OutDir)Gen\tests\testOCL\SBML2_sbml.dtd;$(OutDir)Gen\tests\testOCL\SBML2_sbml.xsd;$(OutDir)Gen\tests\testOCL\SBML2_sbml_xsd.h;%(Outputs)</Outputs>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)Gen\tests\testOCL\SBML2.cpp;$(OutDir)Gen\tests\testOCL\SBML2.h;$(OutDir)Gen\tests\testOCL\SBML2.dtd;$(OutDir)Gen\tests\testOCL\SBML2.xsd;$(OutDir)Gen\tests\testOCL\SBML2_xsd.h;$(OutDir)Gen\tests\testOCL\SBML2_math.dtd;$(OutDir)Gen\tests\testOCL\SBML2_math.xsd;$(OutDir)Gen\tests\testOCL\SBML2_math_xsd.h;$(OutDir)Gen\tests\testOCL\SBML2_sbml.dtd;$(OutDir)Gen\tests\testOCL\SBML2_sbml.xsd;$(OutDir)Gen\tests\testOCL\SBML2_sbml_xsd.h;%(Outputs)</Outputs>
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)Udm.exe</AdditionalInputs>
+ <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)Udm.exe</AdditionalInputs>
</CustomBuild>
<CustomBuild Include="..\..\..\..\..\Build\Win32\VC10\Debug\Gen\tests\testOCL\SBML2_udm.xml">
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(OutDir)UdmD.exe" -o "$(OutDir)Gen\tests\testOCL" %(FullPath) -t -v -u math=http://www.w3.org/1998/Math/MathML -u sbml=http://www.sbml.org/sbml/level2 -g
</Command>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(OutDir)UdmD.exe" -o "$(OutDir)Gen\tests\testOCL" %(FullPath) -t -v -u math=http://www.w3.org/1998/Math/MathML -u sbml=http://www.sbml.org/sbml/level2 -g
+</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)Gen\tests\testOCL\SBML2.cpp;$(OutDir)Gen\tests\testOCL\SBML2.h;$(OutDir)Gen\tests\testOCL\SBML2.dtd;$(OutDir)Gen\tests\testOCL\SBML2.xsd;$(OutDir)Gen\tests\testOCL\SBML2_xsd.h;$(OutDir)Gen\tests\testOCL\SBML2_math.dtd;$(OutDir)Gen\tests\testOCL\SBML2_math.xsd;$(OutDir)Gen\tests\testOCL\SBML2_math_xsd.h;$(OutDir)Gen\tests\testOCL\SBML2_sbml.dtd;$(OutDir)Gen\tests\testOCL\SBML2_sbml.xsd;$(OutDir)Gen\tests\testOCL\SBML2_sbml_xsd.h;%(Outputs)</Outputs>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)Gen\tests\testOCL\SBML2.cpp;$(OutDir)Gen\tests\testOCL\SBML2.h;$(OutDir)Gen\tests\testOCL\SBML2.dtd;$(OutDir)Gen\tests\testOCL\SBML2.xsd;$(OutDir)Gen\tests\testOCL\SBML2_xsd.h;$(OutDir)Gen\tests\testOCL\SBML2_math.dtd;$(OutDir)Gen\tests\testOCL\SBML2_math.xsd;$(OutDir)Gen\tests\testOCL\SBML2_math_xsd.h;$(OutDir)Gen\tests\testOCL\SBML2_sbml.dtd;$(OutDir)Gen\tests\testOCL\SBML2_sbml.xsd;$(OutDir)Gen\tests\testOCL\SBML2_sbml_xsd.h;%(Outputs)</Outputs>
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)UdmD.exe</AdditionalInputs>
+ <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)UdmD.exe</AdditionalInputs>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</CustomBuild>
<CustomBuild Include="..\..\..\..\..\tests\testOCL\SBML2_uml.xme">
<FileType>Document</FileType>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">cd "$(TargetDir)\Gen\tests\testOCL"
"$(UDM_PATH)\etc\xme2udmxml" "%(FullPath)" "%(FileName).mga"
</Command>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">cd "$(TargetDir)\Gen\tests\testOCL"
+"$(UDM_PATH)\etc\xme2udmxml" "%(FullPath)" "%(FileName).mga"
+</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)Gen\tests\testOCL\%(FileName).mga;$(OutDir)Gen\tests\testOCL\SBML2_udm.xml;%(Outputs)</Outputs>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)Gen\tests\testOCL\%(FileName).mga;$(OutDir)Gen\tests\testOCL\SBML2_udm.xml;%(Outputs)</Outputs>
<Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">cd "$(TargetDir)\Gen\tests\testOCL"
"$(UDM_PATH)\etc\xme2udmxml" "%(FullPath)" "%(FileName).mga"
</Command>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">cd "$(TargetDir)\Gen\tests\testOCL"
+"$(UDM_PATH)\etc\xme2udmxml" "%(FullPath)" "%(FileName).mga"
+</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)Gen\tests\testOCL\%(FileName).mga;$(OutDir)Gen\tests\testOCL\SBML2_udm.xml;%(Outputs)</Outputs>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)Gen\tests\testOCL\%(FileName).mga;$(OutDir)Gen\tests\testOCL\SBML2_udm.xml;%(Outputs)</Outputs>
</CustomBuild>
<None Include="..\..\..\..\..\tests\testOCL\versionCheck.xml" />
</ItemGroup>
Modified: UDM/trunk/Projects/Win32/VC10/tests/testUdmCint/testUdmCint.vcxproj
==============================================================================
--- UDM/trunk/Projects/Win32/VC10/tests/testUdmCint/testUdmCint.vcxproj Fri Aug 26 16:42:02 2011 (r3860)
+++ UDM/trunk/Projects/Win32/VC10/tests/testUdmCint/testUdmCint.vcxproj Fri Aug 26 16:42:25 2011 (r3861)
@@ -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">
<ProjectGuid>{F2B871C3-36D2-4781-B82D-FC6C572A9290}</ProjectGuid>
@@ -21,11 +29,21 @@
<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>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<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>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
@@ -37,6 +55,14 @@
<Import Project="..\..\src\zlib.props" />
<Import Project="..\UdmTests.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')" />
+ <Import Project="..\cppunit.props" />
+ <Import Project="..\..\src\Xalan-c.props" />
+ <Import Project="..\..\src\Xerces-c.props" />
+ <Import Project="..\..\src\zlib.props" />
+ <Import Project="..\UdmTests.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')" />
<Import Project="..\cppunit.props" />
@@ -45,17 +71,25 @@
<Import Project="..\..\src\zlib.props" />
<Import Project="..\UdmTests.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')" />
+ <Import Project="..\cppunit.props" />
+ <Import Project="..\..\src\Xalan-c.props" />
+ <Import Project="..\..\src\Xerces-c.props" />
+ <Import Project="..\..\src\zlib.props" />
+ <Import Project="..\UdmTests.props" />
+ </ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.21006.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\..\..\Build\Win32\VC10\Debug\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)obj\tests\$(ProjectName)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)..\..\..\..\Build\Win32\VC10\Release\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)obj\tests\$(ProjectName)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkIncremental>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectName)</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)D</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectName)D</TargetName>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<PreBuildEvent>
@@ -106,6 +140,54 @@
"$(TargetPath)"</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <PreBuildEvent>
+ <Message>Create directory for generated files</Message>
+ <Command>mkdir "$(OutDir)Gen\tests\testUdmCint"
+exit 0
+</Command>
+ </PreBuildEvent>
+ <Midl>
+ <TypeLibraryName>$(IntDir)testUdmCint.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>..\..\..\..\..\include;$(OutDir)Gen\tests\testUdmCint;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeaderOutputFile>$(IntDir)testUdmCint.pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ <CompileAs>Default</CompileAs>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x0409</Culture>
+ </ResourceCompile>
+ <Link>
+ <AdditionalDependencies>cppunitd_dllx64.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(IntDir)testUdmCint.pdb</ProgramDatabaseFile>
+ <SubSystem>Console</SubSystem>
+ <RandomizedBaseAddress>false</RandomizedBaseAddress>
+ <DataExecutionPrevention>
+ </DataExecutionPrevention>
+ </Link>
+ <PostBuildEvent>
+ <Command>xcopy /y ..\..\..\..\..\tests\testUdmCint\*.xml "$(OutDir)Gen\tests\testUdmCint"
+cd "$(OutDir)Gen\tests\testUdmCint"
+"$(TargetPath)"</Command>
+ </PostBuildEvent>
+ </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<PreBuildEvent>
<Message>Create directory for generated files</Message>
@@ -155,14 +237,68 @@
"$(TargetPath)"</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <PreBuildEvent>
+ <Message>Create directory for generated files</Message>
+ <Command>mkdir "$(OutDir)Gen\tests\testUdmCint"
+exit 0
+</Command>
+ </PreBuildEvent>
+ <Midl>
+ <TypeLibraryName>$(IntDir)testUdmCint.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>MaxSpeed</Optimization>
+ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+ <AdditionalIncludeDirectories>..\..\..\..\..\include;$(OutDir)Gen\tests\testUdmCint;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeaderOutputFile>$(IntDir)testUdmCint.pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <CompileAs>Default</CompileAs>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x0409</Culture>
+ </ResourceCompile>
+ <Link>
+ <AdditionalDependencies>UdmPOI.lib;cppunit.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <ProgramDatabaseFile>$(IntDir)testUdmCint.pdb</ProgramDatabaseFile>
+ <SubSystem>Console</SubSystem>
+ <RandomizedBaseAddress>false</RandomizedBaseAddress>
+ <DataExecutionPrevention>
+ </DataExecutionPrevention>
+ </Link>
+ <PostBuildEvent>
+ <Command>xcopy /y ..\..\..\..\..\tests\testUdmCint\*.xml "$(OutDir)Gen\tests\testUdmCint"
+cd "$(OutDir)Gen\tests\testUdmCint"
+"$(TargetPath)"</Command>
+ </PostBuildEvent>
+ </ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\..\..\..\..\tests\testUdmCint\main.cpp">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
+ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks>
<Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
+ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<ClCompile Include="..\..\..\..\..\tests\testUdmCint\testReadSBML2Ex.cpp" />
</ItemGroup>
@@ -172,14 +308,23 @@
<ItemGroup>
<CustomBuild Include="..\..\..\..\..\Build\Win32\VC10\Release\Gen\tests\testUdmCint\GeneTF_udm.xml">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">"$(OutDir)Udm.exe" -o "$(OutDir)\Gen\tests\testUdmCint" "%(FullPath)" -t -v -uGeneTF=http://kutykuruty.khm.edu
cd "$(OutDir)\Gen\tests\testUdmCint"
"$(OutDir)StrResGen.exe" GeneTF_GeneTF.xsd GeneTF_GeneTF_xsd
"$(OutDir)StrResGen.exe" GeneTF.xsd GeneTF_xsd
</Command>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(OutDir)Udm.exe" -o "$(OutDir)\Gen\tests\testUdmCint" "%(FullPath)" -t -v -uGeneTF=http://kutykuruty.khm.edu
+cd "$(OutDir)\Gen\tests\testUdmCint"
+"$(OutDir)StrResGen.exe" GeneTF_GeneTF.xsd GeneTF_GeneTF_xsd
+"$(OutDir)StrResGen.exe" GeneTF.xsd GeneTF_xsd
+</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)Gen\tests\testUdmCint\GeneTF.cpp;$(OutDir)Gen\tests\testUdmCint\GeneTF.h;$(OutDir)Gen\tests\testUdmCint\GeneTF.xsd;$(OutDir)Gen\tests\testUdmCint\GeneTF.dtd;$(OutDir)Gen\tests\testUdmCint\GeneTF_GeneTF.xsd;$(OutDir)Gen\tests\testUdmCint\GeneTF_GeneTF.dtd;$(OutDir)Gen\tests\testUdmCint\GeneTF_xsd.h;$(OutDir)Gen\tests\testUdmCint\GeneTF_GeneTF_xsd.h;%(Outputs)</Outputs>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)Gen\tests\testUdmCint\GeneTF.cpp;$(OutDir)Gen\tests\testUdmCint\GeneTF.h;$(OutDir)Gen\tests\testUdmCint\GeneTF.xsd;$(OutDir)Gen\tests\testUdmCint\GeneTF.dtd;$(OutDir)Gen\tests\testUdmCint\GeneTF_GeneTF.xsd;$(OutDir)Gen\tests\testUdmCint\GeneTF_GeneTF.dtd;$(OutDir)Gen\tests\testUdmCint\GeneTF_xsd.h;$(OutDir)Gen\tests\testUdmCint\GeneTF_GeneTF_xsd.h;%(Outputs)</Outputs>
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)Udm.exe</AdditionalInputs>
+ <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)Udm.exe</AdditionalInputs>
<Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Udm %(FileName)</Message>
+ <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Udm %(FileName)</Message>
</CustomBuild>
<CustomBuild Include="..\..\..\..\..\Build\Win32\VC10\Debug\Gen\tests\testUdmCint\GeneTF_udm.xml">
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(OutDir)UdmD.exe" -o "$(OutDir)Gen\tests\testUdmCint" %(FullPath) -t -v -uGeneTF=http://kutykuruty.khm.edu
@@ -187,23 +332,40 @@
"..\..\$(OutDir)StrResGenD.exe" GeneTF_GeneTF.xsd GeneTF_GeneTF_xsd
"..\..\$(OutDir)StrResGenD.exe" GeneTF.xsd GeneTF_xsd
</Command>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(OutDir)UdmD.exe" -o "$(OutDir)Gen\tests\testUdmCint" %(FullPath) -t -v -uGeneTF=http://kutykuruty.khm.edu
+cd "$(OutDir)Gen\tests\testUdmCint"
+"..\..\$(OutDir)StrResGenD.exe" GeneTF_GeneTF.xsd GeneTF_GeneTF_xsd
+"..\..\$(OutDir)StrResGenD.exe" GeneTF.xsd GeneTF_xsd
+</Command>
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)UdmD.exe</AdditionalInputs>
+ <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)UdmD.exe</AdditionalInputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)Gen\tests\testUdmCint\GeneTF.cpp;$(OutDir)Gen\tests\testUdmCint\GeneTF.h;$(OutDir)Gen\tests\testUdmCint\GeneTF.xsd;$(OutDir)Gen\tests\testUdmCint\GeneTF.dtd;$(OutDir)Gen\tests\testUdmCint\GeneTF_GeneTF.xsd;$(OutDir)Gen\tests\testUdmCint\GeneTF_GeneTF.dtd;$(OutDir)Gen\tests\testUdmCint\GeneTF_xsd.h;$(OutDir)Gen\tests\testUdmCint\GeneTF_GeneTF_xsd.h;%(Outputs)</Outputs>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)Gen\tests\testUdmCint\GeneTF.cpp;$(OutDir)Gen\tests\testUdmCint\GeneTF.h;$(OutDir)Gen\tests\testUdmCint\GeneTF.xsd;$(OutDir)Gen\tests\testUdmCint\GeneTF.dtd;$(OutDir)Gen\tests\testUdmCint\GeneTF_GeneTF.xsd;$(OutDir)Gen\tests\testUdmCint\GeneTF_GeneTF.dtd;$(OutDir)Gen\tests\testUdmCint\GeneTF_xsd.h;$(OutDir)Gen\tests\testUdmCint\GeneTF_GeneTF_xsd.h;%(Outputs)</Outputs>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</CustomBuild>
<CustomBuild Include="..\..\..\..\..\tests\testUdmCint\GeneTF_uml.xme">
<FileType>Document</FileType>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">cd "$(TargetDir)\Gen\tests\testUdmCint"
"$(UDM_PATH)\etc\xme2udmxml" "%(FullPath)" "%(FileName).mga"
</Command>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">cd "$(TargetDir)\Gen\tests\testUdmCint"
+"$(UDM_PATH)\etc\xme2udmxml" "%(FullPath)" "%(FileName).mga"
+</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)Gen\tests\testUdmCint\%(FileName).mga;$(OutDir)Gen\tests\testUdmCint\GeneTF_udm.xml;%(Outputs)</Outputs>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)Gen\tests\testUdmCint\%(FileName).mga;$(OutDir)Gen\tests\testUdmCint\GeneTF_udm.xml;%(Outputs)</Outputs>
<Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">cd "$(TargetDir)\Gen\tests\testUdmCint"
"$(UDM_PATH)\etc\xme2udmxml" "%(FullPath)" "%(FileName).mga"
</Command>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">cd "$(TargetDir)\Gen\tests\testUdmCint"
+"$(UDM_PATH)\etc\xme2udmxml" "%(FullPath)" "%(FileName).mga"
+</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)Gen\tests\testUdmCint\%(FileName).mga;$(OutDir)Gen\tests\testUdmCint\GeneTF_udm.xml;%(Outputs)</Outputs>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)Gen\tests\testUdmCint\%(FileName).mga;$(OutDir)Gen\tests\testUdmCint\GeneTF_udm.xml;%(Outputs)</Outputs>
</CustomBuild>
<CustomBuild Include="..\..\..\..\..\Build\Win32\VC10\Release\Gen\tests\testUdmCint\SBML2Ex_udm.xml">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">"$(OutDir)Udm.exe" -o "$(OutDir)Gen\tests\testUdmCint" "%(FullPath)" -g -v -e -q jigcell -i xhtml -u math=http://www.w3.org/1998/Math/MathML -u sbml=http://www.sbml.org/sbml/level2 -u dbi=http://www.dbi.tju.edu/xmlns/dbi -u unigene=http://www.dbi.tju.edu/xmlns/unigene -u xhtml=http://www.w3.org/1999/xhtml -u jigcell=http://mpf.biol.vt.edu/ns -u bc=http://www.sbml.org/2001/ns/biocharon -u flux=http://arep.med.harvard.edu/fluxns
cd "$(OutDir)Gen\tests\testUdmCint"
"$(OutDir)StrResGen.exe" SBML2Ex_math.xsd SBML2Ex_math_xsd
@@ -217,7 +379,21 @@
"$(OutDir)StrResGen.exe" SBML2Ex_bc.xsd SBML2Ex_bc_xsd
"$(OutDir)StrResGen.exe" SBML2Ex.xsd SBML2Ex_xsd
</Command>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(OutDir)Udm.exe" -o "$(OutDir)Gen\tests\testUdmCint" "%(FullPath)" -g -v -e -q jigcell -i xhtml -u math=http://www.w3.org/1998/Math/MathML -u sbml=http://www.sbml.org/sbml/level2 -u dbi=http://www.dbi.tju.edu/xmlns/dbi -u unigene=http://www.dbi.tju.edu/xmlns/unigene -u xhtml=http://www.w3.org/1999/xhtml -u jigcell=http://mpf.biol.vt.edu/ns -u bc=http://www.sbml.org/2001/ns/biocharon -u flux=http://arep.med.harvard.edu/fluxns
+cd "$(OutDir)Gen\tests\testUdmCint"
+"$(OutDir)StrResGen.exe" SBML2Ex_math.xsd SBML2Ex_math_xsd
+"$(OutDir)StrResGen.exe" SBML2Ex_sbml.xsd SBML2Ex_sbml_xsd
+"$(OutDir)StrResGen.exe" SBML2Ex_dbi.xsd SBML2Ex_dbi_xsd
+"$(OutDir)StrResGen.exe" SBML2Ex_unigene.xsd SBML2Ex_unigene_xsd
+"$(OutDir)StrResGen.exe" SBML2Ex_xhtml.xsd SBML2Ex_xhtml_xsd
+"$(OutDir)StrResGen.exe" SBML2Ex_flux.xsd SBML2Ex_flux_xsd
+"$(OutDir)StrResGen.exe" SBML2Ex_jigcell.xsd SBML2Ex_jigcell_xsd
+"$(OutDir)StrResGen.exe" SBML2Ex_jd.xsd SBML2Ex_jd_xsd
+"$(OutDir)StrResGen.exe" SBML2Ex_bc.xsd SBML2Ex_bc_xsd
+"$(OutDir)StrResGen.exe" SBML2Ex.xsd SBML2Ex_xsd
+</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)Gen\tests\testUdmCint\SBML2Ex.cpp;$(OutDir)Gen\tests\testUdmCint\SBML2Ex.h;$(OutDir)Gen\tests\testUdmCint\SBML2Ex_math.xsd;$(OutDir)Gen\tests\testUdmCint\SBML2Ex_math_xsd.h;$(OutDir)Gen\tests\testUdmCint\SBML2Ex_sbml.xsd;$(OutDir)Gen\tests\testUdmCint\SBML2Ex_sbml_xsd.h;$(OutDir)Gen\tests\testUdmCint\SBML2Ex_dbi.xsd;$(OutDir)Gen\tests\testUdmCint\SBML2Ex_dbi_xsd.h;$(OutDir)Gen\tests\testUdmCint\SBML2Ex_unigene.xsd;$(OutDir)Gen\tests\testUdmCint\SBML2Ex_unigene_xsd.h;$(OutDir)Gen\tests\testUdmCint\SBML2Ex_xhtml.xsd;$(OutDir)Gen\tests\testUdmCint\SBML2Ex_xhtml_xsd.h;$(OutDir)Gen\tests\testUdmCint\SBML2Ex_flux.xsd;$(OutDir)Gen\tests\testUdmCint\SBML2Ex_flux_xsd.h;$(OutDir)Gen\tests\testUdmCint\SBML2Ex_jigcell.xsd;$(OutDir)Gen\tests\testUdmCint\SBML2Ex_jigcell_xsd.h;$(OutDir)Gen\tests\testUdmCint\SBML2Ex_jd.xsd;$(OutDir)Gen\tests\testUdmCint\SBML2Ex_jd_xsd.h;$(OutDir)Gen\tests\testUdmCint\SBML2E!
x_bc.xsd;$(OutDir)Gen\tests\testUdmCint\SBML2Ex_bc_xsd.h;$(OutDir)Gen\tests\testUdmCint\SBML2Ex.xsd;$(OutDir)Gen\tests\testUdmCint\SBML2Ex_xsd.h;%(Outputs)</Outputs>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)Gen\tests\testUdmCint\SBML2Ex.cpp;$(OutDir)Gen\tests\testUdmCint\SBML2Ex.h;$(OutDir)Gen\tests\testUdmCint\SBML2Ex_math.xsd;$(OutDir)Gen\tests\testUdmCint\SBML2Ex_math_xsd.h;$(OutDir)Gen\tests\testUdmCint\SBML2Ex_sbml.xsd;$(OutDir)Gen\tests\testUdmCint\SBML2Ex_sbml_xsd.h;$(OutDir)Gen\tests\testUdmCint\SBML2Ex_dbi.xsd;$(OutDir)Gen\tests\testUdmCint\SBML2Ex_dbi_xsd.h;$(OutDir)Gen\tests\testUdmCint\SBML2Ex_unigene.xsd;$(OutDir)Gen\tests\testUdmCint\SBML2Ex_unigene_xsd.h;$(OutDir)Gen\tests\testUdmCint\SBML2Ex_xhtml.xsd;$(OutDir)Gen\tests\testUdmCint\SBML2Ex_xhtml_xsd.h;$(OutDir)Gen\tests\testUdmCint\SBML2Ex_flux.xsd;$(OutDir)Gen\tests\testUdmCint\SBML2Ex_flux_xsd.h;$(OutDir)Gen\tests\testUdmCint\SBML2Ex_jigcell.xsd;$(OutDir)Gen\tests\testUdmCint\SBML2Ex_jigcell_xsd.h;$(OutDir)Gen\tests\testUdmCint\SBML2Ex_jd.xsd;$(OutDir)Gen\tests\testUdmCint\SBML2Ex_jd_xsd.h;$(OutDir)Gen\tests\testUdmCint\SBML2Ex_!
bc.xsd;$(OutDir)Gen\tests\testUdmCint\SBML2Ex_bc_xsd.h;$(OutDir)Gen\tests\testUdmCint\SBML2Ex.xsd;$(OutDir)Gen\tests\testUdmCint\SBML2Ex_xsd.h;%(Outputs)</Outputs>
</CustomBuild>
<CustomBuild Include="..\..\..\..\..\Build\Win32\VC10\Debug\Gen\tests\testUdmCint\SBML2Ex_udm.xml">
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(OutDir)UdmD.exe" -o "$(OutDir)Gen\tests\testUdmCint" "%(FullPath)" -g -v -e -q jigcell -i xhtml -u math=http://www.w3.org/1998/Math/MathML -u sbml=http://www.sbml.org/sbml/level2 -u dbi=http://www.dbi.tju.edu/xmlns/dbi -u unigene=http://www.dbi.tju.edu/xmlns/unigene -u xhtml=http://www.w3.org/1999/xhtml -u jigcell=http://mpf.biol.vt.edu/ns -u bc=http://www.sbml.org/2001/ns/biocharon -u flux=http://arep.med.harvard.edu/fluxns
@@ -233,19 +409,42 @@
"..\..\$(OutDir)StrResGenD.exe" SBML2Ex_bc.xsd SBML2Ex_bc_xsd
"..\..\$(OutDir)StrResGenD.exe" SBML2Ex.xsd SBML2Ex_xsd
</Command>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(OutDir)UdmD.exe" -o "$(OutDir)Gen\tests\testUdmCint" "%(FullPath)" -g -v -e -q jigcell -i xhtml -u math=http://www.w3.org/1998/Math/MathML -u sbml=http://www.sbml.org/sbml/level2 -u dbi=http://www.dbi.tju.edu/xmlns/dbi -u unigene=http://www.dbi.tju.edu/xmlns/unigene -u xhtml=http://www.w3.org/1999/xhtml -u jigcell=http://mpf.biol.vt.edu/ns -u bc=http://www.sbml.org/2001/ns/biocharon -u flux=http://arep.med.harvard.edu/fluxns
+cd "$(OutDir)Gen\tests\testUdmCint"
+"..\..\$(OutDir)StrResGenD.exe" SBML2Ex_math.xsd SBML2Ex_math_xsd
+"..\..\$(OutDir)StrResGenD.exe" SBML2Ex_sbml.xsd SBML2Ex_sbml_xsd
+"..\..\$(OutDir)StrResGenD.exe" SBML2Ex_dbi.xsd SBML2Ex_dbi_xsd
+"..\..\$(OutDir)StrResGenD.exe" SBML2Ex_unigene.xsd SBML2Ex_unigene_xsd
+"..\..\$(OutDir)StrResGenD.exe" SBML2Ex_xhtml.xsd SBML2Ex_xhtml_xsd
+"..\..\$(OutDir)StrResGenD.exe" SBML2Ex_flux.xsd SBML2Ex_flux_xsd
+"..\..\$(OutDir)StrResGenD.exe" SBML2Ex_jigcell.xsd SBML2Ex_jigcell_xsd
+"..\..\$(OutDir)StrResGenD.exe" SBML2Ex_jd.xsd SBML2Ex_jd_xsd
+"..\..\$(OutDir)StrResGenD.exe" SBML2Ex_bc.xsd SBML2Ex_bc_xsd
+"..\..\$(OutDir)StrResGenD.exe" SBML2Ex.xsd SBML2Ex_xsd
+</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)Gen\tests\testUdmCint\SBML2Ex.cpp;$(OutDir)Gen\tests\testUdmCint\SBML2Ex.h;$(OutDir)Gen\tests\testUdmCint\SBML2Ex_math.xsd;$(OutDir)Gen\tests\testUdmCint\SBML2Ex_math_xsd.h;$(OutDir)Gen\tests\testUdmCint\SBML2Ex_sbml.xsd;$(OutDir)Gen\tests\testUdmCint\SBML2Ex_sbml_xsd.h;$(OutDir)Gen\tests\testUdmCint\SBML2Ex_dbi.xsd;$(OutDir)Gen\tests\testUdmCint\SBML2Ex_dbi_xsd.h;$(OutDir)Gen\tests\testUdmCint\SBML2Ex_unigene.xsd;$(OutDir)Gen\tests\testUdmCint\SBML2Ex_unigene_xsd.h;$(OutDir)Gen\tests\testUdmCint\SBML2Ex_xhtml.xsd;$(OutDir)Gen\tests\testUdmCint\SBML2Ex_xhtml_xsd.h;$(OutDir)Gen\tests\testUdmCint\SBML2Ex_flux.xsd;$(OutDir)Gen\tests\testUdmCint\SBML2Ex_flux_xsd.h;$(OutDir)Gen\tests\testUdmCint\SBML2Ex_jigcell.xsd;$(OutDir)Gen\tests\testUdmCint\SBML2Ex_jigcell_xsd.h;$(OutDir)Gen\tests\testUdmCint\SBML2Ex_jd.xsd;$(OutDir)Gen\tests\testUdmCint\SBML2Ex_jd_xsd.h;$(OutDir)Gen\tests\testUdmCint\SBML2Ex_!
bc.xsd;$(OutDir)Gen\tests\testUdmCint\SBML2Ex_bc_xsd.h;$(OutDir)Gen\tests\testUdmCint\SBML2Ex.xsd;$(OutDir)Gen\tests\testUdmCint\SBML2Ex_xsd.h;%(Outputs)</Outputs>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)Gen\tests\testUdmCint\SBML2Ex.cpp;$(OutDir)Gen\tests\testUdmCint\SBML2Ex.h;$(OutDir)Gen\tests\testUdmCint\SBML2Ex_math.xsd;$(OutDir)Gen\tests\testUdmCint\SBML2Ex_math_xsd.h;$(OutDir)Gen\tests\testUdmCint\SBML2Ex_sbml.xsd;$(OutDir)Gen\tests\testUdmCint\SBML2Ex_sbml_xsd.h;$(OutDir)Gen\tests\testUdmCint\SBML2Ex_dbi.xsd;$(OutDir)Gen\tests\testUdmCint\SBML2Ex_dbi_xsd.h;$(OutDir)Gen\tests\testUdmCint\SBML2Ex_unigene.xsd;$(OutDir)Gen\tests\testUdmCint\SBML2Ex_unigene_xsd.h;$(OutDir)Gen\tests\testUdmCint\SBML2Ex_xhtml.xsd;$(OutDir)Gen\tests\testUdmCint\SBML2Ex_xhtml_xsd.h;$(OutDir)Gen\tests\testUdmCint\SBML2Ex_flux.xsd;$(OutDir)Gen\tests\testUdmCint\SBML2Ex_flux_xsd.h;$(OutDir)Gen\tests\testUdmCint\SBML2Ex_jigcell.xsd;$(OutDir)Gen\tests\testUdmCint\SBML2Ex_jigcell_xsd.h;$(OutDir)Gen\tests\testUdmCint\SBML2Ex_jd.xsd;$(OutDir)Gen\tests\testUdmCint\SBML2Ex_jd_xsd.h;$(OutDir)Gen\tests\testUdmCint\SBML2Ex_bc!
.xsd;$(OutDir)Gen\tests\testUdmCint\SBML2Ex_bc_xsd.h;$(OutDir)Gen\tests\testUdmCint\SBML2Ex.xsd;$(OutDir)Gen\tests\testUdmCint\SBML2Ex_xsd.h;%(Outputs)</Outputs>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</CustomBuild>
<CustomBuild Include="..\..\..\..\..\tests\testUdmCint\SBML2Ex_uml.xme">
<FileType>Document</FileType>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">cd "$(TargetDir)\Gen\tests\testUdmCint"
"$(UDM_PATH)\etc\xme2udmxml" "%(FullPath)" "%(FileName).mga"
</Command>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">cd "$(TargetDir)\Gen\tests\testUdmCint"
+"$(UDM_PATH)\etc\xme2udmxml" "%(FullPath)" "%(FileName).mga"
+</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)Gen\tests\testUdmCint%(FileName).mga;$(OutDir)Gen\tests\testUdmCint\SBML2Ex_udm.xml;%(Outputs)</Outputs>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)Gen\tests\testUdmCint%(FileName).mga;$(OutDir)Gen\tests\testUdmCint\SBML2Ex_udm.xml;%(Outputs)</Outputs>
<Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">cd "$(TargetDir)\Gen\tests\testUdmCint"
"$(UDM_PATH)\etc\xme2udmxml" "%(FullPath)" "%(FileName).mga"
</Command>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">cd "$(TargetDir)\Gen\tests\testUdmCint"
+"$(UDM_PATH)\etc\xme2udmxml" "%(FullPath)" "%(FileName).mga"
+</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)Gen\tests\testUdmCint%(FileName).mga;$(OutDir)Gen\tests\testUdmCint\SBML2Ex_udm.xml;%(Outputs)</Outputs>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)Gen\tests\testUdmCint%(FileName).mga;$(OutDir)Gen\tests\testUdmCint\SBML2Ex_udm.xml;%(Outputs)</Outputs>
</CustomBuild>
<None Include="..\..\..\..\..\tests\testUdmCint\versionCheck.xml" />
</ItemGroup>
Modified: UDM/trunk/Projects/Win32/VC10/tests/test_assocInheritanceMGA/TestSignalFlow.vcxproj
==============================================================================
--- UDM/trunk/Projects/Win32/VC10/tests/test_assocInheritanceMGA/TestSignalFlow.vcxproj Fri Aug 26 16:42:02 2011 (r3860)
+++ UDM/trunk/Projects/Win32/VC10/tests/test_assocInheritanceMGA/TestSignalFlow.vcxproj Fri Aug 26 16:42:25 2011 (r3861)
@@ -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">
<ProjectGuid>{B3186C4B-EF81-4474-BDA7-AC44B4339C98}</ProjectGuid>
@@ -20,11 +28,21 @@
<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>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
@@ -33,22 +51,32 @@
<Import Project="..\cppunit.props" />
<Import Project="..\UdmTests.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')" />
+ <Import Project="..\cppunit.props" />
+ <Import Project="..\UdmTests.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')" />
<Import Project="..\cppunit.props" />
<Import Project="..\UdmTests.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')" />
+ <Import Project="..\cppunit.props" />
+ <Import Project="..\UdmTests.props" />
+ </ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.21006.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\..\..\Build\Win32\VC10\Debug\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)obj\tests\$(ProjectName)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\..\..\Build\Win32\VC10\Release\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)obj\tests\$(ProjectName)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkIncremental>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectName)</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)D</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectName)D</TargetName>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<PreBuildEvent>
@@ -108,6 +136,63 @@
<Outputs>NONE</Outputs>
</CustomBuildStep>
</ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <PreBuildEvent>
+ <Message>Create directory for generated files</Message>
+ <Command>mkdir "$(OutDir)Gen\tests\test_assocInheritanceMGA"
+exit 0
+</Command>
+ </PreBuildEvent>
+ <Midl>
+ <TypeLibraryName>$(IntDir)TestSignalFlow.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>..\..\..\..\..\include;$(OutDir)Gen\tests\test_assocInheritanceMGA;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeaderOutputFile>$(IntDir)TestSignalFlow.pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ <CompileAs>Default</CompileAs>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x0409</Culture>
+ </ResourceCompile>
+ <Link>
+ <AdditionalDependencies>cppunitd_dllx64.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(IntDir)TestSignalFlow.pdb</ProgramDatabaseFile>
+ <SubSystem>Console</SubSystem>
+ <RandomizedBaseAddress>false</RandomizedBaseAddress>
+ <DataExecutionPrevention>
+ </DataExecutionPrevention>
+ </Link>
+ <PostBuildEvent>
+ <Command>
+ </Command>
+ </PostBuildEvent>
+ <CustomBuildStep>
+ <Command>cd "$(OutDir)Gen\tests\test_assocInheritanceMGA"
+"$(TargetPath)"</Command>
+ </CustomBuildStep>
+ <CustomBuildStep>
+ <Message>Running $(TargetName)</Message>
+ </CustomBuildStep>
+ <CustomBuildStep>
+ <Outputs>NONE</Outputs>
+ </CustomBuildStep>
+ </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<PreBuildEvent>
<Message>Create directory for generated files</Message>
@@ -170,106 +255,237 @@
<Outputs>NONE</Outputs>
</CustomBuildStep>
</ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <PreBuildEvent>
+ <Message>Create directory for generated files</Message>
+ <Command>mkdir "$(OutDir)Gen\tests\test_assocInheritanceMGA"
+exit 0
+</Command>
+ </PreBuildEvent>
+ <Midl>
+ <TypeLibraryName>$(IntDir)TestSignalFlow.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>MaxSpeed</Optimization>
+ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+ <AdditionalIncludeDirectories>..\..\..\..\..\include;$(OutDir)Gen\tests\test_assocInheritanceMGA;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>UDM_DYNAMIC_LINKING;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <PrecompiledHeaderOutputFile>$(IntDir)TestSignalFlow.pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <CompileAs>Default</CompileAs>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x0409</Culture>
+ </ResourceCompile>
+ <Link>
+ <AdditionalDependencies>cppunit.lib</AdditionalDependencies>
+ <OutputFile>$(OutDir)TestSignalFlow.exe</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <ProgramDatabaseFile>$(IntDir)TestSignalFlow.pdb</ProgramDatabaseFile>
+ <SubSystem>Console</SubSystem>
+ <RandomizedBaseAddress>false</RandomizedBaseAddress>
+ <DataExecutionPrevention>
+ </DataExecutionPrevention>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ </Link>
+ <PostBuildEvent>
+ <Command>
+ </Command>
+ </PostBuildEvent>
+ <CustomBuildStep>
+ <Command>cd "$(OutDir)Gen\tests\test_assocInheritanceMGA"
+"$(TargetPath)"</Command>
+ </CustomBuildStep>
+ <CustomBuildStep>
+ <Message>Running $(TargetName)</Message>
+ </CustomBuildStep>
+ <CustomBuildStep>
+ <Outputs>NONE</Outputs>
+ </CustomBuildStep>
+ </ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\..\..\..\..\tests\test_assocInheritanceMGA\AssociationInheritanceTest.cpp">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
+ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks>
<Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
+ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<ClCompile Include="..\..\..\..\..\tests\test_assocInheritanceMGA\main.cpp">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
+ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks>
<Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
+ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<ClCompile Include="..\..\..\..\..\Build\Win32\VC10\Release\Gen\tests\test_assocInheritanceMGA\SignalFlow.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
+ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<ClCompile Include="..\..\..\..\..\Build\Win32\VC10\Debug\Gen\tests\test_assocInheritanceMGA\SignalFlow.cpp">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
+ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\..\..\tests\test_assocInheritanceMGA\AssociationInheritanceTest.h" />
<CustomBuild Include="..\..\..\..\..\Build\Win32\VC10\Release\Gen\tests\test_assocInheritanceMGA\SignalFlow.h">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
</CustomBuild>
<CustomBuild Include="..\..\..\..\..\Build\Win32\VC10\Debug\Gen\tests\test_assocInheritanceMGA\SignalFlow.h">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</CustomBuild>
</ItemGroup>
<ItemGroup>
<CustomBuild Include="..\..\..\..\..\tests\test_assocInheritanceMGA\sf1.xme">
<FileType>Document</FileType>
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">sf1.xme -> sf1.mga</Message>
+ <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">sf1.xme -> sf1.mga</Message>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">cd "$(TargetDir)\Gen\tests\test_assocInheritanceMGA"
"$(UDM_PATH)\etc\CreateMGA" "%(FullPath)" "%(FileName).mga" SignalFlow
</Command>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">cd "$(TargetDir)\Gen\tests\test_assocInheritanceMGA"
+"$(UDM_PATH)\etc\CreateMGA" "%(FullPath)" "%(FileName).mga" SignalFlow
+</Command>
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalInputs)</AdditionalInputs>
+ <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalInputs)</AdditionalInputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)Gen\tests\test_assocInheritanceMGA\%(FileName).mga;%(Outputs)</Outputs>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)Gen\tests\test_assocInheritanceMGA\%(FileName).mga;%(Outputs)</Outputs>
<Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">sf1.xme -> sf1.mga</Message>
+ <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">sf1.xme -> sf1.mga</Message>
<Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">cd "$(TargetDir)\Gen\tests\test_assocInheritanceMGA"
"$(UDM_PATH)\etc\CreateMGA" "%(FullPath)" "%(FileName).mga" SignalFlow
</Command>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">cd "$(TargetDir)\Gen\tests\test_assocInheritanceMGA"
+"$(UDM_PATH)\etc\CreateMGA" "%(FullPath)" "%(FileName).mga" SignalFlow
+</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)Gen\tests\test_assocInheritanceMGA\%(FileName).mga;%(Outputs)</Outputs>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)Gen\tests\test_assocInheritanceMGA\%(FileName).mga;%(Outputs)</Outputs>
</CustomBuild>
<CustomBuild Include="..\..\..\..\..\tests\test_assocInheritanceMGA\SignalFlow_meta.xme">
<FileType>Document</FileType>
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Signalflow_meta.xme -> Signalflow_meta.xmp, Registering SignalFlow paradigm</Message>
+ <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Signalflow_meta.xme -> Signalflow_meta.xmp, Registering SignalFlow paradigm</Message>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">cd "%(RootDir)%(Directory)"
"$(UDM_PATH)\etc\CreateMGA" "%(FileName).xme" "%(FileName).mga" MetaGME
"$(UDM_PATH)\etc\CreateXmp" "%(FileName).mga"
</Command>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">cd "%(RootDir)%(Directory)"
+"$(UDM_PATH)\etc\CreateMGA" "%(FileName).xme" "%(FileName).mga" MetaGME
+"$(UDM_PATH)\etc\CreateXmp" "%(FileName).mga"
+</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)%(Directory)\SignalFlow.xmp;%(RootDir)%(Directory)\SignalFlow.xmp.log;%(RootDir)%(Directory)\SignalFlow.mta;%(RootDir)%(Directory)\%(FileName).mga;%(Outputs)</Outputs>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(RootDir)%(Directory)\SignalFlow.xmp;%(RootDir)%(Directory)\SignalFlow.xmp.log;%(RootDir)%(Directory)\SignalFlow.mta;%(RootDir)%(Directory)\%(FileName).mga;%(Outputs)</Outputs>
<Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Signalflow_meta.xme -> Signalflow_meta.xmp, Registering SignalFlow paradigm</Message>
+ <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Signalflow_meta.xme -> Signalflow_meta.xmp, Registering SignalFlow paradigm</Message>
<Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">cd "%(RootDir)%(Directory)"
"$(UDM_PATH)\etc\CreateMGA" "%(FileName).xme" "%(FileName).mga" MetaGME
"$(UDM_PATH)\etc\CreateXmp" "%(FileName).mga"
</Command>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">cd "%(RootDir)%(Directory)"
+"$(UDM_PATH)\etc\CreateMGA" "%(FileName).xme" "%(FileName).mga" MetaGME
+"$(UDM_PATH)\etc\CreateXmp" "%(FileName).mga"
+</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RootDir)%(Directory)\SignalFlow.xmp;%(RootDir)%(Directory)\SignalFlow.xmp.log;%(RootDir)%(Directory)\SignalFlow.mta;%(RootDir)%(Directory)\%(FileName).mga;%(Outputs)</Outputs>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RootDir)%(Directory)\SignalFlow.xmp;%(RootDir)%(Directory)\SignalFlow.xmp.log;%(RootDir)%(Directory)\SignalFlow.mta;%(RootDir)%(Directory)\%(FileName).mga;%(Outputs)</Outputs>
</CustomBuild>
<CustomBuild Include="..\..\..\..\..\Build\Win32\VC10\Release\Gen\tests\test_assocInheritanceMGA\SignalFlow_udm.xml">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">SignaFlow_udm.xml -> C++ API</Message>
+ <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">SignaFlow_udm.xml -> C++ API</Message>
<Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">"$(OutDir)Udm.exe" -o "$(OutDir)Gen\tests\test_assocInheritanceMGA" "%(FullPath)"
</Command>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(OutDir)Udm.exe" -o "$(OutDir)Gen\tests\test_assocInheritanceMGA" "%(FullPath)"
+</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)Gen\tests\test_assocInheritanceMGA\SignalFlow.h;$(OutDir)Gen\tests\test_assocInheritanceMGA\SignalFlow.cpp;$(OutDir)Gen\tests\test_assocInheritanceMGA\SignalFlow.xsd;%(Outputs)</Outputs>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)Gen\tests\test_assocInheritanceMGA\SignalFlow.h;$(OutDir)Gen\tests\test_assocInheritanceMGA\SignalFlow.cpp;$(OutDir)Gen\tests\test_assocInheritanceMGA\SignalFlow.xsd;%(Outputs)</Outputs>
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)Udm.exe</AdditionalInputs>
+ <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)Udm.exe</AdditionalInputs>
</CustomBuild>
<CustomBuild Include="..\..\..\..\..\Build\Win32\VC10\Debug\Gen\tests\test_assocInheritanceMGA\SignalFlow_udm.xml">
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">SignaFlow_udm.xml -> C++ API</Message>
+ <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">SignaFlow_udm.xml -> C++ API</Message>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(OutDir)UdmD.exe" -o "$(OutDir)Gen\tests\test_assocInheritanceMGA" "%(FullPath)"
</Command>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(OutDir)UdmD.exe" -o "$(OutDir)Gen\tests\test_assocInheritanceMGA" "%(FullPath)"
+</Command>
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)UdmD.exe</AdditionalInputs>
+ <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)UdmD.exe</AdditionalInputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)Gen\tests\test_assocInheritanceMGA\SignalFlow.h;$(OutDir)Gen\tests\test_assocInheritanceMGA\SignalFlow.cpp;$(OutDir)Gen\tests\test_assocInheritanceMGA\SignalFlow.xsd;%(Outputs)</Outputs>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)Gen\tests\test_assocInheritanceMGA\SignalFlow.h;$(OutDir)Gen\tests\test_assocInheritanceMGA\SignalFlow.cpp;$(OutDir)Gen\tests\test_assocInheritanceMGA\SignalFlow.xsd;%(Outputs)</Outputs>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</CustomBuild>
<CustomBuild Include="..\..\..\..\..\tests\test_assocInheritanceMGA\SignalFlow_uml.xme">
<FileType>Document</FileType>
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">SignalFlow_uml.xme -> SignalFlow_udm.xml </Message>
+ <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">SignalFlow_uml.xme -> SignalFlow_udm.xml </Message>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">cd "$(TargetDir)\Gen\tests\test_assocInheritanceMGA"
"$(UDM_PATH)\etc\Xme2UdmXml" "%(FullPath)" "%(FileName).mga"
</Command>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">cd "$(TargetDir)\Gen\tests\test_assocInheritanceMGA"
+"$(UDM_PATH)\etc\Xme2UdmXml" "%(FullPath)" "%(FileName).mga"
+</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)Gen\tests\test_assocInheritanceMGA\%(FileName).mga;$(OutDir)Gen\tests\test_assocInheritanceMGA\SignalFlow_udm.xml;%(Outputs)</Outputs>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)Gen\tests\test_assocInheritanceMGA\%(FileName).mga;$(OutDir)Gen\tests\test_assocInheritanceMGA\SignalFlow_udm.xml;%(Outputs)</Outputs>
<Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">SignalFlow_uml.xme -> SignalFlow_udm.xml </Message>
+ <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">SignalFlow_uml.xme -> SignalFlow_udm.xml </Message>
<Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">cd "$(TargetDir)\Gen\tests\test_assocInheritanceMGA"
"$(UDM_PATH)\etc\Xme2UdmXml" "%(FullPath)" "%(FileName).mga"
</Command>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">cd "$(TargetDir)\Gen\tests\test_assocInheritanceMGA"
+"$(UDM_PATH)\etc\Xme2UdmXml" "%(FullPath)" "%(FileName).mga"
+</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)Gen\tests\test_assocInheritanceMGA\%(FileName).mga;$(OutDir)Gen\tests\test_assocInheritanceMGA\SignalFlow_udm.xml;%(Outputs)</Outputs>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)Gen\tests\test_assocInheritanceMGA\%(FileName).mga;$(OutDir)Gen\tests\test_assocInheritanceMGA\SignalFlow_udm.xml;%(Outputs)</Outputs>
</CustomBuild>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
Modified: UDM/trunk/Projects/Win32/VC10/tests/test_childrenorder/test_childrenorder.vcxproj
==============================================================================
--- UDM/trunk/Projects/Win32/VC10/tests/test_childrenorder/test_childrenorder.vcxproj Fri Aug 26 16:42:02 2011 (r3860)
+++ UDM/trunk/Projects/Win32/VC10/tests/test_childrenorder/test_childrenorder.vcxproj Fri Aug 26 16:42:25 2011 (r3861)
@@ -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">
<ProjectGuid>{EFA8EF1E-C593-425D-AFAE-E3AE6B9AC546}</ProjectGuid>
@@ -20,11 +28,21 @@
<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>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
@@ -33,21 +51,30 @@
<Import Project="..\cppunit.props" />
<Import Project="..\UdmTests.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')" />
+ <Import Project="..\cppunit.props" />
+ <Import Project="..\UdmTests.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')" />
<Import Project="..\cppunit.props" />
<Import Project="..\UdmTests.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')" />
+ <Import Project="..\cppunit.props" />
+ <Import Project="..\UdmTests.props" />
+ </ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.21006.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\..\..\Build\Win32\VC10\Debug\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)obj\tests\$(ProjectName)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\..\..\Build\Win32\VC10\Release\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)obj\tests\$(ProjectName)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkIncremental>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectName)</TargetName>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Midl>
@@ -101,6 +128,57 @@
<Outputs>None</Outputs>
</CustomBuildStep>
</ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <Midl>
+ <TypeLibraryName>$(IntDir)test_childrenorder.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>..\..\..\..\..\include;$(OutDir)Gen\samples;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <PrecompiledHeaderOutputFile>$(IntDir)test_childrenorder.pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ <CompileAs>Default</CompileAs>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x0409</Culture>
+ <AdditionalIncludeDirectories>$(OutDir)Gen\samples;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ </ResourceCompile>
+ <Link>
+ <AdditionalDependencies>cppunitd_dllx64.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)test_childrenorder.exe</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(IntDir)test_childrenorder.pdb</ProgramDatabaseFile>
+ <SubSystem>Console</SubSystem>
+ <RandomizedBaseAddress>false</RandomizedBaseAddress>
+ <DataExecutionPrevention>
+ </DataExecutionPrevention>
+ </Link>
+ <PostBuildEvent>
+ <Command>
+ </Command>
+ </PostBuildEvent>
+ <CustomBuildStep>
+ <Command>cd "$(OutDir)Gen\samples"
+"$(TargetPath)"</Command>
+ <Message>Running $(TargetName)</Message>
+ <Outputs>None</Outputs>
+ </CustomBuildStep>
+ </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Midl>
<TypeLibraryName>$(IntDir)test_childrenorder.tlb</TypeLibraryName>
@@ -155,24 +233,91 @@
<Outputs>None</Outputs>
</CustomBuildStep>
</ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <Midl>
+ <TypeLibraryName>$(IntDir)test_childrenorder.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>MaxSpeed</Optimization>
+ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+ <AdditionalIncludeDirectories>..\..\..\..\..\include;$(OutDir)Gen\samples;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>UDM_DYNAMIC_LINKING;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <PrecompiledHeaderOutputFile>$(IntDir)test_childrenorder.pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <CompileAs>Default</CompileAs>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x0409</Culture>
+ <AdditionalIncludeDirectories>$(OutDir)Gen\samples;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ </ResourceCompile>
+ <Link>
+ <AdditionalDependencies>cppunit.lib</AdditionalDependencies>
+ <OutputFile>$(OutDir)test_childrenorder.exe</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <ProgramDatabaseFile>$(IntDir)test_childrenorder.pdb</ProgramDatabaseFile>
+ <SubSystem>Console</SubSystem>
+ <RandomizedBaseAddress>false</RandomizedBaseAddress>
+ <DataExecutionPrevention>
+ </DataExecutionPrevention>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ </Link>
+ <PostBuildEvent>
+ <Command>
+ </Command>
+ </PostBuildEvent>
+ <CustomBuildStep>
+ <Command>cd "$(OutDir)Gen\samples"
+"$(TargetPath)"</Command>
+ <Message>Running $(TargetName)</Message>
+ <Outputs>None</Outputs>
+ </CustomBuildStep>
+ </ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\..\..\..\..\tests\test_childrenorder\childrenorderTest.cpp">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
+ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks>
<Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
+ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<ClCompile Include="..\..\..\..\..\tests\test_childrenorder\test_childrenorder.cpp">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
+ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks>
<Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
+ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
</ItemGroup>
<ItemGroup>
Modified: UDM/trunk/Projects/Win32/VC10/tests/test_cintstring/test_cintstring.vcxproj
==============================================================================
--- UDM/trunk/Projects/Win32/VC10/tests/test_cintstring/test_cintstring.vcxproj Fri Aug 26 16:42:02 2011 (r3860)
+++ UDM/trunk/Projects/Win32/VC10/tests/test_cintstring/test_cintstring.vcxproj Fri Aug 26 16:42:25 2011 (r3861)
@@ -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">
<ProjectGuid>{C4C77F9B-540F-4D02-A6E0-90F25740CA6C}</ProjectGuid>
@@ -20,11 +28,21 @@
<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|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>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
@@ -33,21 +51,30 @@
<Import Project="..\cppunit.props" />
<Import Project="..\UdmTests.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')" />
+ <Import Project="..\cppunit.props" />
+ <Import Project="..\UdmTests.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')" />
<Import Project="..\cppunit.props" />
<Import Project="..\UdmTests.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')" />
+ <Import Project="..\cppunit.props" />
+ <Import Project="..\UdmTests.props" />
+ </ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.21006.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\..\..\Build\Win32\VC10\Release\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)obj\tests\$(ProjectName)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\..\..\Build\Win32\VC10\Debug\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)obj\tests\$(ProjectName)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkIncremental>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectName)</TargetName>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<PreBuildEvent>
@@ -94,10 +121,71 @@
<TargetMachine>MachineX86</TargetMachine>
</Link>
<PostBuildEvent>
+ <Command>
+ </Command>
+ </PostBuildEvent>
+ <CustomBuildStep>
<Command>cd "$(OutDir)Gen\tests\test_cintstring"
"$(TargetPath)"
</Command>
+ <Message>Run $(TargetName)</Message>
+ <Outputs>NONE</Outputs>
+ </CustomBuildStep>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <PreBuildEvent>
+ <Message>Create directory for generated files</Message>
+ <Command>mkdir "$(OutDir)Gen\tests\test_cintstring"
+exit 0
+</Command>
+ </PreBuildEvent>
+ <Midl>
+ <TypeLibraryName>$(IntDir)test_cintstring.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>MaxSpeed</Optimization>
+ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+ <AdditionalIncludeDirectories>..\..\..\..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>UDM_DYNAMIC_LINKING;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeaderOutputFile>$(IntDir)test_cintstring.pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <CompileAs>Default</CompileAs>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x0409</Culture>
+ </ResourceCompile>
+ <Link>
+ <AdditionalDependencies>cppunit.lib</AdditionalDependencies>
+ <OutputFile>$(OutDir)test_cintstring.exe</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <ProgramDatabaseFile>$(IntDir)test_cintstring.pdb</ProgramDatabaseFile>
+ <SubSystem>Console</SubSystem>
+ <RandomizedBaseAddress>false</RandomizedBaseAddress>
+ <DataExecutionPrevention>
+ </DataExecutionPrevention>
+ </Link>
+ <PostBuildEvent>
+ <Command>
+ </Command>
</PostBuildEvent>
+ <CustomBuildStep>
+ <Command>cd "$(OutDir)Gen\tests\test_cintstring"
+"$(TargetPath)"
+</Command>
+ <Message>Run $(TargetName)</Message>
+ <Outputs>NONE</Outputs>
+ </CustomBuildStep>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<PreBuildEvent>
@@ -144,29 +232,104 @@
<TargetMachine>MachineX86</TargetMachine>
</Link>
<PostBuildEvent>
+ <Command>
+ </Command>
+ </PostBuildEvent>
+ <CustomBuildStep>
<Command>cd "$(OutDir)Gen\tests\test_cintstring"
"$(TargetPath)"
</Command>
+ <Message>Run $(TargetName)</Message>
+ <Outputs>NONE</Outputs>
+ </CustomBuildStep>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <PreBuildEvent>
+ <Message>Create directory for generated files</Message>
+ <Command>mkdir "$(OutDir)Gen\tests\test_cintstring"
+exit 0
+</Command>
+ </PreBuildEvent>
+ <Midl>
+ <TypeLibraryName>$(IntDir)test_cintstring.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>..\..\..\..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeaderOutputFile>$(IntDir)test_cintstring.pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ <CompileAs>Default</CompileAs>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x0409</Culture>
+ </ResourceCompile>
+ <Link>
+ <AdditionalDependencies>cppunitd_dllx64.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)test_cintstring.exe</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(IntDir)test_cintstring.pdb</ProgramDatabaseFile>
+ <SubSystem>Console</SubSystem>
+ <RandomizedBaseAddress>false</RandomizedBaseAddress>
+ <DataExecutionPrevention>
+ </DataExecutionPrevention>
+ </Link>
+ <PostBuildEvent>
+ <Command>
+ </Command>
</PostBuildEvent>
+ <CustomBuildStep>
+ <Command>cd "$(OutDir)Gen\tests\test_cintstring"
+"$(TargetPath)"
+</Command>
+ <Message>Run $(TargetName)</Message>
+ <Outputs>NONE</Outputs>
+ </CustomBuildStep>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\..\..\..\..\tests\test_cintstring\cintstringTest.cpp">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
+ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks>
<Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
+ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<ClCompile Include="..\..\..\..\..\tests\test_cintstring\test_cintstring.cpp">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
+ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks>
<Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
+ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
</ItemGroup>
<ItemGroup>
Modified: UDM/trunk/Projects/Win32/VC10/tests/test_domstringdn/test_domstringdn.vcxproj
==============================================================================
--- UDM/trunk/Projects/Win32/VC10/tests/test_domstringdn/test_domstringdn.vcxproj Fri Aug 26 16:42:02 2011 (r3860)
+++ UDM/trunk/Projects/Win32/VC10/tests/test_domstringdn/test_domstringdn.vcxproj Fri Aug 26 16:42:25 2011 (r3861)
@@ -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">
<ProjectGuid>{D38D6A95-8FAA-4437-88B5-BE24C6CB591A}</ProjectGuid>
@@ -20,11 +28,21 @@
<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|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>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
@@ -33,21 +51,30 @@
<Import Project="..\cppunit.props" />
<Import Project="..\UdmTests.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')" />
+ <Import Project="..\cppunit.props" />
+ <Import Project="..\UdmTests.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')" />
<Import Project="..\cppunit.props" />
<Import Project="..\UdmTests.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')" />
+ <Import Project="..\cppunit.props" />
+ <Import Project="..\UdmTests.props" />
+ </ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.21006.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\..\..\Build\Win32\VC10\Release\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)obj\tests\$(ProjectName)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\..\..\Build\Win32\VC10\Debug\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)obj\tests\$(ProjectName)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkIncremental>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectName)</TargetName>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Midl>
@@ -90,10 +117,75 @@
<TargetMachine>MachineX86</TargetMachine>
</Link>
<PostBuildEvent>
+ <Command>
+ </Command>
+ </PostBuildEvent>
+ <CustomBuildStep>
<Command>cd "$(OutDir)Gen\samples"
"$(TargetPath)"
</Command>
+ </CustomBuildStep>
+ <CustomBuildStep>
+ <Message>Run $(TargetName)</Message>
+ </CustomBuildStep>
+ <CustomBuildStep>
+ <Outputs>NONE</Outputs>
+ </CustomBuildStep>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <Midl>
+ <TypeLibraryName>$(IntDir)test_domstringdn.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>MaxSpeed</Optimization>
+ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+ <AdditionalIncludeDirectories>..\..\..\..\..\include;$(OutDir)Gen\samples;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>UDM_DYNAMIC_LINKING;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <PrecompiledHeaderOutputFile>$(IntDir)test_domstringdn.pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <CompileAs>Default</CompileAs>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x0409</Culture>
+ </ResourceCompile>
+ <Link>
+ <AdditionalDependencies>cppunit.lib</AdditionalDependencies>
+ <OutputFile>$(OutDir)test_domstringdn.exe</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <ProgramDatabaseFile>$(IntDir)test_domstringdn.pdb</ProgramDatabaseFile>
+ <SubSystem>Console</SubSystem>
+ <RandomizedBaseAddress>false</RandomizedBaseAddress>
+ <DataExecutionPrevention>
+ </DataExecutionPrevention>
+ </Link>
+ <PostBuildEvent>
+ <Command>
+ </Command>
</PostBuildEvent>
+ <CustomBuildStep>
+ <Command>cd "$(OutDir)Gen\samples"
+"$(TargetPath)"
+</Command>
+ </CustomBuildStep>
+ <CustomBuildStep>
+ <Message>Run $(TargetName)</Message>
+ </CustomBuildStep>
+ <CustomBuildStep>
+ <Outputs>NONE</Outputs>
+ </CustomBuildStep>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Midl>
@@ -136,29 +228,107 @@
<TargetMachine>MachineX86</TargetMachine>
</Link>
<PostBuildEvent>
+ <Command>
+ </Command>
+ </PostBuildEvent>
+ <CustomBuildStep>
<Command>cd "$(OutDir)Gen\samples"
"$(TargetPath)"
</Command>
+ </CustomBuildStep>
+ <CustomBuildStep>
+ <Message>Run $(TargetName)</Message>
+ </CustomBuildStep>
+ <CustomBuildStep>
+ <Outputs>NONE</Outputs>
+ </CustomBuildStep>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <Midl>
+ <TypeLibraryName>$(IntDir)test_domstringdn.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>..\..\..\..\..\include;$(OutDir)Gen\samples;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <PrecompiledHeaderOutputFile>$(IntDir)test_domstringdn.pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ <CompileAs>Default</CompileAs>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x0409</Culture>
+ </ResourceCompile>
+ <Link>
+ <AdditionalDependencies>cppunitd_dllx64.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(IntDir)test_domstringdn.pdb</ProgramDatabaseFile>
+ <SubSystem>Console</SubSystem>
+ <RandomizedBaseAddress>false</RandomizedBaseAddress>
+ <DataExecutionPrevention>
+ </DataExecutionPrevention>
+ </Link>
+ <PostBuildEvent>
+ <Command>
+ </Command>
</PostBuildEvent>
+ <CustomBuildStep>
+ <Command>cd "$(OutDir)Gen\samples"
+"$(TargetPath)"
+</Command>
+ </CustomBuildStep>
+ <CustomBuildStep>
+ <Message>Run $(TargetName)</Message>
+ </CustomBuildStep>
+ <CustomBuildStep>
+ <Outputs>NONE</Outputs>
+ </CustomBuildStep>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\..\..\..\..\tests\test_domstringdn\domstringdnTest.cpp">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
+ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks>
<Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
+ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<ClCompile Include="..\..\..\..\..\tests\test_domstringdn\test_domstringdn.cpp">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
+ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks>
<Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
+ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
</ItemGroup>
<ItemGroup>
Modified: UDM/trunk/Projects/Win32/VC10/tests/test_generic/test_generic.vcxproj
==============================================================================
--- UDM/trunk/Projects/Win32/VC10/tests/test_generic/test_generic.vcxproj Fri Aug 26 16:42:02 2011 (r3860)
+++ UDM/trunk/Projects/Win32/VC10/tests/test_generic/test_generic.vcxproj Fri Aug 26 16:42:25 2011 (r3861)
@@ -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">
<ProjectGuid>{CCB8B735-7EBB-4A60-A7E7-B8EAF1B11232}</ProjectGuid>
@@ -20,11 +28,21 @@
<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|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>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
@@ -33,21 +51,30 @@
<Import Project="..\cppunit.props" />
<Import Project="..\UdmTests.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')" />
+ <Import Project="..\cppunit.props" />
+ <Import Project="..\UdmTests.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')" />
<Import Project="..\cppunit.props" />
<Import Project="..\UdmTests.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')" />
+ <Import Project="..\cppunit.props" />
+ <Import Project="..\UdmTests.props" />
+ </ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.21006.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\..\..\Build\Win32\VC10\Release\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)obj\tests\$(ProjectName)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\..\..\Build\Win32\VC10\Debug\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)obj\tests\$(ProjectName)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkIncremental>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectName)</TargetName>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Midl>
@@ -108,6 +135,64 @@
<Outputs>NONE</Outputs>
</CustomBuildStep>
</ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <Midl>
+ <TypeLibraryName>$(IntDir)test_generic.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>MaxSpeed</Optimization>
+ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+ <AdditionalIncludeDirectories>..\..\..\..\..\include;$(OutDir)Gen\samples;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>UDM_DYNAMIC_LINKING;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <PrecompiledHeaderOutputFile>$(IntDir)test_generic.pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <CompileAs>Default</CompileAs>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x0409</Culture>
+ <AdditionalIncludeDirectories>$(OutDir)Gen\samples;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ </ResourceCompile>
+ <Link>
+ <AdditionalDependencies>cppunit.lib</AdditionalDependencies>
+ <OutputFile>$(OutDir)test_generic.exe</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <ProgramDatabaseFile>$(IntDir)test_generic.pdb</ProgramDatabaseFile>
+ <SubSystem>Console</SubSystem>
+ <RandomizedBaseAddress>false</RandomizedBaseAddress>
+ <DataExecutionPrevention>
+ </DataExecutionPrevention>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ </Link>
+ <PostBuildEvent>
+ <Command>
+ </Command>
+ </PostBuildEvent>
+ <CustomBuildStep>
+ <Command>cd "$(OutDir)Gen\samples"
+"$(TargetPath)"
+</Command>
+ </CustomBuildStep>
+ <CustomBuildStep>
+ <Message>Running $(TargetName)</Message>
+ </CustomBuildStep>
+ <CustomBuildStep>
+ <Outputs>NONE</Outputs>
+ </CustomBuildStep>
+ </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Midl>
<TypeLibraryName>$(IntDir)test_generic.tlb</TypeLibraryName>
@@ -165,24 +250,94 @@
<Outputs>NONE</Outputs>
</CustomBuildStep>
</ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <Midl>
+ <TypeLibraryName>$(IntDir)test_generic.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>..\..\..\..\..\include;$(OutDir)Gen\samples;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <PrecompiledHeaderOutputFile>$(IntDir)test_generic.pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ <CompileAs>Default</CompileAs>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x0409</Culture>
+ <AdditionalIncludeDirectories>$(OutDir)Gen\samples;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ </ResourceCompile>
+ <Link>
+ <AdditionalDependencies>cppunitd_dllx64.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)test_generic.exe</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(IntDir)test_generic.pdb</ProgramDatabaseFile>
+ <SubSystem>Console</SubSystem>
+ <RandomizedBaseAddress>false</RandomizedBaseAddress>
+ <DataExecutionPrevention>
+ </DataExecutionPrevention>
+ </Link>
+ <PostBuildEvent>
+ <Command>
+ </Command>
+ </PostBuildEvent>
+ <CustomBuildStep>
+ <Command>cd "$(OutDir)Gen\samples"
+"$(TargetPath)"
+</Command>
+ </CustomBuildStep>
+ <CustomBuildStep>
+ <Message>Running $(TargetName)</Message>
+ </CustomBuildStep>
+ <CustomBuildStep>
+ <Outputs>NONE</Outputs>
+ </CustomBuildStep>
+ </ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\..\..\..\..\tests\test_generic\genericTest.cpp">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
+ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks>
<Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
+ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<ClCompile Include="..\..\..\..\..\tests\test_generic\test_generic.cpp">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
+ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks>
<Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
+ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
</ItemGroup>
<ItemGroup>
Modified: UDM/trunk/Projects/Win32/VC10/tests/test_libs/test_libs.vcxproj
==============================================================================
--- UDM/trunk/Projects/Win32/VC10/tests/test_libs/test_libs.vcxproj Fri Aug 26 16:42:02 2011 (r3860)
+++ UDM/trunk/Projects/Win32/VC10/tests/test_libs/test_libs.vcxproj Fri Aug 26 16:42:25 2011 (r3861)
@@ -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">
<ProjectGuid>{AB116304-9B33-45FE-BA7C-08F3A56844DE}</ProjectGuid>
@@ -20,10 +28,19 @@
<CharacterSet>MultiByte</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <CharacterSet>MultiByte</CharacterSet>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
@@ -32,20 +49,28 @@
<Import Project="..\cppunit.props" />
<Import Project="..\UdmTests.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')" />
+ <Import Project="..\cppunit.props" />
+ <Import Project="..\UdmTests.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')" />
<Import Project="..\cppunit.props" />
<Import Project="..\UdmTests.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')" />
+ <Import Project="..\cppunit.props" />
+ <Import Project="..\UdmTests.props" />
+ </ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.21006.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\..\..\Build\Win32\VC10\Debug\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)obj\tests\$(ProjectName)\</IntDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\..\..\Build\Win32\VC10\Release\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)obj\tests\$(ProjectName)\</IntDir>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectName)</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)D</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectName)D</TargetName>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
@@ -83,6 +108,40 @@
<Outputs>NONE</Outputs>
</CustomBuildStep>
</ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>..\..\..\..\..\include;$(OutDir)Gen\samples;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>UDM_DYNAMIC_LINKING;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <WarningLevel>Level3</WarningLevel>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ </ClCompile>
+ <Link>
+ <AdditionalDependencies>cppunitd_dllx64.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <RandomizedBaseAddress>false</RandomizedBaseAddress>
+ <DataExecutionPrevention>
+ </DataExecutionPrevention>
+ </Link>
+ <PostBuildEvent>
+ <Command>
+ </Command>
+ </PostBuildEvent>
+ <CustomBuildStep>
+ <Command>cd "$(OutDir)Gen\samples"
+"$(TargetPath)"
+</Command>
+ </CustomBuildStep>
+ <CustomBuildStep>
+ <Message>Running $(TargetName)</Message>
+ </CustomBuildStep>
+ <CustomBuildStep>
+ <Outputs>NONE</Outputs>
+ </CustomBuildStep>
+ </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<AdditionalIncludeDirectories>..\..\..\..\..\include;$(OutDir)Gen\samples;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -124,6 +183,46 @@
<Outputs>NONE</Outputs>
</CustomBuildStep>
</ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <ClCompile>
+ <AdditionalIncludeDirectories>..\..\..\..\..\include;$(OutDir)Gen\samples;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>UDM_DYNAMIC_LINKING;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <WarningLevel>Level3</WarningLevel>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ </ClCompile>
+ <Link>
+ <AdditionalDependencies>cppunit.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)$(ProjectName).exe</OutputFile>
+ <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <OptimizeReferences>true</OptimizeReferences>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <RandomizedBaseAddress>false</RandomizedBaseAddress>
+ <DataExecutionPrevention>
+ </DataExecutionPrevention>
+ </Link>
+ <PostBuildEvent>
+ <Command>
+ </Command>
+ </PostBuildEvent>
+ <PreBuildEvent>
+ <Command>mkdir "$(OutDir)Gen\tests\test_libs"
+exit 0
+</Command>
+ </PreBuildEvent>
+ <CustomBuildStep>
+ <Command>cd "$(OutDir)Gen\samples"
+"$(TargetPath)"
+</Command>
+ </CustomBuildStep>
+ <CustomBuildStep>
+ <Message>Running $(TargetName)</Message>
+ </CustomBuildStep>
+ <CustomBuildStep>
+ <Outputs>NONE</Outputs>
+ </CustomBuildStep>
+ </ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\..\..\..\..\tests\test_libs\LibsTest.cpp" />
<ClCompile Include="..\..\..\..\..\tests\test_libs\main.cpp" />
Modified: UDM/trunk/Projects/Win32/VC10/tests/test_ns/test_ns.vcxproj
==============================================================================
--- UDM/trunk/Projects/Win32/VC10/tests/test_ns/test_ns.vcxproj Fri Aug 26 16:42:02 2011 (r3860)
+++ UDM/trunk/Projects/Win32/VC10/tests/test_ns/test_ns.vcxproj Fri Aug 26 16:42:25 2011 (r3861)
@@ -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">
<ProjectGuid>{546D0AC9-934F-472D-B443-27FCF4AF2471}</ProjectGuid>
@@ -20,10 +28,18 @@
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
@@ -31,21 +47,29 @@
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
<Import Project="..\cppunit.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')" />
+ <Import Project="..\cppunit.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')" />
<Import Project="..\cppunit.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')" />
+ <Import Project="..\cppunit.props" />
+ </ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.21006.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\..\..\Build\Win32\VC10\Debug\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)obj\tests\$(ProjectName)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\..\..\Build\Win32\VC10\Release\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)obj\tests\$(ProjectName)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectName)</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)D</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectName)D</TargetName>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<PreBuildEvent>
@@ -91,6 +115,48 @@
<Message>Running $(TargetName)</Message>
</CustomBuildStep>
</ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <PreBuildEvent>
+ <Message>Create directory for generated files</Message>
+ <Command>mkdir "$(OutDir)Gen\tests\test_ns"
+exit 0
+</Command>
+ </PreBuildEvent>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>..\..\..\..\..\include;$(OutDir)Gen\tests\test_ns;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;UDM_DYNAMIC_LINKING;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <WarningLevel>Level3</WarningLevel>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ </ClCompile>
+ <Link>
+ <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(OutDir)test_ns.pdb</ProgramDatabaseFile>
+ <SubSystem>Console</SubSystem>
+ <RandomizedBaseAddress>false</RandomizedBaseAddress>
+ <DataExecutionPrevention>
+ </DataExecutionPrevention>
+ <AdditionalDependencies>cppunitd_dllx64.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ </Link>
+ <PostBuildEvent>
+ <Command>
+ </Command>
+ </PostBuildEvent>
+ <CustomBuildStep>
+ <Command>cd "$(OutDir)Gen\tests\test_ns"
+"$(TargetPath)"
+</Command>
+ </CustomBuildStep>
+ <CustomBuildStep>
+ <Outputs>NONE</Outputs>
+ <Message>Running $(TargetName)</Message>
+ </CustomBuildStep>
+ </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<PreBuildEvent>
<Message>Create directory for generated files</Message>
@@ -134,49 +200,113 @@
<Message>Running $(TargetName)</Message>
</CustomBuildStep>
</ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <PreBuildEvent>
+ <Message>Create directory for generated files</Message>
+ <Command>mkdir "$(OutDir)Gen\tests\test_ns"
+exit 0
+</Command>
+ </PreBuildEvent>
+ <ClCompile>
+ <AdditionalIncludeDirectories>..\..\..\..\..\include;$(OutDir)Gen\tests\test_ns;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>UDM_DYNAMIC_LINKING;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <WarningLevel>Level3</WarningLevel>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ </ClCompile>
+ <Link>
+ <AdditionalDependencies>cppunit.lib</AdditionalDependencies>
+ <OutputFile>$(OutDir)test_ns.exe</OutputFile>
+ <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <SubSystem>Console</SubSystem>
+ <OptimizeReferences>true</OptimizeReferences>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <RandomizedBaseAddress>false</RandomizedBaseAddress>
+ <DataExecutionPrevention>
+ </DataExecutionPrevention>
+ </Link>
+ <PostBuildEvent>
+ <Command>
+ </Command>
+ </PostBuildEvent>
+ <CustomBuildStep>
+ <Command>cd "$(OutDir)Gen\tests\test_ns"
+"$(TargetPath)"
+</Command>
+ </CustomBuildStep>
+ <CustomBuildStep>
+ <Outputs>NONE</Outputs>
+ <Message>Running $(TargetName)</Message>
+ </CustomBuildStep>
+ </ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\..\..\..\..\tests\test_ns\main.cpp" />
<ClCompile Include="..\..\..\..\..\Build\Win32\VC10\Release\Gen\tests\test_ns\test_ns.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\..\Build\Win32\VC10\Debug\Gen\tests\test_ns\test_ns.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\..\tests\test_ns\test_ns_test.cpp" />
</ItemGroup>
<ItemGroup>
<CustomBuild Include="..\..\..\..\..\Build\Win32\VC10\Release\Gen\tests\test_ns\test_ns.h">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
</CustomBuild>
<CustomBuild Include="..\..\..\..\..\Build\Win32\VC10\Debug\Gen\tests\test_ns\test_ns.h">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</CustomBuild>
</ItemGroup>
<ItemGroup>
<CustomBuild Include="..\..\..\..\..\Build\Win32\VC10\Release\Gen\tests\test_ns\test_ns_udm.xml">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">"$(OutDir)Udm.exe" -o "$(OutDir)Gen\tests\test_ns" "%(FullPath)" -t -v
</Command>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(OutDir)Udm.exe" -o "$(OutDir)Gen\tests\test_ns" "%(FullPath)" -t -v
+</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)Gen\tests\test_ns\test_ns.cpp;$(OutDir)Gen\tests\test_ns\test_ns.h;$(OutDir)Gen\tests\test_ns\test_ns.dtd;$(OutDir)Gen\tests\test_ns\test_ns.xsd;$(OutDir)Gen\tests\test_ns\test_ns_A.dtd;$(OutDir)Gen\tests\test_ns\test_ns_A.xsd;$(OutDir)Gen\tests\test_ns\test_ns_B.dtd;$(OutDir)Gen\tests\test_ns\test_ns_B.xsd;$(OutDir)Gen\tests\test_ns\test_ns_AB.dtd;$(OutDir)Gen\tests\test_ns\test_ns_AB.xsd;%(Outputs)</Outputs>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)Gen\tests\test_ns\test_ns.cpp;$(OutDir)Gen\tests\test_ns\test_ns.h;$(OutDir)Gen\tests\test_ns\test_ns.dtd;$(OutDir)Gen\tests\test_ns\test_ns.xsd;$(OutDir)Gen\tests\test_ns\test_ns_A.dtd;$(OutDir)Gen\tests\test_ns\test_ns_A.xsd;$(OutDir)Gen\tests\test_ns\test_ns_B.dtd;$(OutDir)Gen\tests\test_ns\test_ns_B.xsd;$(OutDir)Gen\tests\test_ns\test_ns_AB.dtd;$(OutDir)Gen\tests\test_ns\test_ns_AB.xsd;%(Outputs)</Outputs>
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)Udm.exe</AdditionalInputs>
+ <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)Udm.exe</AdditionalInputs>
</CustomBuild>
<CustomBuild Include="..\..\..\..\..\Build\Win32\VC10\Debug\Gen\tests\test_ns\test_ns_udm.xml">
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(OutDir)UdmD.exe" -o "$(OutDir)Gen\tests\test_ns" %(FullPath) -t -v
</Command>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(OutDir)UdmD.exe" -o "$(OutDir)Gen\tests\test_ns" %(FullPath) -t -v
+</Command>
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)UdmD.exe</AdditionalInputs>
+ <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)UdmD.exe</AdditionalInputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)Gen\tests\test_ns\test_ns.cpp;$(OutDir)Gen\tests\test_ns\test_ns.h;$(OutDir)Gen\tests\test_ns\test_ns.dtd;$(OutDir)Gen\tests\test_ns\test_ns.xsd;$(OutDir)Gen\tests\test_ns\test_ns_A.dtd;$(OutDir)Gen\tests\test_ns\test_ns_A.xsd;$(OutDir)Gen\tests\test_ns\test_ns_B.dtd;$(OutDir)Gen\tests\test_ns\test_ns_B.xsd;$(OutDir)Gen\tests\test_ns\test_ns_AB.dtd;$(OutDir)Gen\tests\test_ns\test_ns_AB.xsd;%(Outputs)</Outputs>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)Gen\tests\test_ns\test_ns.cpp;$(OutDir)Gen\tests\test_ns\test_ns.h;$(OutDir)Gen\tests\test_ns\test_ns.dtd;$(OutDir)Gen\tests\test_ns\test_ns.xsd;$(OutDir)Gen\tests\test_ns\test_ns_A.dtd;$(OutDir)Gen\tests\test_ns\test_ns_A.xsd;$(OutDir)Gen\tests\test_ns\test_ns_B.dtd;$(OutDir)Gen\tests\test_ns\test_ns_B.xsd;$(OutDir)Gen\tests\test_ns\test_ns_AB.dtd;$(OutDir)Gen\tests\test_ns\test_ns_AB.xsd;%(Outputs)</Outputs>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</CustomBuild>
<CustomBuild Include="..\..\..\..\..\tests\test_ns\test_ns_uml.xme">
<FileType>Document</FileType>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">cd "$(TargetDir)\Gen\tests\test_ns"
"$(UDM_PATH)\etc\xme2udmxml" "%(FullPath)" "%(FileName).mga"
</Command>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">cd "$(TargetDir)\Gen\tests\test_ns"
+"$(UDM_PATH)\etc\xme2udmxml" "%(FullPath)" "%(FileName).mga"
+</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)Gen\tests\test_ns\%(FileName).mga;$(OutDir)Gen\tests\test_ns\test_ns_udm.xml;%(Outputs)</Outputs>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)Gen\tests\test_ns\%(FileName).mga;$(OutDir)Gen\tests\test_ns\test_ns_udm.xml;%(Outputs)</Outputs>
<Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">cd "$(TargetDir)\Gen\tests\test_ns"
"$(UDM_PATH)\etc\xme2udmxml" "%(FullPath)" "%(FileName).mga"
</Command>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">cd "$(TargetDir)\Gen\tests\test_ns"
+"$(UDM_PATH)\etc\xme2udmxml" "%(FullPath)" "%(FileName).mga"
+</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)Gen\tests\test_ns\%(FileName).mga;$(OutDir)Gen\tests\test_ns\test_ns_udm.xml;%(Outputs)</Outputs>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)Gen\tests\test_ns\%(FileName).mga;$(OutDir)Gen\tests\test_ns\test_ns_udm.xml;%(Outputs)</Outputs>
</CustomBuild>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
Modified: UDM/trunk/Projects/Win32/VC10/tests/test_ns2/test_ns2.vcxproj
==============================================================================
--- UDM/trunk/Projects/Win32/VC10/tests/test_ns2/test_ns2.vcxproj Fri Aug 26 16:42:02 2011 (r3860)
+++ UDM/trunk/Projects/Win32/VC10/tests/test_ns2/test_ns2.vcxproj Fri Aug 26 16:42:25 2011 (r3861)
@@ -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">
<ProjectGuid>{7724A08A-C9BC-4D56-8C93-21F35C583B5F}</ProjectGuid>
@@ -20,10 +28,18 @@
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
@@ -32,22 +48,32 @@
<Import Project="..\cppunit.props" />
<Import Project="..\UdmTests.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')" />
+ <Import Project="..\cppunit.props" />
+ <Import Project="..\UdmTests.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')" />
<Import Project="..\cppunit.props" />
<Import Project="..\UdmTests.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')" />
+ <Import Project="..\cppunit.props" />
+ <Import Project="..\UdmTests.props" />
+ </ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.21006.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\..\..\Build\Win32\VC10\Debug\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)obj\tests\$(ProjectName)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\..\..\Build\Win32\VC10\Release\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)obj\tests\$(ProjectName)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectName)</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)D</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectName)D</TargetName>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<PreBuildEvent>
@@ -93,6 +119,48 @@
<Outputs>NONE</Outputs>
</CustomBuildStep>
</ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <PreBuildEvent>
+ <Message>Create directory for generated files</Message>
+ <Command>mkdir "$(OutDir)Gen\tests\test_ns2"
+exit 0
+</Command>
+ </PreBuildEvent>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>..\..\..\..\..\include;$(OutDir)Gen\tests\test_ns2;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;UDM_DYNAMIC_LINKING;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <WarningLevel>Level3</WarningLevel>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ </ClCompile>
+ <Link>
+ <AdditionalDependencies>cppunitd_dllx64.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(OutDir)test_ns2.pdb</ProgramDatabaseFile>
+ <SubSystem>Console</SubSystem>
+ <RandomizedBaseAddress>false</RandomizedBaseAddress>
+ <DataExecutionPrevention>
+ </DataExecutionPrevention>
+ </Link>
+ <PostBuildEvent>
+ <Command>
+ </Command>
+ </PostBuildEvent>
+ <CustomBuildStep>
+ <Command>cd "$(OutDir)Gen\tests\test_ns2"
+"$(TargetPath)"
+</Command>
+ </CustomBuildStep>
+ <CustomBuildStep>
+ <Message>Running $(TargetName)</Message>
+ <Outputs>NONE</Outputs>
+ </CustomBuildStep>
+ </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<PreBuildEvent>
<Message>Create directory for generated files</Message>
@@ -136,63 +204,139 @@
<Outputs>NONE</Outputs>
</CustomBuildStep>
</ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <PreBuildEvent>
+ <Message>Create directory for generated files</Message>
+ <Command>mkdir "$(OutDir)Gen\tests\test_ns2"
+exit 0
+</Command>
+ </PreBuildEvent>
+ <ClCompile>
+ <AdditionalIncludeDirectories>..\..\..\..\..\include;$(OutDir)Gen\tests\test_ns2;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;UDM_DYNAMIC_LINKING;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <WarningLevel>Level3</WarningLevel>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ </ClCompile>
+ <Link>
+ <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)test_ns2.exe</OutputFile>
+ <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <SubSystem>Console</SubSystem>
+ <OptimizeReferences>true</OptimizeReferences>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <RandomizedBaseAddress>false</RandomizedBaseAddress>
+ <DataExecutionPrevention>
+ </DataExecutionPrevention>
+ </Link>
+ <PostBuildEvent>
+ <Command>
+ </Command>
+ </PostBuildEvent>
+ <CustomBuildStep>
+ <Command>cd "$(OutDir)Gen\tests\test_ns2"
+"$(TargetPath)"
+</Command>
+ </CustomBuildStep>
+ <CustomBuildStep>
+ <Message>Running $(TargetName)</Message>
+ <Outputs>NONE</Outputs>
+ </CustomBuildStep>
+ </ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\..\..\..\..\Build\Win32\VC10\Release\Gen\tests\test_ns2\CHost.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\..\Build\Win32\VC10\Debug\Gen\tests\test_ns2\CHost.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\..\tests\test_ns2\main.cpp" />
</ItemGroup>
<ItemGroup>
<CustomBuild Include="..\..\..\..\..\Build\Win32\VC10\Release\Gen\tests\test_ns2\CHost.h">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
</CustomBuild>
<CustomBuild Include="..\..\..\..\..\Build\Win32\VC10\Debug\Gen\tests\test_ns2\CHost.h">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</CustomBuild>
</ItemGroup>
<ItemGroup>
<CustomBuild Include="..\..\..\..\..\tests\test_ns2\CHost.xme">
<FileType>Document</FileType>
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(FileName).xme -> %(FileName).xmp, Registering %(FileName) paradigm</Message>
+ <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(FileName).xme -> %(FileName).xmp, Registering %(FileName) paradigm</Message>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">cd "%(RootDir)%(Directory)"
"$(UDM_PATH)\etc\CreateMga" "%(FileName).xme" "%(FileName).mga" MetaGME
"$(UDM_PATH)\etc\CreateXmp" "%(FileName).mga"
</Command>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">cd "%(RootDir)%(Directory)"
+"$(UDM_PATH)\etc\CreateMga" "%(FileName).xme" "%(FileName).mga" MetaGME
+"$(UDM_PATH)\etc\CreateXmp" "%(FileName).mga"
+</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(FileName).xmp;%(FileName).xmp.log;%(FileName).mta;%(FileName).mga;%(Outputs)</Outputs>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(FileName).xmp;%(FileName).xmp.log;%(FileName).mta;%(FileName).mga;%(Outputs)</Outputs>
<Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(FileName).xme -> %(FileName).xmp, Registering %(FileName) paradigm</Message>
+ <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(FileName).xme -> %(FileName).xmp, Registering %(FileName) paradigm</Message>
<Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">cd "%(RootDir)%(Directory)"
"$(UDM_PATH)\etc\CreateMga" "%(FileName).xme" "%(FileName).mga" MetaGME
"$(UDM_PATH)\etc\CreateXmp" "%(FileName).mga"
</Command>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">cd "%(RootDir)%(Directory)"
+"$(UDM_PATH)\etc\CreateMga" "%(FileName).xme" "%(FileName).mga" MetaGME
+"$(UDM_PATH)\etc\CreateXmp" "%(FileName).mga"
+</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(FileName).xmp;%(FileName).xmp.log;%(FileName).mta;%(FileName).mga;%(Outputs)</Outputs>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(FileName).xmp;%(FileName).xmp.log;%(FileName).mta;%(FileName).mga;%(Outputs)</Outputs>
</CustomBuild>
<CustomBuild Include="..\..\..\..\..\Build\Win32\VC10\Release\Gen\tests\test_ns2\CHost_udm.xml">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">"$(OutDir)Udm.exe" -o "$(OutDir)Gen\tests\test_ns2" "%(FullPath)" -t -v
</Command>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(OutDir)Udm.exe" -o "$(OutDir)Gen\tests\test_ns2" "%(FullPath)" -t -v
+</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)Gen\tests\test_ns2\CHost.cpp;$(OutDir)Gen\tests\test_ns2\CHost.h;$(OutDir)Gen\tests\test_ns2\CHost.dtd;$(OutDir)Gen\tests\test_ns2\CHost.xsd;$(OutDir)Gen\tests\test_ns2\CHost_A.dtd;$(OutDir)Gen\tests\test_ns2\CHost_A.xsd;$(OutDir)Gen\tests\test_ns2\CHost_B.dtd;$(OutDir)Gen\tests\test_ns2\CHost_B.xsd;$(OutDir)Gen\tests\test_ns2\CHost_C.dtd;$(OutDir)Gen\tests\test_ns2\CHost_C.xsd;%(Outputs)</Outputs>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)Gen\tests\test_ns2\CHost.cpp;$(OutDir)Gen\tests\test_ns2\CHost.h;$(OutDir)Gen\tests\test_ns2\CHost.dtd;$(OutDir)Gen\tests\test_ns2\CHost.xsd;$(OutDir)Gen\tests\test_ns2\CHost_A.dtd;$(OutDir)Gen\tests\test_ns2\CHost_A.xsd;$(OutDir)Gen\tests\test_ns2\CHost_B.dtd;$(OutDir)Gen\tests\test_ns2\CHost_B.xsd;$(OutDir)Gen\tests\test_ns2\CHost_C.dtd;$(OutDir)Gen\tests\test_ns2\CHost_C.xsd;%(Outputs)</Outputs>
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)Udm.exe</AdditionalInputs>
+ <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)Udm.exe</AdditionalInputs>
</CustomBuild>
<CustomBuild Include="..\..\..\..\..\Build\Win32\VC10\Debug\Gen\tests\test_ns2\CHost_udm.xml">
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(OutDir)UdmD.exe" -o "$(OutDir)Gen\tests\test_ns2" %(FullPath) -t -v
</Command>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(OutDir)UdmD.exe" -o "$(OutDir)Gen\tests\test_ns2" %(FullPath) -t -v
+</Command>
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)UdmD.exe</AdditionalInputs>
+ <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)UdmD.exe</AdditionalInputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)Gen\tests\test_ns2\CHost.cpp;$(OutDir)Gen\tests\test_ns2\CHost.h;$(OutDir)Gen\tests\test_ns2\CHost.dtd;$(OutDir)Gen\tests\test_ns2\CHost.xsd;$(OutDir)Gen\tests\test_ns2\CHost_A.dtd;$(OutDir)Gen\tests\test_ns2\CHost_A.xsd;$(OutDir)Gen\tests\test_ns2\CHost_B.dtd;$(OutDir)Gen\tests\test_ns2\CHost_B.xsd;$(OutDir)Gen\tests\test_ns2\CHost_C.dtd;$(OutDir)Gen\tests\test_ns2\CHost_C.xsd;%(Outputs)</Outputs>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)Gen\tests\test_ns2\CHost.cpp;$(OutDir)Gen\tests\test_ns2\CHost.h;$(OutDir)Gen\tests\test_ns2\CHost.dtd;$(OutDir)Gen\tests\test_ns2\CHost.xsd;$(OutDir)Gen\tests\test_ns2\CHost_A.dtd;$(OutDir)Gen\tests\test_ns2\CHost_A.xsd;$(OutDir)Gen\tests\test_ns2\CHost_B.dtd;$(OutDir)Gen\tests\test_ns2\CHost_B.xsd;$(OutDir)Gen\tests\test_ns2\CHost_C.dtd;$(OutDir)Gen\tests\test_ns2\CHost_C.xsd;%(Outputs)</Outputs>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</CustomBuild>
<CustomBuild Include="..\..\..\..\..\tests\test_ns2\CHost_uml.xme">
<FileType>Document</FileType>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">cd "$(TargetDir)\Gen\tests\test_ns2"
"$(UDM_PATH)\etc\xme2udmxml" "%(FullPath)" "%(FileName).mga"
</Command>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">cd "$(TargetDir)\Gen\tests\test_ns2"
+"$(UDM_PATH)\etc\xme2udmxml" "%(FullPath)" "%(FileName).mga"
+</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)Gen\tests\test_ns2\%(FileName).mga;$(OutDir)Gen\tests\test_ns2\CHost_udm.xml;%(Outputs)</Outputs>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)Gen\tests\test_ns2\%(FileName).mga;$(OutDir)Gen\tests\test_ns2\CHost_udm.xml;%(Outputs)</Outputs>
<Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">cd "$(TargetDir)\Gen\tests\test_ns2"
"$(UDM_PATH)\etc\xme2udmxml" "%(FullPath)" "%(FileName).mga"
</Command>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">cd "$(TargetDir)\Gen\tests\test_ns2"
+"$(UDM_PATH)\etc\xme2udmxml" "%(FullPath)" "%(FileName).mga"
+</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)Gen\tests\test_ns2\%(FileName).mga;$(OutDir)Gen\tests\test_ns2\CHost_udm.xml;%(Outputs)</Outputs>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)Gen\tests\test_ns2\%(FileName).mga;$(OutDir)Gen\tests\test_ns2\CHost_udm.xml;%(Outputs)</Outputs>
</CustomBuild>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
Modified: UDM/trunk/Projects/Win32/VC10/tests/test_refports/test_refports.vcxproj
==============================================================================
--- UDM/trunk/Projects/Win32/VC10/tests/test_refports/test_refports.vcxproj Fri Aug 26 16:42:02 2011 (r3860)
+++ UDM/trunk/Projects/Win32/VC10/tests/test_refports/test_refports.vcxproj Fri Aug 26 16:42:25 2011 (r3861)
@@ -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">
<ProjectGuid>{95B70B72-F65E-44F1-AF18-FCE1ED1B4FC7}</ProjectGuid>
@@ -20,10 +28,18 @@
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
@@ -31,20 +47,27 @@
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
<Import Project="..\cppunit.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')" />
+ <Import Project="..\cppunit.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')" />
<Import Project="..\cppunit.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')" />
+ <Import Project="..\cppunit.props" />
+ </ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.21006.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\..\..\Build\Win32\VC10\Debug\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)obj\tests\$(ProjectName)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\..\..\Build\Win32\VC10\Release\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)obj\tests\$(ProjectName)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</LinkIncremental>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectName)</TargetName>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<PreBuildEvent>
@@ -88,6 +111,46 @@
<Outputs>NONE</Outputs>
</CustomBuildStep>
</ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <PreBuildEvent>
+ <Message>Create directory for generated files</Message>
+ <Command>mkdir "$(OutDir)Gen\tests\test_refports"
+exit 0
+</Command>
+ </PreBuildEvent>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>..\..\..\..\..\include;$(OutDir)Gen\tests\test_refports;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;UDM_DYNAMIC_LINKING;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <WarningLevel>Level3</WarningLevel>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ </ClCompile>
+ <Link>
+ <AdditionalDependencies>cppunitd_dllx64.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <SubSystem>Console</SubSystem>
+ </Link>
+ <PostBuildEvent>
+ <Command>
+ </Command>
+ </PostBuildEvent>
+ <CustomBuildStep>
+ <Command>cd "$(OutDir)Gen\tests\test_refports"
+"$(TargetPath)"
+</Command>
+ </CustomBuildStep>
+ <CustomBuildStep>
+ <Message>Running $(TargetPath)</Message>
+ </CustomBuildStep>
+ <CustomBuildStep>
+ <Outputs>NONE</Outputs>
+ </CustomBuildStep>
+ </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<PreBuildEvent>
<Message>Create directory for generated files</Message>
@@ -129,12 +192,54 @@
<Outputs>NONE</Outputs>
</CustomBuildStep>
</ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <PreBuildEvent>
+ <Message>Create directory for generated files</Message>
+ <Command>mkdir "$(OutDir)Gen\tests\test_refports"
+exit 0
+</Command>
+ </PreBuildEvent>
+ <ClCompile>
+ <AdditionalIncludeDirectories>..\..\..\..\..\include;$(OutDir)Gen\tests\test_refports;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;_CONSOLE;UDM_DYNAMIC_LINKING;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <WarningLevel>Level3</WarningLevel>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ </ClCompile>
+ <Link>
+ <AdditionalDependencies>cppunit.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <SubSystem>Console</SubSystem>
+ <OptimizeReferences>true</OptimizeReferences>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ </Link>
+ <PostBuildEvent>
+ <Command>
+ </Command>
+ </PostBuildEvent>
+ <CustomBuildStep>
+ <Command>cd "$(OutDir)Gen\tests\test_refports"
+"$(TargetPath)"
+</Command>
+ </CustomBuildStep>
+ <CustomBuildStep>
+ <Message>Running $(TargetPath)</Message>
+ </CustomBuildStep>
+ <CustomBuildStep>
+ <Outputs>NONE</Outputs>
+ </CustomBuildStep>
+ </ItemDefinitionGroup>
<ItemGroup>
<CustomBuild Include="..\..\..\..\..\Build\Win32\VC10\Release\Gen\tests\test_refports\RefPort.h">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
</CustomBuild>
<CustomBuild Include="..\..\..\..\..\Build\Win32\VC10\Debug\Gen\tests\test_refports\RefPort.h">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</CustomBuild>
<ClInclude Include="..\..\..\..\..\tests\test_refports\RefPortsTest.h" />
</ItemGroup>
@@ -142,56 +247,92 @@
<ClCompile Include="..\..\..\..\..\tests\test_refports\main.cpp" />
<ClCompile Include="..\..\..\..\..\Build\Win32\VC10\Release\Gen\tests\test_refports\RefPort.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\..\Build\Win32\VC10\Debug\Gen\tests\test_refports\RefPort.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\..\tests\test_refports\RefPortsTest.cpp" />
</ItemGroup>
<ItemGroup>
<CustomBuild Include="..\..\..\..\..\Build\Win32\VC10\Release\Gen\tests\test_refports\RefPort_udm.xml">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Generating UDM API files</Message>
+ <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Generating UDM API files</Message>
<Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">"$(OutDir)Udm.exe" -o "$(OutDir)Gen\tests\test_refports" "%(FullPath)"
</Command>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(OutDir)Udm.exe" -o "$(OutDir)Gen\tests\test_refports" "%(FullPath)"
+</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)Gen\tests\test_refports\RefPort.h;$(OutDir)Gen\tests\test_refports\RefPort.cpp;$(OutDir)Gen\tests\test_refports\RefPort.xsd;%(Outputs)</Outputs>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)Gen\tests\test_refports\RefPort.h;$(OutDir)Gen\tests\test_refports\RefPort.cpp;$(OutDir)Gen\tests\test_refports\RefPort.xsd;%(Outputs)</Outputs>
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)Udm.exe</AdditionalInputs>
+ <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)Udm.exe</AdditionalInputs>
</CustomBuild>
<CustomBuild Include="..\..\..\..\..\Build\Win32\VC10\Debug\Gen\tests\test_refports\RefPort_udm.xml">
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating UDM API files</Message>
+ <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Generating UDM API files</Message>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(OutDir)UdmD.exe" -o "$(OutDir)Gen\tests\test_refports" "%(FullPath)"
</Command>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(OutDir)UdmD.exe" -o "$(OutDir)Gen\tests\test_refports" "%(FullPath)"
+</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)Gen\tests\test_refports\RefPort.h;$(OutDir)Gen\tests\test_refports\RefPort.cpp;$(OutDir)Gen\tests\test_refports\RefPort.xsd;%(Outputs)</Outputs>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)Gen\tests\test_refports\RefPort.h;$(OutDir)Gen\tests\test_refports\RefPort.cpp;$(OutDir)Gen\tests\test_refports\RefPort.xsd;%(Outputs)</Outputs>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)UdmD.exe</AdditionalInputs>
+ <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)UdmD.exe</AdditionalInputs>
</CustomBuild>
<CustomBuild Include="..\..\..\..\..\tests\test_refports\RefPortGme.xme">
<FileType>Document</FileType>
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(FileName).xme -> %(FileName).xmp, Registering RefPort paradigm</Message>
+ <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(FileName).xme -> %(FileName).xmp, Registering RefPort paradigm</Message>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">cd "%(RootDir)%(Directory)"
"$(UDM_PATH)\etc\CreateMga" "%(FileName).xme" "%(FileName).mga" MetaGME
"$(UDM_PATH)\etc\CreateXmp" "%(FileName).mga"
</Command>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">cd "%(RootDir)%(Directory)"
+"$(UDM_PATH)\etc\CreateMga" "%(FileName).xme" "%(FileName).mga" MetaGME
+"$(UDM_PATH)\etc\CreateXmp" "%(FileName).mga"
+</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)%(Directory)RefPortGme.mga;%(RootDir)%(Directory)RefPort.mta;%(RootDir)%(Directory)RefPort.xmp;%(RootDir)%(Directory)RefPort.xmp.log;%(Outputs)</Outputs>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(RootDir)%(Directory)RefPortGme.mga;%(RootDir)%(Directory)RefPort.mta;%(RootDir)%(Directory)RefPort.xmp;%(RootDir)%(Directory)RefPort.xmp.log;%(Outputs)</Outputs>
<Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(FileName).xme -> %(FileName).xmp, Registering RefPort paradigm</Message>
+ <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(FileName).xme -> %(FileName).xmp, Registering RefPort paradigm</Message>
<Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">cd "%(RootDir)%(Directory)"
"$(UDM_PATH)\etc\CreateMga" "%(FileName).xme" "%(FileName).mga" MetaGME
"$(UDM_PATH)\etc\CreateXmp" "%(FileName).mga"
</Command>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">cd "%(RootDir)%(Directory)"
+"$(UDM_PATH)\etc\CreateMga" "%(FileName).xme" "%(FileName).mga" MetaGME
+"$(UDM_PATH)\etc\CreateXmp" "%(FileName).mga"
+</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RootDir)%(Directory)RefPortGme.mga;%(RootDir)%(Directory)RefPort.mta;%(RootDir)%(Directory)RefPort.xmp;%(RootDir)%(Directory)RefPort.xmp.log;%(Outputs)</Outputs>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RootDir)%(Directory)RefPortGme.mga;%(RootDir)%(Directory)RefPort.mta;%(RootDir)%(Directory)RefPort.xmp;%(RootDir)%(Directory)RefPort.xmp.log;%(Outputs)</Outputs>
</CustomBuild>
<CustomBuild Include="..\..\..\..\..\tests\test_refports\RefPortUml.xme">
<FileType>Document</FileType>
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(FileName).xme -> %(FileName).mga</Message>
+ <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(FileName).xme -> %(FileName).mga</Message>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">cd "$(TargetDir)\Gen\tests\test_refports"
"$(UDM_PATH)\etc\xme2udmxml" "%(FullPath)" "%(FileName).mga"
</Command>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">cd "$(TargetDir)\Gen\tests\test_refports"
+"$(UDM_PATH)\etc\xme2udmxml" "%(FullPath)" "%(FileName).mga"
+</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)Gen\tests\test_refports\%(FileName).mga;$(OutDir)Gen\tests\test_refports\RefPort_udm.xml;%(Outputs)</Outputs>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)Gen\tests\test_refports\%(FileName).mga;$(OutDir)Gen\tests\test_refports\RefPort_udm.xml;%(Outputs)</Outputs>
<Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(FileName).xme -> %(FileName).mga</Message>
+ <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(FileName).xme -> %(FileName).mga</Message>
<Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">cd "$(TargetDir)\Gen\tests\test_refports"
"$(UDM_PATH)\etc\xme2udmxml" "%(FullPath)" "%(FileName).mga"
</Command>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">cd "$(TargetDir)\Gen\tests\test_refports"
+"$(UDM_PATH)\etc\xme2udmxml" "%(FullPath)" "%(FileName).mga"
+</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)Gen\tests\test_refports\%(FileName).mga;$(OutDir)Gen\tests\test_refports\RefPort_udm.xml;%(Outputs)</Outputs>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)Gen\tests\test_refports\%(FileName).mga;$(OutDir)Gen\tests\test_refports\RefPort_udm.xml;%(Outputs)</Outputs>
</CustomBuild>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
Modified: UDM/trunk/Projects/Win32/VC10/tests/test_simpleudmops/LampTest.vcxproj
==============================================================================
--- UDM/trunk/Projects/Win32/VC10/tests/test_simpleudmops/LampTest.vcxproj Fri Aug 26 16:42:02 2011 (r3860)
+++ UDM/trunk/Projects/Win32/VC10/tests/test_simpleudmops/LampTest.vcxproj Fri Aug 26 16:42:25 2011 (r3861)
@@ -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">
<ProjectGuid>{200FCF3E-FE47-45ED-B42C-E49BBC4C8A0B}</ProjectGuid>
@@ -20,11 +28,21 @@
<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|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>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
@@ -33,21 +51,28 @@
<Import Project="..\cppunit.props" />
<Import Project="..\UdmTests.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')" />
+ <Import Project="..\cppunit.props" />
+ <Import Project="..\UdmTests.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')" />
<Import Project="..\cppunit.props" />
<Import Project="..\UdmTests.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')" />
+ <Import Project="..\cppunit.props" />
+ <Import Project="..\UdmTests.props" />
+ </ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.21006.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\..\..\Build\Win32\VC10\Release\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)obj\tests\$(ProjectName)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\..\..\Build\Win32\VC10\Debug\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)obj\tests\$(ProjectName)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)</TargetName>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkIncremental>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Midl>
@@ -110,6 +135,66 @@
<Outputs>NONE</Outputs>
</CustomBuildStep>
</ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <Midl>
+ <TypeLibraryName>$(IntDir)LampTest.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>MaxSpeed</Optimization>
+ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+ <AdditionalIncludeDirectories>..\..\..\..\..\include;$(OutDir)Gen\samples;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>UDM_DYNAMIC_LINKING;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <PrecompiledHeaderOutputFile>$(IntDir)LampTest.pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <CompileAs>Default</CompileAs>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x0409</Culture>
+ </ResourceCompile>
+ <Link>
+ <AdditionalDependencies>cppunit.lib</AdditionalDependencies>
+ <OutputFile>$(OutDir)LampTest.exe</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <ProgramDatabaseFile>$(IntDir)LampTest.pdb</ProgramDatabaseFile>
+ <SubSystem>Console</SubSystem>
+ <RandomizedBaseAddress>false</RandomizedBaseAddress>
+ <DataExecutionPrevention>
+ </DataExecutionPrevention>
+ </Link>
+ <PostBuildEvent>
+ <Command>cd "$(OutDir)Gen\samples"
+"$(TargetPath)"
+</Command>
+ </PostBuildEvent>
+ <PreBuildEvent>
+ <Command>
+ </Command>
+ </PreBuildEvent>
+ <CustomBuildStep>
+ <Command>cd "$(OutDir)Gen\samples"
+"$(TargetPath)"
+</Command>
+ </CustomBuildStep>
+ <CustomBuildStep>
+ <Message>Running $(TargetName)</Message>
+ </CustomBuildStep>
+ <CustomBuildStep>
+ <Outputs>NONE</Outputs>
+ </CustomBuildStep>
+ </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Midl>
<TypeLibraryName>$(IntDir)LampTest.tlb</TypeLibraryName>
@@ -167,24 +252,94 @@
</Command>
</PreBuildEvent>
</ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <Midl>
+ <TypeLibraryName>$(IntDir)LampTest.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>..\..\..\..\..\include;$(OutDir)Gen\samples;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;UDM_DYNAMIC_LINKING;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <RuntimeTypeInfo>true</RuntimeTypeInfo>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <PrecompiledHeaderOutputFile>$(IntDir)LampTest.pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ <CompileAs>Default</CompileAs>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x0409</Culture>
+ </ResourceCompile>
+ <Link>
+ <AdditionalDependencies>cppunitd_dllx64.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)LampTest.exe</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(IntDir)LampTest.pdb</ProgramDatabaseFile>
+ <SubSystem>Console</SubSystem>
+ <RandomizedBaseAddress>false</RandomizedBaseAddress>
+ <DataExecutionPrevention>
+ </DataExecutionPrevention>
+ </Link>
+ <PostBuildEvent>
+ <Command>
+ </Command>
+ </PostBuildEvent>
+ <CustomBuildStep>
+ <Command>cd "$(OutDir)Gen\samples"
+"$(TargetPath)"
+</Command>
+ <Message>Running $(TargetName)</Message>
+ <Outputs>NONE</Outputs>
+ </CustomBuildStep>
+ <PreBuildEvent>
+ <Command>
+ </Command>
+ </PreBuildEvent>
+ </ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\..\..\..\..\tests\test_simpleudmops\LampTest.cpp">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
+ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks>
<Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
+ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<ClCompile Include="..\..\..\..\..\tests\test_simpleudmops\UDMTest.cpp">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
+ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks>
<Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
+ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
</ItemGroup>
<ItemGroup>
Modified: UDM/trunk/Projects/Win32/VC10/tests/test_staticleaks/test_staticleaks.vcxproj
==============================================================================
--- UDM/trunk/Projects/Win32/VC10/tests/test_staticleaks/test_staticleaks.vcxproj Fri Aug 26 16:42:02 2011 (r3860)
+++ UDM/trunk/Projects/Win32/VC10/tests/test_staticleaks/test_staticleaks.vcxproj Fri Aug 26 16:42:25 2011 (r3861)
@@ -5,6 +5,10 @@
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{A4DE0E8A-C59B-4B1F-9A2A-775C547DFF39}</ProjectGuid>
@@ -15,6 +19,10 @@
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
@@ -23,6 +31,11 @@
<Import Project="..\UdmTests.props" />
<Import Project="..\cppunit.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="..\UdmTests.props" />
+ <Import Project="..\cppunit.props" />
+ </ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
@@ -30,8 +43,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<CustomBuildStep>
<Message>Running $(ProjectName)</Message>
- <Command>cd "$(OutDir)Gen\tests\test_refports"
-"$(TargetPath)"
+ <Command>"$(TargetPath)"
</Command>
<Outputs>NONE;%(Outputs)</Outputs>
</CustomBuildStep>
@@ -52,6 +64,28 @@
<TargetMachine>MachineX86</TargetMachine>
</Link>
</ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <CustomBuildStep>
+ <Message>Running $(ProjectName)</Message>
+ <Command>"$(TargetPath)"
+</Command>
+ <Outputs>NONE;%(Outputs)</Outputs>
+ </CustomBuildStep>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <WarningLevel>Level3</WarningLevel>
+ </ClCompile>
+ <Link>
+ <AdditionalDependencies>cppunitd_dllx64.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <LargeAddressAware>true</LargeAddressAware>
+ <RandomizedBaseAddress>false</RandomizedBaseAddress>
+ </Link>
+ </ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\..\..\..\..\tests\test_staticleaks\main.cpp" />
<ClCompile Include="..\..\..\..\..\tests\test_staticleaks\test_staticleaks.cpp" />
Modified: UDM/trunk/Projects/Win32/VC10/tests/test_staticleaksdll/test_staticleaksdll.vcxproj
==============================================================================
--- UDM/trunk/Projects/Win32/VC10/tests/test_staticleaksdll/test_staticleaksdll.vcxproj Fri Aug 26 16:42:02 2011 (r3860)
+++ UDM/trunk/Projects/Win32/VC10/tests/test_staticleaksdll/test_staticleaksdll.vcxproj Fri Aug 26 16:42:25 2011 (r3861)
@@ -5,6 +5,10 @@
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{4F3BF916-A9BC-44BA-B867-BA14BE2EE074}</ProjectGuid>
@@ -15,6 +19,10 @@
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
@@ -23,6 +31,11 @@
<Import Project="..\UdmTests.props" />
<Import Project="..\cppunit.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="..\UdmTests.props" />
+ <Import Project="..\cppunit.props" />
+ </ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
@@ -44,6 +57,21 @@
<AdditionalDependencies>cppunitd.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <WarningLevel>Level3</WarningLevel>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ </ClCompile>
+ <Link>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <LargeAddressAware>true</LargeAddressAware>
+ <RandomizedBaseAddress>false</RandomizedBaseAddress>
+ <AdditionalDependencies>cppunitd_dllx64.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ </Link>
+ </ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\..\..\..\..\tests\test_childrenorder\childrenorderTest.cpp" />
<ClCompile Include="..\..\..\..\..\tests\test_staticleaksdll\DllMain.cpp" />
Modified: UDM/trunk/tests/test_generic/genericTest.h
==============================================================================
--- UDM/trunk/tests/test_generic/genericTest.h Fri Aug 26 16:42:02 2011 (r3860)
+++ UDM/trunk/tests/test_generic/genericTest.h Fri Aug 26 16:42:25 2011 (r3861)
@@ -11,7 +11,7 @@
class genericTest : public CPPUNIT_NS::TestFixture
{
CPPUNIT_TEST_SUITE( genericTest );
-#ifdef _WIN32
+#if defined(_WIN32) && defined(_M_IX86)
CPPUNIT_TEST( testDOMMGA );
CPPUNIT_TEST( testMGADOM );
CPPUNIT_TEST( testMGAMGA );
Modified: UDM/trunk/tests/test_libs/LibsTest.h
==============================================================================
--- UDM/trunk/tests/test_libs/LibsTest.h Fri Aug 26 16:42:02 2011 (r3860)
+++ UDM/trunk/tests/test_libs/LibsTest.h Fri Aug 26 16:42:25 2011 (r3861)
@@ -15,7 +15,7 @@
class LibsTest : public CPPUNIT_NS::TestFixture
{
CPPUNIT_TEST_SUITE( LibsTest );
-#ifdef _WIN32
+#if defined(_WIN32) && defined(_M_IX86)
CPPUNIT_TEST( testMGA );
#endif
CPPUNIT_TEST( testDOM );
Modified: UDM/trunk/tests/test_refports/RefPortsTest.h
==============================================================================
--- UDM/trunk/tests/test_refports/RefPortsTest.h Fri Aug 26 16:42:02 2011 (r3860)
+++ UDM/trunk/tests/test_refports/RefPortsTest.h Fri Aug 26 16:42:25 2011 (r3861)
@@ -13,7 +13,7 @@
CPPUNIT_TEST_SUITE( refPortsTest );
CPPUNIT_TEST(testDOM);
CPPUNIT_TEST(testMEM);
-#ifdef _WIN32
+#if defined(_WIN32) && defined(_M_IX86)
CPPUNIT_TEST(testMGA);
#endif
CPPUNIT_TEST_SUITE_END();
Modified: UDM/trunk/tests/test_staticleaks/main.cpp
==============================================================================
--- UDM/trunk/tests/test_staticleaks/main.cpp Fri Aug 26 16:42:02 2011 (r3860)
+++ UDM/trunk/tests/test_staticleaks/main.cpp Fri Aug 26 16:42:25 2011 (r3861)
@@ -21,15 +21,27 @@
{
DebugBreak();
}
+
+struct _CrtHooksRAII {
+ _CrtHooksRAII() {
+ oldAbrtHandler = signal(SIGABRT, &AbrtHandler);
+ _CrtSetReportMode(_CRT_ASSERT, _CRTDBG_MODE_DEBUG);
+ _set_abort_behavior(0, _WRITE_ABORT_MSG);
+ oldHook = _CrtSetReportHook(&CrtReportHook);
+ }
+ ~_CrtHooksRAII() {
+ _CrtSetReportHook(oldHook);
+ signal(SIGABRT, oldAbrtHandler);
+ }
+ _CRT_REPORT_HOOK oldHook;
+ void (__cdecl *oldAbrtHandler)(int);
+};
#endif
int main(int argc, char* argv[])
{
#ifdef _WIN32
- signal(SIGABRT, &AbrtHandler);
- _CrtSetReportMode(_CRT_ASSERT, _CRTDBG_MODE_DEBUG);
- _set_abort_behavior(0, _WRITE_ABORT_MSG);
- _CrtSetReportHook(&CrtReportHook);
+ _CrtHooksRAII hooks;
#endif
CPPUNIT_NS::Test *suite = CPPUNIT_NS::TestFactoryRegistry::getRegistry().makeTest();
Modified: UDM/trunk/tests/test_staticleaks/test_staticleaks.cpp
==============================================================================
--- UDM/trunk/tests/test_staticleaks/test_staticleaks.cpp Fri Aug 26 16:42:02 2011 (r3860)
+++ UDM/trunk/tests/test_staticleaks/test_staticleaks.cpp Fri Aug 26 16:42:25 2011 (r3861)
@@ -31,7 +31,11 @@
_CrtMemState dllState;
HMODULE test_staticleaksdll = LoadLibrary("test_staticleaksdll.dll");
+#if defined(_M_AMD64)
+ init = (init_t)GetProcAddress(test_staticleaksdll , "?init@@YAXPEAX at Z");
+#elif defined(_M_IX86)
init = (init_t)GetProcAddress(test_staticleaksdll , "?init@@YAXPAX at Z");
+#endif
init(&dllState);
typedef void (*terminate_t)();
More information about the Mobies-commit
mailing list