[Mobies-commit] [commit] r3632 - in UDM/trunk/Projects/Win32/VC10: samples/CreateLampModel tests/test_simpleudmops

[ksmyth at redhat1.isis.vanderbilt.edu]

Author: ksmyth
Date: Tue Feb  1 12:05:19 2011
New Revision: 3632

Log:
Use UDM_DYNAMIC_LINKING

Modified:
   UDM/trunk/Projects/Win32/VC10/samples/CreateLampModel/CreateLampModel.vcxproj
   UDM/trunk/Projects/Win32/VC10/tests/test_simpleudmops/LampTest.vcxproj

Modified: UDM/trunk/Projects/Win32/VC10/samples/CreateLampModel/CreateLampModel.vcxproj
==============================================================================
--- UDM/trunk/Projects/Win32/VC10/samples/CreateLampModel/CreateLampModel.vcxproj	Mon Jan 31 23:20:01 2011	(r3631)
+++ UDM/trunk/Projects/Win32/VC10/samples/CreateLampModel/CreateLampModel.vcxproj	Tue Feb  1 12:05:19 2011	(r3632)
@@ -61,7 +61,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;UDM_DYNAMIC_LINKING;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>
@@ -84,7 +84,7 @@
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>UmlD.lib;UdmBaseD.lib;UdmDomD.lib;UdmGmeD.lib;UdmUtilD.lib;Xerces-c_2D.lib;zlibD.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)CreateLampModelD.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -193,7 +193,6 @@
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(UDM_PATH)\bin\UdmD.exe" -o "$(GenPath)" "%(FullPath)" -v
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GenPath)\LampDiagram.xsd;$(GenPath)\LampDiagram.cpp;$(GenPath)\LampDiagram.h;%(Outputs)</Outputs>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
     </CustomBuild>
     <CustomBuild Include="$(ReleaseGenPath)\LampDiagram_udm.xml">
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">LampDiagram_udm.xml -&gt; C++ API</Message>
@@ -209,6 +208,10 @@
 "$(UDM_PATH)\etc\xme2udmxml" "%(FullPath)" "%(FileName).mga"
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GenPath)\%(FileName).mga</Outputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">cd "$(GenPath)"
+"$(UDM_PATH)\etc\xme2udmxml" "%(FullPath)" "%(FileName).mga"
+</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GenPath)\%(FileName).mga</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	Mon Jan 31 23:20:01 2011	(r3631)
+++ UDM/trunk/Projects/Win32/VC10/tests/test_simpleudmops/LampTest.vcxproj	Tue Feb  1 12:05:19 2011	(r3632)
@@ -102,7 +102,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\..\..\..\..\include;$(OutDir)Gen\samples;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;UDM_DYNAMIC_LINKING;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
@@ -122,7 +122,7 @@
       <Culture>0x0409</Culture>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>UmlD.lib;UdmBaseD.lib;UdmDomD.lib;UdmGmeD.lib;UdmUtilD.lib;Xerces-c_2D.lib;zlibD.lib;cppunitd_dll.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>cppunitd_dll.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)LampTest.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>