[Mobies-commit] [commit] r4012 - in UDM/trunk/Projects/Win32/VC10/src: . Udm Udm/File2Code Udm/JavaAPIGen UdmXmi
ksmyth at redhat1.isis.vanderbilt.edu
ksmyth at redhat1.isis.vanderbilt.edu
Thu Mar 15 11:45:57 CDT 2012
Author: ksmyth
Date: Thu Mar 15 11:45:57 2012
New Revision: 4012
Log:
Compile Udm.exe under x64
Modified:
UDM/trunk/Projects/Win32/VC10/src/Udm.sln
UDM/trunk/Projects/Win32/VC10/src/Udm/File2Code/File2Code.vcxproj
UDM/trunk/Projects/Win32/VC10/src/Udm/JavaAPIGen/JavaAPIGen.vcxproj
UDM/trunk/Projects/Win32/VC10/src/Udm/Udm.vcxproj
UDM/trunk/Projects/Win32/VC10/src/UdmXmi/UdmXmi.vcxproj
Modified: UDM/trunk/Projects/Win32/VC10/src/Udm.sln
==============================================================================
--- UDM/trunk/Projects/Win32/VC10/src/Udm.sln Thu Mar 15 11:45:39 2012 (r4011)
+++ UDM/trunk/Projects/Win32/VC10/src/Udm.sln Thu Mar 15 11:45:57 2012 (r4012)
@@ -118,9 +118,11 @@
{CA16ED97-F738-4FAF-985C-FAE05AED8D07}.Debug|Win32.ActiveCfg = Debug|Win32
{CA16ED97-F738-4FAF-985C-FAE05AED8D07}.Debug|Win32.Build.0 = Debug|Win32
{CA16ED97-F738-4FAF-985C-FAE05AED8D07}.Debug|x64.ActiveCfg = Debug|x64
+ {CA16ED97-F738-4FAF-985C-FAE05AED8D07}.Debug|x64.Build.0 = Debug|x64
{CA16ED97-F738-4FAF-985C-FAE05AED8D07}.Release|Win32.ActiveCfg = Release|Win32
{CA16ED97-F738-4FAF-985C-FAE05AED8D07}.Release|Win32.Build.0 = Release|Win32
{CA16ED97-F738-4FAF-985C-FAE05AED8D07}.Release|x64.ActiveCfg = Release|x64
+ {CA16ED97-F738-4FAF-985C-FAE05AED8D07}.Release|x64.Build.0 = Release|x64
{E663042B-F135-4502-B7A1-D62F21126E3B}.BootUdmCompile Debug|Win32.ActiveCfg = Debug|Win32
{E663042B-F135-4502-B7A1-D62F21126E3B}.BootUdmCompile Debug|x64.ActiveCfg = Debug|x64
{E663042B-F135-4502-B7A1-D62F21126E3B}.BootUdmCompile Debug|x64.Build.0 = Debug|x64
@@ -281,9 +283,11 @@
{51A35FC8-1D28-4B8A-9592-CE334FFA7539}.Debug|Win32.ActiveCfg = Debug|Win32
{51A35FC8-1D28-4B8A-9592-CE334FFA7539}.Debug|Win32.Build.0 = Debug|Win32
{51A35FC8-1D28-4B8A-9592-CE334FFA7539}.Debug|x64.ActiveCfg = Debug|x64
+ {51A35FC8-1D28-4B8A-9592-CE334FFA7539}.Debug|x64.Build.0 = Debug|x64
{51A35FC8-1D28-4B8A-9592-CE334FFA7539}.Release|Win32.ActiveCfg = Release|Win32
{51A35FC8-1D28-4B8A-9592-CE334FFA7539}.Release|Win32.Build.0 = Release|Win32
{51A35FC8-1D28-4B8A-9592-CE334FFA7539}.Release|x64.ActiveCfg = Release|x64
+ {51A35FC8-1D28-4B8A-9592-CE334FFA7539}.Release|x64.Build.0 = Release|x64
{DCBD6ED0-5DD4-4C81-AF53-12F6F3D810B5}.BootUdmCompile Debug|Win32.ActiveCfg = Debug|Win32
{DCBD6ED0-5DD4-4C81-AF53-12F6F3D810B5}.BootUdmCompile Debug|x64.ActiveCfg = Debug|x64
{DCBD6ED0-5DD4-4C81-AF53-12F6F3D810B5}.BootUdmCompile Debug|x64.Build.0 = Debug|x64
@@ -293,9 +297,11 @@
{DCBD6ED0-5DD4-4C81-AF53-12F6F3D810B5}.Debug|Win32.ActiveCfg = Debug|Win32
{DCBD6ED0-5DD4-4C81-AF53-12F6F3D810B5}.Debug|Win32.Build.0 = Debug|Win32
{DCBD6ED0-5DD4-4C81-AF53-12F6F3D810B5}.Debug|x64.ActiveCfg = Debug|x64
+ {DCBD6ED0-5DD4-4C81-AF53-12F6F3D810B5}.Debug|x64.Build.0 = Debug|x64
{DCBD6ED0-5DD4-4C81-AF53-12F6F3D810B5}.Release|Win32.ActiveCfg = Release|Win32
{DCBD6ED0-5DD4-4C81-AF53-12F6F3D810B5}.Release|Win32.Build.0 = Release|Win32
{DCBD6ED0-5DD4-4C81-AF53-12F6F3D810B5}.Release|x64.ActiveCfg = Release|x64
+ {DCBD6ED0-5DD4-4C81-AF53-12F6F3D810B5}.Release|x64.Build.0 = Release|x64
{AA870453-DBEA-4162-9699-563A975E5A84}.BootUdmCompile Debug|Win32.ActiveCfg = Debug|Win32
{AA870453-DBEA-4162-9699-563A975E5A84}.BootUdmCompile Debug|x64.ActiveCfg = Debug|x64
{AA870453-DBEA-4162-9699-563A975E5A84}.BootUdmCompile Debug|x64.Build.0 = Debug|x64
@@ -344,6 +350,7 @@
{2B0484D0-D5BB-4238-BBC3-A37A20CDC493}.Release|Win32.ActiveCfg = Release|Win32
{2B0484D0-D5BB-4238-BBC3-A37A20CDC493}.Release|Win32.Build.0 = Release|Win32
{2B0484D0-D5BB-4238-BBC3-A37A20CDC493}.Release|x64.ActiveCfg = Release|x64
+ {2B0484D0-D5BB-4238-BBC3-A37A20CDC493}.Release|x64.Build.0 = Release|x64
{6A53E343-14C2-4463-A9C8-332DAE560EAF}.BootUdmCompile Debug|Win32.ActiveCfg = BootUdmCompile Debug|Win32
{6A53E343-14C2-4463-A9C8-332DAE560EAF}.BootUdmCompile Debug|Win32.Build.0 = BootUdmCompile Debug|Win32
{6A53E343-14C2-4463-A9C8-332DAE560EAF}.BootUdmCompile Debug|x64.ActiveCfg = BootUdmCompile Debug|x64
Modified: UDM/trunk/Projects/Win32/VC10/src/Udm/File2Code/File2Code.vcxproj
==============================================================================
--- UDM/trunk/Projects/Win32/VC10/src/Udm/File2Code/File2Code.vcxproj Thu Mar 15 11:45:39 2012 (r4011)
+++ UDM/trunk/Projects/Win32/VC10/src/Udm/File2Code/File2Code.vcxproj Thu Mar 15 11:45:57 2012 (r4012)
@@ -48,24 +48,22 @@
</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="..\..\..\..\..\..\Udm_x64.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')" />
</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="..\..\..\..\..\..\Udm_x64.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.21006.1</_ProjectFileVersion>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\..\..\..\Build\Win32\VC10\Debug\</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\..\..\..\Build\Win32\VC10\Debug\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)obj\src\Udm\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)obj\src\Udm\$(ProjectName)\</IntDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\..\..\..\Build\Win32\VC10\Release\</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\..\..\..\Build\Win32\VC10\Release\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)obj\src\Udm\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)obj\src\Udm\$(ProjectName)\</IntDir>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)D</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectName)D</TargetName>
</PropertyGroup>
Modified: UDM/trunk/Projects/Win32/VC10/src/Udm/JavaAPIGen/JavaAPIGen.vcxproj
==============================================================================
--- UDM/trunk/Projects/Win32/VC10/src/Udm/JavaAPIGen/JavaAPIGen.vcxproj Thu Mar 15 11:45:39 2012 (r4011)
+++ UDM/trunk/Projects/Win32/VC10/src/Udm/JavaAPIGen/JavaAPIGen.vcxproj Thu Mar 15 11:45:57 2012 (r4012)
@@ -48,24 +48,22 @@
</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="..\..\..\..\..\..\Udm_x64.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')" />
</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="..\..\..\..\..\..\Udm_x64.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.21006.1</_ProjectFileVersion>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\..\..\..\Build\Win32\VC10\Debug\</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\..\..\..\Build\Win32\VC10\Debug\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)obj\src\Udm\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)obj\src\Udm\$(ProjectName)\</IntDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\..\..\..\Build\Win32\VC10\Release\</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\..\..\..\Build\Win32\VC10\Release\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)obj\src\Udm\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)obj\src\Udm\$(ProjectName)\</IntDir>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)D</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectName)D</TargetName>
</PropertyGroup>
Modified: UDM/trunk/Projects/Win32/VC10/src/Udm/Udm.vcxproj
==============================================================================
--- UDM/trunk/Projects/Win32/VC10/src/Udm/Udm.vcxproj Thu Mar 15 11:45:39 2012 (r4011)
+++ UDM/trunk/Projects/Win32/VC10/src/Udm/Udm.vcxproj Thu Mar 15 11:45:57 2012 (r4012)
@@ -59,6 +59,7 @@
<Import Project="..\boost.props" />
<Import Project="..\Xerces-c.props" />
<Import Project="..\Xalan-c.props" />
+ <Import Project="..\..\..\..\..\Udm_x64.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')" />
@@ -73,20 +74,17 @@
<Import Project="..\boost.props" />
<Import Project="..\Xerces-c.props" />
<Import Project="..\Xalan-c.props" />
+ <Import Project="..\..\..\..\..\Udm_x64.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.21006.1</_ProjectFileVersion>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\..\..\Build\Win32\VC10\$(Configuration)\</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\..\..\Build\Win32\VC10\$(Configuration)\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)obj\src\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)obj\src\$(ProjectName)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkIncremental>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\..\..\Build\Win32\VC10\$(Configuration)\</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\..\..\Build\Win32\VC10\$(Configuration)\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)obj\src\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)obj\src\$(ProjectName)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)D</TargetName>
@@ -102,7 +100,7 @@
<AdditionalOptions>/Zm1000 %(AdditionalOptions)</AdditionalOptions>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\..\..\..\include;..\..\..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_DEBUG;WIN32;_CONSOLE;_CRT_SECURE_NO_WARNINGS;-D_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>_DEBUG;WIN32;_CONSOLE;_CRT_SECURE_NO_WARNINGS;NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
@@ -122,7 +120,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>UmlD.lib;File2CodeD.lib;JavaAPIGenD.lib;UdmXmiD.lib;UdmBaseD.lib;UdmDomD.lib;UdmUtilD.lib;xerces-c_2.lib;Xalan-C_1.lib;zlibD.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>xerces-c_2.lib;Xalan-C_1.lib;zlibD.lib;%(AdditionalDependencies)</AdditionalDependencies>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
@@ -149,7 +147,7 @@
<AdditionalOptions>/Zm1000 %(AdditionalOptions)</AdditionalOptions>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\..\..\..\include;..\..\..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_DEBUG;WIN32;_CONSOLE;_CRT_SECURE_NO_WARNINGS;-D_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>_DEBUG;WIN32;_CONSOLE;_CRT_SECURE_NO_WARNINGS;NOMINMAX;NO_XALAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
@@ -169,9 +167,9 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>UmlD.lib;File2CodeD.lib;JavaAPIGenD.lib;UdmXmiD.lib;UdmBaseD.lib;UdmDomD.lib;UdmUtilD.lib;xerces-c_2.lib;Xalan-C_1.lib;zlibD.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>xerces-c_2_x64.lib;zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
<SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(UDM_3RDPARTY_PATH)\zlib-1.2.5\contrib\vstudio\vc10\x64\ZlibDllRelease;$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(IntDir)Udmd.pdb</ProgramDatabaseFile>
<GenerateMapFile>true</GenerateMapFile>
@@ -196,7 +194,7 @@
<Optimization>MaxSpeed</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<AdditionalIncludeDirectories>..\..\..\..\..\include;..\..\..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>NDEBUG;WIN32;_CONSOLE;_CRT_SECURE_NO_WARNINGS;-D_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>NDEBUG;WIN32;_CONSOLE;_CRT_SECURE_NO_WARNINGS;NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
@@ -215,7 +213,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>Uml.lib;File2Code.lib;JavaAPIGen.lib;UdmXmi.lib;UdmBase.lib;Xalan-C_1.lib;UdmDom.lib;UdmUtil.lib;xerces-c_2.lib;zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>Xalan-C_1.lib;xerces-c_2.lib;zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
@@ -241,7 +239,7 @@
<Optimization>MaxSpeed</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<AdditionalIncludeDirectories>..\..\..\..\..\include;..\..\..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>NDEBUG;WIN32;_CONSOLE;_CRT_SECURE_NO_WARNINGS;-D_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>NDEBUG;WIN32;_CONSOLE;_CRT_SECURE_NO_WARNINGS;NOMINMAX;NO_XALAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
@@ -260,9 +258,9 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>Uml.lib;File2Code.lib;JavaAPIGen.lib;UdmXmi.lib;UdmBase.lib;Xalan-C_1.lib;UdmDom.lib;UdmUtil.lib;xerces-c_2.lib;zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>xerces-c_2_x64.lib;zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
<SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(UDM_3RDPARTY_PATH)\zlib-1.2.5\contrib\vstudio\vc10\x64\ZlibDllRelease;$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(IntDir)$(TargetName).pdb</ProgramDatabaseFile>
<SubSystem>Console</SubSystem>
@@ -270,9 +268,7 @@
<DataExecutionPrevention>
</DataExecutionPrevention>
</Link>
- <PostBuildEvent>
- <Command>copy "$(TargetPath)" "$(UDM_PATH)"\bin</Command>
- </PostBuildEvent>
+ <PostBuildEvent />
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\..\..\..\..\src\Udm\ClassGen.cpp" />
@@ -335,7 +331,6 @@
</ProjectReference>
<ProjectReference Include="..\UdmXmi\UdmXmi.vcxproj">
<Project>{ca16ed97-f738-4faf-985c-fae05aed8d07}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
<ProjectReference Include="..\Uml\Uml.vcxproj">
<Project>{6a53e343-14c2-4463-a9c8-332dae560eaf}</Project>
Modified: UDM/trunk/Projects/Win32/VC10/src/UdmXmi/UdmXmi.vcxproj
==============================================================================
--- UDM/trunk/Projects/Win32/VC10/src/UdmXmi/UdmXmi.vcxproj Thu Mar 15 11:45:39 2012 (r4011)
+++ UDM/trunk/Projects/Win32/VC10/src/UdmXmi/UdmXmi.vcxproj Thu Mar 15 11:45:57 2012 (r4012)
@@ -55,6 +55,7 @@
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
<Import Project="..\Xerces-c.props" />
<Import Project="..\Xalan-c.props" />
+ <Import Project="..\..\..\..\..\Udm_x64.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')" />
@@ -65,18 +66,15 @@
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
<Import Project="..\Xerces-c.props" />
<Import Project="..\Xalan-c.props" />
+ <Import Project="..\..\..\..\..\Udm_x64.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.21006.1</_ProjectFileVersion>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\..\..\Build\Win32\VC10\Debug\</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\..\..\Build\Win32\VC10\Debug\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)obj\src\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)obj\src\$(ProjectName)\</IntDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\..\..\Build\Win32\VC10\Release\</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\..\..\Build\Win32\VC10\Release\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)obj\src\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)obj\src\$(ProjectName)\</IntDir>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)D</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectName)D</TargetName>
</PropertyGroup>
More information about the Mobies-commit
mailing list