[Mobies-commit] [commit] r3968 - in UDM/trunk: . Projects/Win32/VC10/src/UdmDll

[ksmyth at redhat1.isis.vanderbilt.edu]

Author: ksmyth
Date: Mon Nov 28 15:47:32 2011
New Revision: 3968

Log:
Cleanup x64 compile

Modified:
   UDM/trunk/Projects/Win32/VC10/src/UdmDll/UdmDll.vcxproj
   UDM/trunk/Udm_x64.props

Modified: UDM/trunk/Projects/Win32/VC10/src/UdmDll/UdmDll.vcxproj
==============================================================================
--- UDM/trunk/Projects/Win32/VC10/src/UdmDll/UdmDll.vcxproj	Mon Nov 28 15:14:21 2011	(r3967)
+++ UDM/trunk/Projects/Win32/VC10/src/UdmDll/UdmDll.vcxproj	Mon Nov 28 15:47:32 2011	(r3968)
@@ -304,7 +304,6 @@
       <ImportLibrary>$(OutDir)UdmDll_$(PlatformToolset)_$(Platform)D.lib</ImportLibrary>
       <ForceSymbolReferences>
       </ForceSymbolReferences>
-      <IgnoreSpecificDefaultLibraries>UdmGmeD;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
     </Link>
     <PostBuildEvent />
     <CustomBuildStep>
@@ -343,6 +342,10 @@
     <ProjectReference Include="..\UdmOclPat\GOCL\src\GOCL.vcxproj">
       <Project>{ee407066-7819-4ae2-b0f5-e64fc5e54415}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+      <Private>false</Private>
+      <CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
+      <LinkLibraryDependencies>false</LinkLibraryDependencies>
+      <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
     </ProjectReference>
     <ProjectReference Include="..\UdmOcl\UdmOcl.vcxproj">
       <Project>{5106c980-bc3d-48c5-a033-0d58c20f9980}</Project>

Modified: UDM/trunk/Udm_x64.props
==============================================================================
--- UDM/trunk/Udm_x64.props	Mon Nov 28 15:14:21 2011	(r3967)
+++ UDM/trunk/Udm_x64.props	Mon Nov 28 15:47:32 2011	(r3968)
@@ -1,45 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ImportGroup Label="PropertySheets" />
-  <PropertyGroup Label="UserMacros">
-    <META_PATH>$(MSBuildThisFileDirectory)</META_PATH>
-    <VCP_PATH>$(MSBuildThisFileDirectory)\externals</VCP_PATH>
-    <DESERT_PATH>$(MSBuildThisFileDirectory)\externals\desert</DESERT_PATH>
-    <UdmCliGen>$(MSBuildThisFileDirectory)\externals\common-scripts\UdmCliGen\UdmCliGen.exe</UdmCliGen>
-    <THIRDPARTY_PATH>$(MSBuildThisFileDirectory)\3rdParty</THIRDPARTY_PATH>
-  </PropertyGroup>
+  <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <OutDir>..\..\..\..\..\Build\$(Platform)\VC10\$(Configuration)\</OutDir>
     <IntDir>$(OutDir)obj\src\$(ProjectName)\</IntDir>
   </PropertyGroup>
   <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(META_PATH)\generated;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
+    <ClCompile />
     <Link>
-      <AdditionalLibraryDirectories>$(META_PATH)\src\bin;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
-  <ItemGroup>
-    <BuildMacro Include="META_PATH">
-      <Value>$(META_PATH)</Value>
-      <EnvironmentVariable>true</EnvironmentVariable>
-    </BuildMacro>
-    <BuildMacro Include="VCP_PATH">
-      <Value>$(VCP_PATH)</Value>
-      <EnvironmentVariable>true</EnvironmentVariable>
-    </BuildMacro>
-    <BuildMacro Include="DESERT_PATH">
-      <Value>$(DESERT_PATH)</Value>
-      <EnvironmentVariable>true</EnvironmentVariable>
-    </BuildMacro>
-    <BuildMacro Include="UdmCliGen">
-      <Value>$(UdmCliGen)</Value>
-      <EnvironmentVariable>true</EnvironmentVariable>
-    </BuildMacro>
-    <BuildMacro Include="THIRDPARTY_PATH">
-      <Value>$(THIRDPARTY_PATH)</Value>
-      <EnvironmentVariable>true</EnvironmentVariable>
-    </BuildMacro>
-  </ItemGroup>
+  <ItemGroup />
 </Project>
\ No newline at end of file