[commit] r1384 - in trunk/GME: ConstraintManager Core Gme Interfaces Meta Mga MgaUtil Parser PartBrowser XmlBackEnd
GMESRC Repository Notifications
gme-commit at list.isis.vanderbilt.edu
Mon Jun 27 16:22:12 CDT 2011
Author: ksmyth
Date: Mon Jun 27 16:22:11 2011
New Revision: 1384
Log:
Move midling *Lib.idl to Interfaces, so updating dlls doesnt trigger a rebuild on #imports
Modified:
trunk/GME/ConstraintManager/ConstraintManager.idl
trunk/GME/ConstraintManager/ConstraintManager.vcxproj
trunk/GME/Core/Core.vcxproj
trunk/GME/Core/Core.vcxproj.filters
trunk/GME/Gme/GME.vcxproj
trunk/GME/Gme/GME.vcxproj.filters
trunk/GME/Gme/GmeLib.idl
trunk/GME/Interfaces/Interfaces.vcxproj
trunk/GME/Interfaces/Interfaces.vcxproj.filters
trunk/GME/Meta/Meta.vcxproj
trunk/GME/Meta/Meta.vcxproj.filters
trunk/GME/Meta/MetaLib.idl
trunk/GME/Mga/Mga.cpp
trunk/GME/Mga/Mga.vcxproj
trunk/GME/Mga/Mga.vcxproj.filters
trunk/GME/Mga/MgaLib.idl
trunk/GME/Mga/StdAfx.h
trunk/GME/MgaUtil/MgaUtil.vcxproj
trunk/GME/MgaUtil/MgaUtil.vcxproj.filters
trunk/GME/MgaUtil/MgaUtilLib.idl
trunk/GME/Parser/Parser.vcxproj
trunk/GME/Parser/Parser.vcxproj.filters
trunk/GME/Parser/ParserLib.idl
trunk/GME/PartBrowser/PartBrowser.vcxproj
trunk/GME/PartBrowser/stdafx.h
trunk/GME/XmlBackEnd/XmlBackEnd.idl
Modified: trunk/GME/ConstraintManager/ConstraintManager.idl
==============================================================================
--- trunk/GME/ConstraintManager/ConstraintManager.idl Mon Jun 27 15:24:55 2011 (r1383)
+++ trunk/GME/ConstraintManager/ConstraintManager.idl Mon Jun 27 16:22:11 2011 (r1384)
@@ -14,9 +14,9 @@
importlib("stdole32.tlb");
importlib("stdole2.tlb");
- importlib("..\Core\CoreLib.tlb");
- importlib("..\Meta\MetaLib.tlb");
- importlib("..\Mga\MgaLib.tlb");
+ importlib("CoreLib.tlb");
+ importlib("MetaLib.tlb");
+ importlib("MgaLib.tlb");
[
uuid(44055854-A45B-4357-9D2C-FC66D6C0DFFA),
Modified: trunk/GME/ConstraintManager/ConstraintManager.vcxproj
==============================================================================
--- trunk/GME/ConstraintManager/ConstraintManager.vcxproj Mon Jun 27 15:24:55 2011 (r1383)
+++ trunk/GME/ConstraintManager/ConstraintManager.vcxproj Mon Jun 27 16:22:11 2011 (r1384)
@@ -280,42 +280,10 @@
<Project>{bef31e1e-bb02-4687-a543-a6ad5d522869}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
- <ProjectReference Include="..\Core\Core.vcxproj">
- <Project>{0b16b893-5512-48b8-b764-ee72c522ead8}</Project>
- <Private>true</Private>
- <ReferenceOutputAssembly>true</ReferenceOutputAssembly>
- <CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
- <LinkLibraryDependencies>false</LinkLibraryDependencies>
- <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
- </ProjectReference>
<ProjectReference Include="..\Interfaces\Interfaces.vcxproj">
<Project>{a9ba4850-c3d5-45dc-98b3-c29ec9fd54eb}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
- <ProjectReference Include="..\Meta\Meta.vcxproj">
- <Project>{3ed3216e-b64c-4d0b-881f-68bff2cb3e83}</Project>
- <Private>true</Private>
- <ReferenceOutputAssembly>true</ReferenceOutputAssembly>
- <CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
- <LinkLibraryDependencies>false</LinkLibraryDependencies>
- <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
- </ProjectReference>
- <ProjectReference Include="..\MgaUtil\MgaUtil.vcxproj">
- <Project>{ca09ab5c-bfac-4152-ae0b-d5afc400a5e7}</Project>
- <Private>true</Private>
- <ReferenceOutputAssembly>true</ReferenceOutputAssembly>
- <CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
- <LinkLibraryDependencies>false</LinkLibraryDependencies>
- <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
- </ProjectReference>
- <ProjectReference Include="..\Mga\Mga.vcxproj">
- <Project>{86daef74-2527-41e5-82ce-52c31c5bbe8e}</Project>
- <Private>true</Private>
- <ReferenceOutputAssembly>true</ReferenceOutputAssembly>
- <CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
- <LinkLibraryDependencies>false</LinkLibraryDependencies>
- <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
- </ProjectReference>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
Modified: trunk/GME/Core/Core.vcxproj
==============================================================================
--- trunk/GME/Core/Core.vcxproj Mon Jun 27 15:24:55 2011 (r1383)
+++ trunk/GME/Core/Core.vcxproj Mon Jun 27 16:22:11 2011 (r1384)
@@ -74,6 +74,7 @@
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>..\Interfaces;$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -114,6 +115,7 @@
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>..\Interfaces;$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -167,9 +169,6 @@
</ResourceCompile>
</ItemGroup>
<ItemGroup>
- <Midl Include="CoreLib.idl" />
- </ItemGroup>
- <ItemGroup>
<ClInclude Include="CoreAttribute.h" />
<ClInclude Include="CoreBinFile.h" />
<ClInclude Include="CoreMetaAttribute.h" />
Modified: trunk/GME/Core/Core.vcxproj.filters
==============================================================================
--- trunk/GME/Core/Core.vcxproj.filters Mon Jun 27 15:24:55 2011 (r1383)
+++ trunk/GME/Core/Core.vcxproj.filters Mon Jun 27 16:22:11 2011 (r1384)
@@ -97,11 +97,6 @@
</ResourceCompile>
</ItemGroup>
<ItemGroup>
- <Midl Include="CoreLib.idl">
- <Filter>Source Files</Filter>
- </Midl>
- </ItemGroup>
- <ItemGroup>
<ClInclude Include="CoreAttribute.h">
<Filter>Header Files</Filter>
</ClInclude>
Modified: trunk/GME/Gme/GME.vcxproj
==============================================================================
--- trunk/GME/Gme/GME.vcxproj Mon Jun 27 15:24:55 2011 (r1383)
+++ trunk/GME/Gme/GME.vcxproj Mon Jun 27 16:22:11 2011 (r1384)
@@ -149,30 +149,6 @@
<Project>{a9ba4850-c3d5-45dc-98b3-c29ec9fd54eb}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
- <ProjectReference Include="..\Meta\Meta.vcxproj">
- <Project>{3ed3216e-b64c-4d0b-881f-68bff2cb3e83}</Project>
- <Private>true</Private>
- <ReferenceOutputAssembly>true</ReferenceOutputAssembly>
- <CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
- <LinkLibraryDependencies>false</LinkLibraryDependencies>
- <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
- </ProjectReference>
- <ProjectReference Include="..\Mga\Mga.vcxproj">
- <Project>{86daef74-2527-41e5-82ce-52c31c5bbe8e}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- <Private>true</Private>
- <CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
- <LinkLibraryDependencies>false</LinkLibraryDependencies>
- <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
- </ProjectReference>
- <ProjectReference Include="..\XmlBackEnd\XmlBackEnd.vcxproj">
- <Project>{1d361b9d-7e8d-4778-a3b2-0f9c3cf0978c}</Project>
- <Private>true</Private>
- <ReferenceOutputAssembly>true</ReferenceOutputAssembly>
- <CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
- <LinkLibraryDependencies>false</LinkLibraryDependencies>
- <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
- </ProjectReference>
</ItemGroup>
<ItemGroup>
<ClCompile Include="AboutDlg.cpp" />
@@ -312,20 +288,6 @@
<None Include="GME.reg" />
</ItemGroup>
<ItemGroup>
- <Midl Include="GmeLib.idl">
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\Interfaces;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <TargetEnvironment Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Win32</TargetEnvironment>
- <TypeLibraryName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\GmeLib.tlb</TypeLibraryName>
- <HeaderFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">GmeLib.h</HeaderFileName>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\Interfaces;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <TargetEnvironment Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Win32</TargetEnvironment>
- <TypeLibraryName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\GmeLib.tlb</TypeLibraryName>
- <HeaderFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">GmeLib.h</HeaderFileName>
- </Midl>
- </ItemGroup>
- <ItemGroup>
<ClInclude Include="AnnotatorEventSink.h" />
<ClInclude Include="AutoRoute\ArEdgeLs.h" />
<ClInclude Include="AutoRoute\ArGraph.h" />
@@ -401,9 +363,9 @@
<ItemGroup>
<ResourceCompile Include="GME.rc">
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OUTDIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OUTDIR);..\Interfaces;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OUTDIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OUTDIR);..\Interfaces;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
Modified: trunk/GME/Gme/GME.vcxproj.filters
==============================================================================
--- trunk/GME/Gme/GME.vcxproj.filters Mon Jun 27 15:24:55 2011 (r1383)
+++ trunk/GME/Gme/GME.vcxproj.filters Mon Jun 27 16:22:11 2011 (r1384)
@@ -364,11 +364,6 @@
<None Include="GME.exe.config" />
</ItemGroup>
<ItemGroup>
- <Midl Include="GmeLib.idl">
- <Filter>Source Files</Filter>
- </Midl>
- </ItemGroup>
- <ItemGroup>
<ClInclude Include="AnnotatorEventSink.h">
<Filter>Header Files</Filter>
</ClInclude>
Modified: trunk/GME/Gme/GmeLib.idl
==============================================================================
--- trunk/GME/Gme/GmeLib.idl Mon Jun 27 15:24:55 2011 (r1383)
+++ trunk/GME/Gme/GmeLib.idl Mon Jun 27 16:22:11 2011 (r1384)
@@ -14,9 +14,9 @@
importlib("stdole32.tlb");
importlib("stdole2.tlb");
- importlib("..\Core\CoreLib.tlb");
- importlib("..\Meta\MetaLib.tlb");
- importlib("..\Mga\MgaLib.tlb");
+ importlib("CoreLib.tlb");
+ importlib("MetaLib.tlb");
+ importlib("MgaLib.tlb");
// Decorator interfaces (listed here to include them in typelib)
interface IMgaDecorator;
Modified: trunk/GME/Interfaces/Interfaces.vcxproj
==============================================================================
--- trunk/GME/Interfaces/Interfaces.vcxproj Mon Jun 27 15:24:55 2011 (r1383)
+++ trunk/GME/Interfaces/Interfaces.vcxproj Mon Jun 27 16:22:11 2011 (r1384)
@@ -54,6 +54,7 @@
<Midl>
<HeaderFileName>
</HeaderFileName>
+ <AdditionalIncludeDirectories>.</AdditionalIncludeDirectories>
</Midl>
<CustomBuild>
<Command>..\Release\IFChecksumProg.exe InterfaceVersion.h InterfaceVersion.trg</Command>
@@ -72,6 +73,42 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
+ <Midl Include="..\Core\CoreLib.idl">
+ <TypeLibraryName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(FileName).tlb</TypeLibraryName>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.</AdditionalIncludeDirectories>
+ <TypeLibraryName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(FileName).tlb</TypeLibraryName>
+ </Midl>
+ <Midl Include="..\Gme\GmeLib.idl">
+ <TypeLibraryName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(FileName).tlb</TypeLibraryName>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.</AdditionalIncludeDirectories>
+ <TypeLibraryName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(FileName).tlb</TypeLibraryName>
+ </Midl>
+ <Midl Include="..\Meta\MetaLib.idl">
+ <TypeLibraryName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(FileName).tlb</TypeLibraryName>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.</AdditionalIncludeDirectories>
+ <TypeLibraryName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(FileName).tlb</TypeLibraryName>
+ </Midl>
+ <Midl Include="..\MgaUtil\MgaUtilLib.idl">
+ <TypeLibraryName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(FileName).tlb</TypeLibraryName>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.</AdditionalIncludeDirectories>
+ <TypeLibraryName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(FileName).tlb</TypeLibraryName>
+ </Midl>
+ <Midl Include="..\Mga\MgaLib.idl">
+ <TypeLibraryName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(FileName).tlb</TypeLibraryName>
+ <TypeLibraryName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(FileName).tlb</TypeLibraryName>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.</AdditionalIncludeDirectories>
+ </Midl>
+ <Midl Include="..\Parser\ParserLib.idl">
+ <TypeLibraryName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(FileName).tlb</TypeLibraryName>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.</AdditionalIncludeDirectories>
+ <TypeLibraryName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(FileName).tlb</TypeLibraryName>
+ </Midl>
<Midl Include="Core.idl">
<GenerateTypeLibrary Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</GenerateTypeLibrary>
<GenerateTypeLibrary Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</GenerateTypeLibrary>
@@ -91,6 +128,7 @@
<Midl Include="Mga.idl">
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">MGA</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MGA</PreprocessorDefinitions>
+ <TypeLibraryName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)%(FileName).tlb</TypeLibraryName>
</Midl>
<Midl Include="MgaUtil.idl">
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">MGAUTIL</PreprocessorDefinitions>
@@ -104,4 +142,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
Modified: trunk/GME/Interfaces/Interfaces.vcxproj.filters
==============================================================================
--- trunk/GME/Interfaces/Interfaces.vcxproj.filters Mon Jun 27 15:24:55 2011 (r1383)
+++ trunk/GME/Interfaces/Interfaces.vcxproj.filters Mon Jun 27 16:22:11 2011 (r1384)
@@ -9,6 +9,9 @@
<UniqueIdentifier>{e5822588-d674-493b-b540-e197f28900d9}</UniqueIdentifier>
<Extensions>*.h</Extensions>
</Filter>
+ <Filter Include="Interface Lib Files">
+ <UniqueIdentifier>{8bb0fdfb-3ff8-4144-a6b7-86f3c988840e}</UniqueIdentifier>
+ </Filter>
</ItemGroup>
<ItemGroup>
<ClInclude Include="InterfaceColl.h">
@@ -37,5 +40,23 @@
<Midl Include="Parser.idl">
<Filter>Interface Files</Filter>
</Midl>
+ <Midl Include="..\Mga\MgaLib.idl">
+ <Filter>Interface Lib Files</Filter>
+ </Midl>
+ <Midl Include="..\Core\CoreLib.idl">
+ <Filter>Interface Lib Files</Filter>
+ </Midl>
+ <Midl Include="..\Parser\ParserLib.idl">
+ <Filter>Interface Lib Files</Filter>
+ </Midl>
+ <Midl Include="..\MgaUtil\MgaUtilLib.idl">
+ <Filter>Interface Lib Files</Filter>
+ </Midl>
+ <Midl Include="..\Meta\MetaLib.idl">
+ <Filter>Interface Lib Files</Filter>
+ </Midl>
+ <Midl Include="..\Gme\GmeLib.idl">
+ <Filter>Interface Lib Files</Filter>
+ </Midl>
</ItemGroup>
</Project>
\ No newline at end of file
Modified: trunk/GME/Meta/Meta.vcxproj
==============================================================================
--- trunk/GME/Meta/Meta.vcxproj Mon Jun 27 15:24:55 2011 (r1383)
+++ trunk/GME/Meta/Meta.vcxproj Mon Jun 27 16:22:11 2011 (r1384)
@@ -72,6 +72,7 @@
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>..\Interfaces;$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -108,6 +109,7 @@
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>..\Interfaces;$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -184,20 +186,6 @@
</ResourceCompile>
</ItemGroup>
<ItemGroup>
- <Midl Include="MetaLib.idl">
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\Interfaces;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <GenerateStublessProxies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateStublessProxies>
- <TypeLibraryName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\MetaLib.tlb</TypeLibraryName>
- <HeaderFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">MetaLib.h</HeaderFileName>
- <InterfaceIdentifierFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">MetaLib_i.c</InterfaceIdentifierFileName>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\Interfaces;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <GenerateStublessProxies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</GenerateStublessProxies>
- <TypeLibraryName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\MetaLib.tlb</TypeLibraryName>
- <HeaderFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MetaLib.h</HeaderFileName>
- <InterfaceIdentifierFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MetaLib_i.c</InterfaceIdentifierFileName>
- </Midl>
- </ItemGroup>
- <ItemGroup>
<ClInclude Include="CoreMetaDefines.h" />
<ClInclude Include="MetaUtilities.h" />
<ClInclude Include="MgaMetaAspect.h" />
@@ -228,14 +216,6 @@
<Project>{bef31e1e-bb02-4687-a543-a6ad5d522869}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
- <ProjectReference Include="..\Core\Core.vcxproj">
- <Project>{0b16b893-5512-48b8-b764-ee72c522ead8}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- <Private>true</Private>
- <CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
- <LinkLibraryDependencies>false</LinkLibraryDependencies>
- <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
- </ProjectReference>
<ProjectReference Include="..\Interfaces\Interfaces.vcxproj">
<Project>{a9ba4850-c3d5-45dc-98b3-c29ec9fd54eb}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
Modified: trunk/GME/Meta/Meta.vcxproj.filters
==============================================================================
--- trunk/GME/Meta/Meta.vcxproj.filters Mon Jun 27 15:24:55 2011 (r1383)
+++ trunk/GME/Meta/Meta.vcxproj.filters Mon Jun 27 16:22:11 2011 (r1384)
@@ -166,11 +166,6 @@
</ResourceCompile>
</ItemGroup>
<ItemGroup>
- <Midl Include="MetaLib.idl">
- <Filter>Source Files</Filter>
- </Midl>
- </ItemGroup>
- <ItemGroup>
<ClInclude Include="CoreMetaDefines.h">
<Filter>Header Files</Filter>
</ClInclude>
Modified: trunk/GME/Meta/MetaLib.idl
==============================================================================
--- trunk/GME/Meta/MetaLib.idl Mon Jun 27 15:24:55 2011 (r1383)
+++ trunk/GME/Meta/MetaLib.idl Mon Jun 27 16:22:11 2011 (r1384)
@@ -20,7 +20,7 @@
importlib("stdole32.tlb");
importlib("stdole2.tlb");
- importlib("..\Core\CoreLib.tlb");
+ importlib("CoreLib.tlb");
enum objtype_enum;
enum attval_enum;
Modified: trunk/GME/Mga/Mga.cpp
==============================================================================
--- trunk/GME/Mga/Mga.cpp Mon Jun 27 15:24:55 2011 (r1383)
+++ trunk/GME/Mga/Mga.cpp Mon Jun 27 16:22:11 2011 (r1384)
@@ -10,7 +10,7 @@
#include <initguid.h>
#include "Core_i.c"
-#include "../core/CoreLib_i.c"
+#include "CoreLib_i.c"
#include "Meta_i.c"
#include "Mga_i.c"
#include "MgaLib_i.c"
Modified: trunk/GME/Mga/Mga.vcxproj
==============================================================================
--- trunk/GME/Mga/Mga.vcxproj Mon Jun 27 15:24:55 2011 (r1383)
+++ trunk/GME/Mga/Mga.vcxproj Mon Jun 27 16:22:11 2011 (r1384)
@@ -76,6 +76,7 @@
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>..\Interfaces;$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -108,6 +109,7 @@
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>..\Interfaces;$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -172,20 +174,6 @@
</ResourceCompile>
</ItemGroup>
<ItemGroup>
- <Midl Include="MgaLib.idl">
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../Interfaces;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <GenerateStublessProxies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateStublessProxies>
- <TypeLibraryName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\MgaLib.tlb</TypeLibraryName>
- <HeaderFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">MgaLib.h</HeaderFileName>
- <InterfaceIdentifierFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">MgaLib_i.c</InterfaceIdentifierFileName>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../Interfaces;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <GenerateStublessProxies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</GenerateStublessProxies>
- <TypeLibraryName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\MgaLib.tlb</TypeLibraryName>
- <HeaderFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MgaLib.h</HeaderFileName>
- <InterfaceIdentifierFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MgaLib_i.c</InterfaceIdentifierFileName>
- </Midl>
- </ItemGroup>
- <ItemGroup>
<ClInclude Include="MgaAttribute.h" />
<ClInclude Include="MgaComplexOps.h" />
<ClInclude Include="MgaConnection.h" />
@@ -212,26 +200,10 @@
<Project>{bef31e1e-bb02-4687-a543-a6ad5d522869}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
- <ProjectReference Include="..\Core\Core.vcxproj">
- <Project>{0b16b893-5512-48b8-b764-ee72c522ead8}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- <Private>true</Private>
- <CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
- <LinkLibraryDependencies>false</LinkLibraryDependencies>
- <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
- </ProjectReference>
<ProjectReference Include="..\Interfaces\Interfaces.vcxproj">
<Project>{a9ba4850-c3d5-45dc-98b3-c29ec9fd54eb}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
- <ProjectReference Include="..\Meta\Meta.vcxproj">
- <Project>{3ed3216e-b64c-4d0b-881f-68bff2cb3e83}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- <Private>true</Private>
- <CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
- <LinkLibraryDependencies>false</LinkLibraryDependencies>
- <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
- </ProjectReference>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
Modified: trunk/GME/Mga/Mga.vcxproj.filters
==============================================================================
--- trunk/GME/Mga/Mga.vcxproj.filters Mon Jun 27 15:24:55 2011 (r1383)
+++ trunk/GME/Mga/Mga.vcxproj.filters Mon Jun 27 16:22:11 2011 (r1384)
@@ -118,11 +118,6 @@
</ResourceCompile>
</ItemGroup>
<ItemGroup>
- <Midl Include="MgaLib.idl">
- <Filter>Source Files</Filter>
- </Midl>
- </ItemGroup>
- <ItemGroup>
<ClInclude Include="MgaAttribute.h">
<Filter>Header Files</Filter>
</ClInclude>
Modified: trunk/GME/Mga/MgaLib.idl
==============================================================================
--- trunk/GME/Mga/MgaLib.idl Mon Jun 27 15:24:55 2011 (r1383)
+++ trunk/GME/Mga/MgaLib.idl Mon Jun 27 16:22:11 2011 (r1384)
@@ -19,8 +19,8 @@
importlib("stdole32.tlb");
importlib("stdole2.tlb");
- importlib("..\Meta\MetaLib.tlb");
- importlib("..\Core\CoreLib.tlb");
+ importlib("MetaLib.tlb");
+ importlib("CoreLib.tlb");
// Component interfaces (listed here to include them in typelib)
interface IMgaComponent;
Modified: trunk/GME/Mga/StdAfx.h
==============================================================================
--- trunk/GME/Mga/StdAfx.h Mon Jun 27 15:24:55 2011 (r1383)
+++ trunk/GME/Mga/StdAfx.h Mon Jun 27 16:22:11 2011 (r1384)
@@ -50,7 +50,7 @@
#undef VARIANT_TRUE
#define VARIANT_TRUE ((VARIANT_BOOL)-1)
-#include "../Core/CoreLib.h"
+#include "CoreLib.h"
#include "MgaLib.h"
#define ASSERT ATLASSERT
Modified: trunk/GME/MgaUtil/MgaUtil.vcxproj
==============================================================================
--- trunk/GME/MgaUtil/MgaUtil.vcxproj Mon Jun 27 15:24:55 2011 (r1383)
+++ trunk/GME/MgaUtil/MgaUtil.vcxproj Mon Jun 27 16:22:11 2011 (r1384)
@@ -68,7 +68,7 @@
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
<IntrinsicFunctions>true</IntrinsicFunctions>
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
- <AdditionalIncludeDirectories>../Common;../Interfaces;../include/htmlhelp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>../Common;../Interfaces;$(OutDir);../include/htmlhelp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -80,6 +80,7 @@
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>..\Interfaces;$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
<AdditionalDependencies>imagehlp.lib;htmlhelp.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -111,7 +112,7 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../Common;../Interfaces;../include/htmlhelp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>../Common;../Interfaces;$(OutDir);../include/htmlhelp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -121,6 +122,7 @@
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>..\Interfaces;$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
<AdditionalDependencies>imagehlp.lib;htmlhelp.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -224,24 +226,6 @@
</ResourceCompile>
</ItemGroup>
<ItemGroup>
- <Midl Include="MgaUtilLib.idl">
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../Interfaces;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <SuppressStartupBanner Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</SuppressStartupBanner>
- <TargetEnvironment Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Win32</TargetEnvironment>
- <GenerateStublessProxies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateStublessProxies>
- <TypeLibraryName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">MgaUtilLib.tlb</TypeLibraryName>
- <HeaderFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">MgaUtilLib.h</HeaderFileName>
- <InterfaceIdentifierFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">MgaUtilLib_i.c</InterfaceIdentifierFileName>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../Interfaces;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <SuppressStartupBanner Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</SuppressStartupBanner>
- <TargetEnvironment Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Win32</TargetEnvironment>
- <GenerateStublessProxies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</GenerateStublessProxies>
- <TypeLibraryName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MgaUtilLib.tlb</TypeLibraryName>
- <HeaderFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MgaUtilLib.h</HeaderFileName>
- <InterfaceIdentifierFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MgaUtilLib_i.c</InterfaceIdentifierFileName>
- </Midl>
- </ItemGroup>
- <ItemGroup>
<ClInclude Include="AlterNmspDlg.h" />
<ClInclude Include="AnnotationAspectList.h" />
<ClInclude Include="AnnotationBrowserDlg.h" />
@@ -294,28 +278,14 @@
<Project>{bef31e1e-bb02-4687-a543-a6ad5d522869}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
- <ProjectReference Include="..\Core\Core.vcxproj">
- <Project>{0b16b893-5512-48b8-b764-ee72c522ead8}</Project>
- </ProjectReference>
<ProjectReference Include="..\Interfaces\Interfaces.vcxproj">
<Project>{a9ba4850-c3d5-45dc-98b3-c29ec9fd54eb}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
- <ProjectReference Include="..\Meta\Meta.vcxproj">
- <Project>{3ed3216e-b64c-4d0b-881f-68bff2cb3e83}</Project>
- </ProjectReference>
<ProjectReference Include="..\MgaDotNetServices\MgaDotNetServices.csproj">
<Project>{955209a1-8107-43c2-b0a7-729b03908c64}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
- <ProjectReference Include="..\Mga\Mga.vcxproj">
- <Project>{86daef74-2527-41e5-82ce-52c31c5bbe8e}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- <Private>true</Private>
- <CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
- <LinkLibraryDependencies>false</LinkLibraryDependencies>
- <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
- </ProjectReference>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
Modified: trunk/GME/MgaUtil/MgaUtil.vcxproj.filters
==============================================================================
--- trunk/GME/MgaUtil/MgaUtil.vcxproj.filters Mon Jun 27 15:24:55 2011 (r1383)
+++ trunk/GME/MgaUtil/MgaUtil.vcxproj.filters Mon Jun 27 16:22:11 2011 (r1384)
@@ -219,11 +219,6 @@
</ResourceCompile>
</ItemGroup>
<ItemGroup>
- <Midl Include="MgaUtilLib.idl">
- <Filter>Source Files</Filter>
- </Midl>
- </ItemGroup>
- <ItemGroup>
<ClInclude Include="AlterNmspDlg.h">
<Filter>Header Files</Filter>
</ClInclude>
Modified: trunk/GME/MgaUtil/MgaUtilLib.idl
==============================================================================
--- trunk/GME/MgaUtil/MgaUtilLib.idl Mon Jun 27 15:24:55 2011 (r1383)
+++ trunk/GME/MgaUtil/MgaUtilLib.idl Mon Jun 27 16:22:11 2011 (r1384)
@@ -17,9 +17,9 @@
importlib("stdole32.tlb");
importlib("stdole2.tlb");
- importlib("../Core/CoreLib.tlb");
- importlib("../Meta/MetaLib.tlb");
- importlib("../Mga/MgaLib.tlb");
+ importlib("CoreLib.tlb");
+ importlib("MetaLib.tlb");
+ importlib("MgaLib.tlb");
[
uuid(461F30B1-3BF0-11D4-B3F0-005004D38590),
Modified: trunk/GME/Parser/Parser.vcxproj
==============================================================================
--- trunk/GME/Parser/Parser.vcxproj Mon Jun 27 15:24:55 2011 (r1383)
+++ trunk/GME/Parser/Parser.vcxproj Mon Jun 27 16:22:11 2011 (r1384)
@@ -78,6 +78,7 @@
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>..\Interfaces;$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
<AdditionalDependencies>xerces-c_3.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -116,6 +117,7 @@
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>..\Interfaces;$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
<AdditionalDependencies>xerces-c_3D.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -173,20 +175,6 @@
</ResourceCompile>
</ItemGroup>
<ItemGroup>
- <Midl Include="ParserLib.idl">
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\Interfaces;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <GenerateStublessProxies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateStublessProxies>
- <TypeLibraryName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\ParserLib.tlb</TypeLibraryName>
- <HeaderFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">ParserLib.h</HeaderFileName>
- <InterfaceIdentifierFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">ParserLib_i.c</InterfaceIdentifierFileName>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\Interfaces;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <GenerateStublessProxies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</GenerateStublessProxies>
- <TypeLibraryName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\ParserLib.tlb</TypeLibraryName>
- <HeaderFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">ParserLib.h</HeaderFileName>
- <InterfaceIdentifierFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">ParserLib_i.c</InterfaceIdentifierFileName>
- </Midl>
- </ItemGroup>
- <ItemGroup>
<ClInclude Include="dlldatax.h" />
<ClInclude Include="GenParser.h" />
<ClInclude Include="GUIDCreate.h" />
@@ -204,34 +192,10 @@
<Project>{bef31e1e-bb02-4687-a543-a6ad5d522869}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
- <ProjectReference Include="..\Core\Core.vcxproj">
- <Project>{0b16b893-5512-48b8-b764-ee72c522ead8}</Project>
- <Private>true</Private>
- <ReferenceOutputAssembly>true</ReferenceOutputAssembly>
- <CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
- <LinkLibraryDependencies>false</LinkLibraryDependencies>
- <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
- </ProjectReference>
<ProjectReference Include="..\Interfaces\Interfaces.vcxproj">
<Project>{a9ba4850-c3d5-45dc-98b3-c29ec9fd54eb}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
- <ProjectReference Include="..\Meta\Meta.vcxproj">
- <Project>{3ed3216e-b64c-4d0b-881f-68bff2cb3e83}</Project>
- <Private>true</Private>
- <ReferenceOutputAssembly>true</ReferenceOutputAssembly>
- <CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
- <LinkLibraryDependencies>false</LinkLibraryDependencies>
- <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
- </ProjectReference>
- <ProjectReference Include="..\Mga\Mga.vcxproj">
- <Project>{86daef74-2527-41e5-82ce-52c31c5bbe8e}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- <Private>true</Private>
- <CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
- <LinkLibraryDependencies>false</LinkLibraryDependencies>
- <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
- </ProjectReference>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
Modified: trunk/GME/Parser/Parser.vcxproj.filters
==============================================================================
--- trunk/GME/Parser/Parser.vcxproj.filters Mon Jun 27 15:24:55 2011 (r1383)
+++ trunk/GME/Parser/Parser.vcxproj.filters Mon Jun 27 16:22:11 2011 (r1384)
@@ -83,11 +83,6 @@
</ResourceCompile>
</ItemGroup>
<ItemGroup>
- <Midl Include="ParserLib.idl">
- <Filter>Source Files</Filter>
- </Midl>
- </ItemGroup>
- <ItemGroup>
<ClInclude Include="dlldatax.h">
<Filter>Header Files</Filter>
</ClInclude>
Modified: trunk/GME/Parser/ParserLib.idl
==============================================================================
--- trunk/GME/Parser/ParserLib.idl Mon Jun 27 15:24:55 2011 (r1383)
+++ trunk/GME/Parser/ParserLib.idl Mon Jun 27 16:22:11 2011 (r1384)
@@ -18,9 +18,9 @@
importlib("stdole32.tlb");
importlib("stdole2.tlb");
- importlib("..\Core\CoreLib.tlb");
- importlib("..\Meta\MetaLib.tlb");
- importlib("..\Mga\MgaLib.tlb");
+ importlib("CoreLib.tlb");
+ importlib("MetaLib.tlb");
+ importlib("MgaLib.tlb");
[
uuid(70C41B25-E3CE-11D3-B37A-005004D38590),
Modified: trunk/GME/PartBrowser/PartBrowser.vcxproj
==============================================================================
--- trunk/GME/PartBrowser/PartBrowser.vcxproj Mon Jun 27 15:24:55 2011 (r1383)
+++ trunk/GME/PartBrowser/PartBrowser.vcxproj Mon Jun 27 16:22:11 2011 (r1384)
@@ -128,42 +128,10 @@
<Project>{bef31e1e-bb02-4687-a543-a6ad5d522869}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
- <ProjectReference Include="..\Gme\GME.vcxproj">
- <Project>{10471163-556b-4be1-a12e-c917f90f8346}</Project>
- <Private>false</Private>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- <CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
- <LinkLibraryDependencies>false</LinkLibraryDependencies>
- <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
- </ProjectReference>
<ProjectReference Include="..\Interfaces\Interfaces.vcxproj">
<Project>{a9ba4850-c3d5-45dc-98b3-c29ec9fd54eb}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
- <ProjectReference Include="..\Meta\Meta.vcxproj">
- <Project>{3ed3216e-b64c-4d0b-881f-68bff2cb3e83}</Project>
- <Private>false</Private>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- <CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
- <LinkLibraryDependencies>false</LinkLibraryDependencies>
- <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
- </ProjectReference>
- <ProjectReference Include="..\MgaUtil\MgaUtil.vcxproj">
- <Project>{ca09ab5c-bfac-4152-ae0b-d5afc400a5e7}</Project>
- <Private>false</Private>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- <CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
- <LinkLibraryDependencies>false</LinkLibraryDependencies>
- <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
- </ProjectReference>
- <ProjectReference Include="..\Mga\Mga.vcxproj">
- <Project>{86daef74-2527-41e5-82ce-52c31c5bbe8e}</Project>
- <Private>false</Private>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- <CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
- <LinkLibraryDependencies>false</LinkLibraryDependencies>
- <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
- </ProjectReference>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\Common\CommonError.cpp" />
Modified: trunk/GME/PartBrowser/stdafx.h
==============================================================================
--- trunk/GME/PartBrowser/stdafx.h Mon Jun 27 15:24:55 2011 (r1383)
+++ trunk/GME/PartBrowser/stdafx.h Mon Jun 27 16:22:11 2011 (r1384)
@@ -36,10 +36,10 @@
extern CComModule _Module;
#include <atlcom.h>
-#import "Meta.dll" no_implementation auto_search no_namespace no_search_namespace raw_method_prefix("") high_method_prefix("__")
-#import "Mga.dll" no_implementation auto_search no_namespace no_search_namespace raw_method_prefix("") high_method_prefix("__")
-#import "GME.exe" no_implementation auto_search no_namespace no_search_namespace raw_method_prefix("") high_method_prefix("__")
-#import "MgaUtil.dll" no_implementation auto_search no_namespace no_search_namespace raw_method_prefix("") high_method_prefix("__")
+#import "MetaLib.tlb" no_implementation auto_search no_namespace no_search_namespace raw_method_prefix("") high_method_prefix("__")
+#import "MgaLib.tlb" no_implementation auto_search no_namespace no_search_namespace raw_method_prefix("") high_method_prefix("__")
+#import "GMELib.tlb" no_implementation auto_search no_namespace no_search_namespace raw_method_prefix("") high_method_prefix("__")
+#import "MgaUtilLib.tlb" no_implementation auto_search no_namespace no_search_namespace raw_method_prefix("") high_method_prefix("__")
// Don't load the MIDL-generated headers
#define __Core_h__
Modified: trunk/GME/XmlBackEnd/XmlBackEnd.idl
==============================================================================
--- trunk/GME/XmlBackEnd/XmlBackEnd.idl Mon Jun 27 15:24:55 2011 (r1383)
+++ trunk/GME/XmlBackEnd/XmlBackEnd.idl Mon Jun 27 16:22:11 2011 (r1384)
@@ -13,7 +13,7 @@
importlib("stdole32.tlb");
importlib("stdole2.tlb");
- importlib("..\Core\CoreLib.tlb");
+ importlib("CoreLib.tlb");
[
uuid(F729BE0C-ACE5-470B-8F98-DAE52D6A5949),
More information about the gme-commit
mailing list