[Mobies-commit] [commit] r3986 - in UDM/trunk: Projects/Win32/VC10/src/UdmGme src/UdmGme

ksmyth at redhat1.isis.vanderbilt.edu ksmyth at redhat1.isis.vanderbilt.edu
Thu Jan 12 15:19:05 CST 2012 

Author: ksmyth
Date: Thu Jan 12 15:19:05 2012
New Revision: 3986

Log:
Fix for building on x64 without x86 GME

Modified:
   UDM/trunk/Projects/Win32/VC10/src/UdmGme/UdmGme.vcxproj
   UDM/trunk/src/UdmGme/CommonHeaders.h
   UDM/trunk/src/UdmGme/UdmGme.cpp
   UDM/trunk/src/UdmGme/imports.cpp

Modified: UDM/trunk/Projects/Win32/VC10/src/UdmGme/UdmGme.vcxproj
==============================================================================
--- UDM/trunk/Projects/Win32/VC10/src/UdmGme/UdmGme.vcxproj	Thu Jan 12 15:18:42 2012	(r3985)
+++ UDM/trunk/Projects/Win32/VC10/src/UdmGme/UdmGme.vcxproj	Thu Jan 12 15:19:05 2012	(r3986)
@@ -90,7 +90,7 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
-      <AdditionalIncludeDirectories>$(GME_ROOT)\Interfaces;$(GME_ROOT)\GME\Interfaces;..\..\..\..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(GME_ROOT)\Interfaces;$(GME_ROOT)\GME\Interfaces;..\..\..\..\..\include;$(GME_ROOT)\bin;$(GME_ROOT)\GME\Release;$(GME_ROOT)\GME\Debug;$(GME_ROOT)\GME\x64\Release;$(GME_ROOT)\GME\x64\Debug;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -124,7 +124,7 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
-      <AdditionalIncludeDirectories>$(GME_ROOT)\Interfaces;$(GME_ROOT)\GME\Interfaces;..\..\..\..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(GME_ROOT)\Interfaces;$(GME_ROOT)\GME\Interfaces;..\..\..\..\..\include;$(GME_ROOT)\bin;$(GME_ROOT)\GME\Release;$(GME_ROOT)\GME\Debug;$(GME_ROOT)\GME\x64\Release;$(GME_ROOT)\GME\x64\Debug;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -156,7 +156,7 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
-      <AdditionalIncludeDirectories>$(GME_ROOT)\Interfaces;$(GME_ROOT)\GME\Interfaces;..\..\..\..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(GME_ROOT)\Interfaces;$(GME_ROOT)\GME\Interfaces;..\..\..\..\..\include;$(GME_ROOT)\bin;$(GME_ROOT)\GME\Release;$(GME_ROOT)\GME\Debug;$(GME_ROOT)\GME\x64\Release;$(GME_ROOT)\GME\x64\Debug;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -188,7 +188,7 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
-      <AdditionalIncludeDirectories>$(GME_ROOT)\Interfaces;$(GME_ROOT)\GME\Interfaces;..\..\..\..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(GME_ROOT)\Interfaces;$(GME_ROOT)\GME\Interfaces;..\..\..\..\..\include;$(GME_ROOT)\bin;$(GME_ROOT)\GME\Release;$(GME_ROOT)\GME\Debug;$(GME_ROOT)\GME\x64\Release;$(GME_ROOT)\GME\x64\Debug;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -207,8 +207,6 @@
     <ClCompile Include="..\..\..\..\..\src\UdmGme\UdmGme.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>
@@ -219,8 +217,6 @@
       </PrecompiledHeader>
       <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>

Modified: UDM/trunk/src/UdmGme/CommonHeaders.h
==============================================================================
--- UDM/trunk/src/UdmGme/CommonHeaders.h	Thu Jan 12 15:18:42 2012	(r3985)
+++ UDM/trunk/src/UdmGme/CommonHeaders.h	Thu Jan 12 15:19:05 2012	(r3986)
@@ -22,11 +22,25 @@
 */
 
 // KMS: these renames are for GME r1365 (Work around "MIDL changes the case of identifier in generated type library" http://support.microsoft.com/kb/q220137/)
