[Mobies-commit] [commit] r3864 - UDM/trunk/include

[ksmyth at redhat1.isis.vanderbilt.edu]

Author: ksmyth
Date: Fri Aug 26 16:43:38 2011
New Revision: 3864

Log:
Link to x64 automatically

Modified:
   UDM/trunk/include/ErrHand.h

Modified: UDM/trunk/include/ErrHand.h
==============================================================================
--- UDM/trunk/include/ErrHand.h	Fri Aug 26 16:43:22 2011	(r3863)
+++ UDM/trunk/include/ErrHand.h	Fri Aug 26 16:43:38 2011	(r3864)
@@ -41,11 +41,19 @@
 #define UDM_NAMESPACE Udm_VS10
 namespace UDM_NAMESPACE {};
 namespace Udm = UDM_NAMESPACE;
+#if defined(_M_AMD64)
+#ifdef _DEBUG
+#define UDM_DLL_LIB "UdmDll_v100_x64D.lib"
+#else
+#define UDM_DLL_LIB "UdmDll_v100_x64.lib"
+#endif
+#elif defined(_M_IX86)
 #ifdef _DEBUG
 #define UDM_DLL_LIB "UdmDll_VS10D.lib"
 #else
 #define UDM_DLL_LIB "UdmDll_VS10.lib"
 #endif
+#endif
 #define UDM_RVALUE
 #else
 #define UDM_NAMESPACE Udm
@@ -56,7 +64,7 @@
 #endif
 #endif /* _MSC_VER == 1600 */
 
-#if defined(UDM_DYNAMIC_LINKING) && !defined(UDM_DLL_EXPORT)
+#if defined(UDM_DYNAMIC_LINKING) && !defined(UDM_DLL_EXPORT) && defined(UDM_DLL_LIB)
 #pragma comment(lib, UDM_DLL_LIB)
 #endif
 #else