-#import "progid:Mga.MgaMetaFolder" version("1.0") no_implementation rename("Kind", "kind")
-#import "progid:Mga.MgaFolders" version("1.0") no_implementation rename("Dst", "dst") rename("Src", "src") rename("Kind", "kind")
-#import "progid:Mga.CoreBinFile" version("1.0") no_implementation
-// GMELib
-#import "libid:0ADEEC71-D83A-11D3-B36B-005004CC8592" no_implementation
+#if !defined(__INTELLISENSE__)
+#import "file:Core.dll" version("1.0") no_implementation
+#import "file:Meta.dll" version("1.0") no_implementation rename("Kind", "kind")
+#import "file:Mga.dll" version("1.0") no_implementation rename("Dst", "dst") rename("Src", "src") rename("Kind", "kind")
+#else
+// IntelliSense has a known issue with the above lines.
+//  http://connect.microsoft.com/VisualStudio/feedback/details/533526/vc-2010-intellisense-import-directive-using-libid-does-not-work
+#ifdef _DEBUG
+// If IntelliSense reports "Cannot open source file", compile then reopen the project
+// KMS: VS intellisense has a hard time loading from typelib GUID. This fixes it:
+#include "C:\Users\ksmyth\git\UDM\Build\Win32\VC10\Debug\obj\src\UdmGme\Core.tlh"
+#include "C:\Users\ksmyth\git\UDM\Build\Win32\VC10\Debug\obj\src\UdmGme\Mga.tlh"
+#include "C:\Users\ksmyth\git\UDM\Build\Win32\VC10\Debug\obj\src\UdmGme\Meta.tlh"
+#else
+#include "C:\Users\ksmyth\git\UDM\Build\Win32\VC10\Release\obj\src\UdmGme\Core.tlh"
+#include "C:\Users\ksmyth\git\UDM\Build\Win32\VC10\Release\obj\src\UdmGme\Mga.tlh"
+#include "C:\Users\ksmyth\git\UDM\Build\Win32\VC10\Release\obj\src\UdmGme\Meta.tlh"
+#endif
+#endif
 
 
 //only this is needed from the UdmGme namespace.

Modified: UDM/trunk/src/UdmGme/UdmGme.cpp
==============================================================================
--- UDM/trunk/src/UdmGme/UdmGme.cpp	Thu Jan 12 15:18:42 2012	(r3985)
+++ UDM/trunk/src/UdmGme/UdmGme.cpp	Thu Jan 12 15:19:05 2012	(r3986)
@@ -251,9 +251,6 @@
 #undef INTERFACEVERSION_INCLUDED
 #undef INTERFACE_VERSION
 
-// KMS: VS intellisense has a hard time loading from typelib GUID. This fixes it:
-//#include "C:\Users\ksmyth\git\UDM\Build\Win32\VC10\Release\obj\src\UdmGme\Mga.tlh"
-//#include "C:\Users\ksmyth\git\UDM\Build\Win32\VC10\Release\obj\src\UdmGme\Meta.tlh"
 
 
 namespace UdmGme 

Modified: UDM/trunk/src/UdmGme/imports.cpp
==============================================================================
--- UDM/trunk/src/UdmGme/imports.cpp	Thu Jan 12 15:18:42 2012	(r3985)
+++ UDM/trunk/src/UdmGme/imports.cpp	Thu Jan 12 15:19:05 2012	(r3986)
@@ -1,8 +1,6 @@
 #pragma warning( disable : 4786 )
 #include "CommonHeaders.h"
 
-#import "progid:Mga.MgaMetaFolder" version("1.0") implementation_only rename("Kind", "kind")
-#import "progid:Mga.MgaFolders" version("1.0") implementation_only rename("Dst", "dst") rename("Src", "src") rename("Kind", "kind")
-#import "progid:Mga.CoreBinFile" version("1.0") implementation_only
-// GMELib
-#import "libid:0ADEEC71-D83A-11D3-B36B-005004CC8592" implementation_only
+#import "file:Core.dll" version("1.0") implementation_only
+#import "file:Meta.dll" version("1.0") implementation_only rename("Kind", "kind")
+#import "file:Mga.dll" version("1.0") implementation_only rename("Dst", "dst") rename("Src", "src") rename("Kind", "kind")

More information about the Mobies-commit mailing list