[Mobies-commit] [commit] r4411 - in GReAT/trunk: . Tools/MetaGME2UMX/MetaGME2UMX Interpreters Tools/UMTInterpreters
ksmyth at svn.isis.vanderbilt.edu
ksmyth at svn.isis.vanderbilt.edu
Thu Feb 8 12:28:47 CST 2018
Author: ksmyth
Date: Thu Feb 8 12:28:47 2018
New Revision: 4411
Log:
Peg DecoratorLib to 2733
Modified:
GReAT/trunk/GReATVS2010.sln
GReAT/trunk/Tools/MetaGME2UMX/MetaGME2UMX Interpreters/MetaGME2UML_interpreterVS2010.vcxproj
GReAT/trunk/Tools/MetaGME2UMX/MetaGME2UMX Interpreters/MetaGME2UMT_interpreterVS2010.vcxproj
GReAT/trunk/Tools/MetaGME2UMX/MetaGME2UMX Interpreters/RawComponent.cpp
GReAT/trunk/Tools/UMTInterpreters/ (props changed)
Modified: GReAT/trunk/GReATVS2010.sln
==============================================================================
--- GReAT/trunk/GReATVS2010.sln Thu Feb 8 12:22:28 2018 (r4410)
+++ GReAT/trunk/GReATVS2010.sln Thu Feb 8 12:28:47 2018 (r4411)
@@ -49,9 +49,9 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MetaGME2UML", "Tools\MetaGME2UMX\MetaGME2UMLVS2010.vcxproj", "{C6D78EF7-DE19-4D15-8446-0DC4556A1023}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MetaGME2UML Interpreter", "Tools\MetaGME2UMX\MetaGME2UMX Interpreters\MetaGME2UML_interpreterVS2010.vcxproj", "{6A83C9AA-35B2-427B-B3D0-D9CB7FC729A3}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MetaGME2UMLInterpreter", "Tools\MetaGME2UMX\MetaGME2UMX Interpreters\MetaGME2UML_interpreterVS2010.vcxproj", "{6A83C9AA-35B2-427B-B3D0-D9CB7FC729A3}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MetaGME2UMT Interpreters", "Tools\MetaGME2UMX\MetaGME2UMX Interpreters\MetaGME2UMT_interpreterVS2010.vcxproj", "{BB01B6C2-A5F2-4733-9DB4-558168B2E970}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MetaGME2UMTInterpreter", "Tools\MetaGME2UMX\MetaGME2UMX Interpreters\MetaGME2UMT_interpreterVS2010.vcxproj", "{BB01B6C2-A5F2-4733-9DB4-558168B2E970}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MetaGMEAPI", "Libraries\MetaGMEAPI\MetaGMEAPIVS2010.vcxproj", "{B36EEB59-F578-4AF2-9D2B-11E997E0CB5D}"
EndProject
@@ -383,14 +383,14 @@
{6A83C9AA-35B2-427B-B3D0-D9CB7FC729A3}.Debug|Win32.Build.0 = Debug|Win32
{6A83C9AA-35B2-427B-B3D0-D9CB7FC729A3}.Debug|x64.ActiveCfg = Debug|x64
{6A83C9AA-35B2-427B-B3D0-D9CB7FC729A3}.Debug|x64.Build.0 = Debug|x64
- {6A83C9AA-35B2-427B-B3D0-D9CB7FC729A3}.DebugVS9|Win32.ActiveCfg = DebugVS9|Win32
- {6A83C9AA-35B2-427B-B3D0-D9CB7FC729A3}.DebugVS9|x64.ActiveCfg = DebugVS9|x64
+ {6A83C9AA-35B2-427B-B3D0-D9CB7FC729A3}.DebugVS9|Win32.ActiveCfg = Debug|Win32
+ {6A83C9AA-35B2-427B-B3D0-D9CB7FC729A3}.DebugVS9|x64.ActiveCfg = Debug|x64
{6A83C9AA-35B2-427B-B3D0-D9CB7FC729A3}.Release|Win32.ActiveCfg = Release|Win32
{6A83C9AA-35B2-427B-B3D0-D9CB7FC729A3}.Release|Win32.Build.0 = Release|Win32
{6A83C9AA-35B2-427B-B3D0-D9CB7FC729A3}.Release|x64.ActiveCfg = Release|x64
{6A83C9AA-35B2-427B-B3D0-D9CB7FC729A3}.Release|x64.Build.0 = Release|x64
- {6A83C9AA-35B2-427B-B3D0-D9CB7FC729A3}.ReleaseVS9|Win32.ActiveCfg = ReleaseVS9|Win32
- {6A83C9AA-35B2-427B-B3D0-D9CB7FC729A3}.ReleaseVS9|x64.ActiveCfg = ReleaseVS9|x64
+ {6A83C9AA-35B2-427B-B3D0-D9CB7FC729A3}.ReleaseVS9|Win32.ActiveCfg = Release|Win32
+ {6A83C9AA-35B2-427B-B3D0-D9CB7FC729A3}.ReleaseVS9|x64.ActiveCfg = Release|x64
{BB01B6C2-A5F2-4733-9DB4-558168B2E970}.Debug|Win32.ActiveCfg = Debug|Win32
{BB01B6C2-A5F2-4733-9DB4-558168B2E970}.Debug|Win32.Build.0 = Debug|Win32
{BB01B6C2-A5F2-4733-9DB4-558168B2E970}.Debug|x64.ActiveCfg = Debug|x64
Modified: GReAT/trunk/Tools/MetaGME2UMX/MetaGME2UMX Interpreters/MetaGME2UML_interpreterVS2010.vcxproj
==============================================================================
--- GReAT/trunk/Tools/MetaGME2UMX/MetaGME2UMX Interpreters/MetaGME2UML_interpreterVS2010.vcxproj Thu Feb 8 12:22:28 2018 (r4410)
+++ GReAT/trunk/Tools/MetaGME2UMX/MetaGME2UMX Interpreters/MetaGME2UML_interpreterVS2010.vcxproj Thu Feb 8 12:28:47 2018 (r4411)
@@ -1,14 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="DebugVS9|Win32">
- <Configuration>DebugVS9</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="DebugVS9|x64">
- <Configuration>DebugVS9</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
@@ -17,14 +9,6 @@
<Configuration>Debug</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
- <ProjectConfiguration Include="ReleaseVS9|Win32">
- <Configuration>ReleaseVS9</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="ReleaseVS9|x64">
- <Configuration>ReleaseVS9</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
@@ -35,7 +19,7 @@
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
- <ProjectName>MetaGME2UML Interpreter</ProjectName>
+ <ProjectName>MetaGME2UMLInterpreter</ProjectName>
<ProjectGuid>{6A83C9AA-35B2-427B-B3D0-D9CB7FC729A3}</ProjectGuid>
<RootNamespace>MetaGME2UML Interpreters</RootNamespace>
</PropertyGroup>
@@ -52,20 +36,6 @@
<UseOfAtl>Dynamic</UseOfAtl>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseVS9|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>Dynamic</UseOfMfc>
- <UseOfAtl>Dynamic</UseOfAtl>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v90</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseVS9|x64'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>Dynamic</UseOfMfc>
- <UseOfAtl>Dynamic</UseOfAtl>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v90</PlatformToolset>
- </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>Dynamic</UseOfMfc>
@@ -76,18 +46,6 @@
<UseOfMfc>Dynamic</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugVS9|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>Dynamic</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v90</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugVS9|x64'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>Dynamic</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v90</PlatformToolset>
- </PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
@@ -103,20 +61,6 @@
<Import Project="..\..\..\GReAT.props" />
<Import Project="..\..\..\common-scripts\GMEInterpreter.props" />
</ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseVS9|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="..\..\..\UdmDll.props" />
- <Import Project="..\..\..\GReAT.props" />
- <Import Project="..\..\..\common-scripts\GMEInterpreter.props" />
- <Import Project="..\..\..\VS9.props" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseVS9|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="..\..\..\UdmDll.props" />
- <Import Project="..\..\..\GReAT.props" />
- <Import Project="..\..\..\common-scripts\GMEInterpreter.props" />
- <Import Project="..\..\..\VS9.props" />
- </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="..\..\..\UdmDlld.props" />
@@ -129,55 +73,23 @@
<Import Project="..\..\..\GReAT.props" />
<Import Project="..\..\..\common-scripts\GMEInterpreter.props" />
</ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugVS9|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="..\..\..\UdmDlld.props" />
- <Import Project="..\..\..\GReAT.props" />
- <Import Project="..\..\..\common-scripts\GMEInterpreter.props" />
- <Import Project="..\..\..\VS9.props" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugVS9|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="..\..\..\UdmDlld.props" />
- <Import Project="..\..\..\GReAT.props" />
- <Import Project="..\..\..\common-scripts\GMEInterpreter.props" />
- <Import Project="..\..\..\VS9.props" />
- </ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GREAT_BIN)\</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GREAT_BIN)\$(Platform)\</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='DebugVS9|Win32'">$(GREAT_BIN)\</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='DebugVS9|x64'">$(GREAT_BIN)\$(Platform)\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">UML$(Configuration)\</IntDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">UML$(Configuration)$(Platform)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='DebugVS9|Win32'">UML$(Configuration)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='DebugVS9|x64'">UML$(Configuration)$(Platform)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='DebugVS9|Win32'">true</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='DebugVS9|x64'">true</LinkIncremental>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GREAT_BIN)\</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GREAT_BIN)\$(Platform)\</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseVS9|Win32'">$(GREAT_BIN)\</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseVS9|x64'">$(GREAT_BIN)\$(Platform)\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">UML$(Configuration)\</IntDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">UML$(Configuration)$(Platform)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='ReleaseVS9|Win32'">false</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='ReleaseVS9|x64'">false</LinkIncremental>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">MetaGME2Uml_D</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">MetaGME2Uml_D</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='DebugVS9|Win32'">MetaGME2Uml_D</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='DebugVS9|x64'">MetaGME2Uml_D</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MetaGME2Uml</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MetaGME2Uml</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseVS9|Win32'">MetaGME2Uml</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseVS9|x64'">MetaGME2Uml</TargetName>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseVS9|Win32'">UML$(Configuration)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseVS9|x64'">UML$(Configuration)$(Platform)\</IntDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)x86\$(Configuration)\</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)x86\$(Configuration)\</OutDir>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<CustomBuildStep>
@@ -262,101 +174,6 @@
<Link>
<OutputFile>$(OutDir)MetaGME2Uml_D.dll</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>$(GREAT_PATH)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <ModuleDefinitionFile>.\Component.def</ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(TargetDir)$(TargetName).pdb</ProgramDatabaseFile>
- <SubSystem>Windows</SubSystem>
- <RandomizedBaseAddress>false</RandomizedBaseAddress>
- <DataExecutionPrevention>
- </DataExecutionPrevention>
- <ImportLibrary>$(IntDir)\$(TargetName).lib</ImportLibrary>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugVS9|Win32'">
- <CustomBuildStep>
- <Message>Performing registration</Message>
- <Command>regsvr32 /s /c "$(TargetPath)" && ^
-echo regsvr32 exec. time > "$(IntDir)regsvr32.trg"
-</Command>
- <Outputs>$(IntDir)regsvr32.trg;%(Outputs)</Outputs>
- </CustomBuildStep>
- <Midl>
- <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <TargetEnvironment>Win32</TargetEnvironment>
- <TypeLibraryName>.\UML Debug/MetaGME2UML_interpreter.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <AdditionalOptions>/Zm400 %(AdditionalOptions)</AdditionalOptions>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>$(GREAT_PATH)\Libraries\MetaGMEAPI\;$(GREAT_PATH)\Libraries\UmlGMEAPI\;..\;.\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;_USRDLL;GME_INTERPRETER_USED;UML_CLASS_DIAGRAM;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <ProgramDataBaseFileName>$(IntDir)$(ProjectName).pdb</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
- <CompileAs>Default</CompileAs>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x0409</Culture>
- <AdditionalIncludeDirectories>$(UDM_PATH);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- </ResourceCompile>
- <Link>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <ModuleDefinitionFile>.\Component.def</ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(TargetDir)$(TargetName).pdb</ProgramDatabaseFile>
- <SubSystem>Windows</SubSystem>
- <RandomizedBaseAddress>false</RandomizedBaseAddress>
- <DataExecutionPrevention>
- </DataExecutionPrevention>
- <ImportLibrary>$(IntDir)\$(TargetName).lib</ImportLibrary>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugVS9|x64'">
- <CustomBuildStep>
- <Message>Performing registration</Message>
- <Command>regsvr32 /s /c "$(TargetPath)" && ^
-echo regsvr32 exec. time > "$(IntDir)regsvr32.trg"
-</Command>
- <Outputs>$(IntDir)regsvr32.trg;%(Outputs)</Outputs>
- </CustomBuildStep>
- <Midl>
- <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <TypeLibraryName>.\UML Debug/MetaGME2UML_interpreter.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <AdditionalOptions>/Zm400 %(AdditionalOptions)</AdditionalOptions>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>$(GREAT_PATH)\Libraries\MetaGMEAPI\;$(GREAT_PATH)\Libraries\UmlGMEAPI\;..\;.\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;_USRDLL;GME_INTERPRETER_USED;UML_CLASS_DIAGRAM;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <ProgramDataBaseFileName>$(IntDir)$(ProjectName).pdb</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- <CompileAs>Default</CompileAs>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x0409</Culture>
- <AdditionalIncludeDirectories>$(UDM_PATH);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- </ResourceCompile>
- <Link>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<ModuleDefinitionFile>.\Component.def</ModuleDefinitionFile>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(TargetDir)$(TargetName).pdb</ProgramDatabaseFile>
@@ -454,105 +271,6 @@
<Link>
<OutputFile>$(OutDir)MetaGME2Uml.dll</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>$(GREAT_PATH)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <ModuleDefinitionFile>.\Component.def</ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(TargetDir)$(TargetName).pdb</ProgramDatabaseFile>
- <SubSystem>Windows</SubSystem>
- <RandomizedBaseAddress>false</RandomizedBaseAddress>
- <DataExecutionPrevention>
- </DataExecutionPrevention>
- <ImportLibrary>$(IntDir)\$(TargetName).lib</ImportLibrary>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseVS9|Win32'">
- <CustomBuildStep>
- <Message>Performing registration</Message>
- <Command>regsvr32 /s /c "$(TargetPath)" && ^
-echo regsvr32 exec. time > "$(IntDir)regsvr32.trg"
-</Command>
- <Outputs>$(IntDir)regsvr32.trg;%(Outputs)</Outputs>
- </CustomBuildStep>
- <Midl>
- <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <TargetEnvironment>Win32</TargetEnvironment>
- <TypeLibraryName>.\UML Release/MetaGME2UML_interpreter.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <AdditionalOptions>/Zm200 %(AdditionalOptions)</AdditionalOptions>
- <Optimization>MinSpace</Optimization>
- <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>$(GREAT_PATH)\Libraries\MetaGMEAPI\;$(GREAT_PATH)\Libraries\UmlGMEAPI\;..\;.\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;_USRDLL;GME_INTERPRETER_USED;_CRT_SECURE_NO_WARNINGS;UML_CLASS_DIAGRAM;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <StringPooling>true</StringPooling>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <ProgramDataBaseFileName>$(IntDir)$(ProjectName).pdb</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- <CompileAs>Default</CompileAs>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x0409</Culture>
- <AdditionalIncludeDirectories>$(UDM_PATH);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- </ResourceCompile>
- <Link>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <ModuleDefinitionFile>.\Component.def</ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(TargetDir)$(TargetName).pdb</ProgramDatabaseFile>
- <SubSystem>Windows</SubSystem>
- <RandomizedBaseAddress>false</RandomizedBaseAddress>
- <DataExecutionPrevention>
- </DataExecutionPrevention>
- <ImportLibrary>$(IntDir)\$(TargetName).lib</ImportLibrary>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseVS9|x64'">
- <CustomBuildStep>
- <Message>Performing registration</Message>
- <Command>regsvr32 /s /c "$(TargetPath)" && ^
-echo regsvr32 exec. time > "$(IntDir)regsvr32.trg"
-</Command>
- <Outputs>$(IntDir)regsvr32.trg;%(Outputs)</Outputs>
- </CustomBuildStep>
- <Midl>
- <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <TypeLibraryName>.\UML Release/MetaGME2UML_interpreter.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <AdditionalOptions>/Zm200 %(AdditionalOptions)</AdditionalOptions>
- <Optimization>MinSpace</Optimization>
- <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>$(GREAT_PATH)\Libraries\MetaGMEAPI\;$(GREAT_PATH)\Libraries\UmlGMEAPI\;..\;.\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;_USRDLL;GME_INTERPRETER_USED;_CRT_SECURE_NO_WARNINGS;UML_CLASS_DIAGRAM;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <StringPooling>true</StringPooling>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <ProgramDataBaseFileName>$(IntDir)$(ProjectName).pdb</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- <CompileAs>Default</CompileAs>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x0409</Culture>
- <AdditionalIncludeDirectories>$(UDM_PATH);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- </ResourceCompile>
- <Link>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<ModuleDefinitionFile>.\Component.def</ModuleDefinitionFile>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(TargetDir)$(TargetName).pdb</ProgramDatabaseFile>
@@ -565,10 +283,10 @@
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="$(GME_ROOT)\Sdk\Bon\Common\ComHelp.cpp" />
- <ClCompile Include="$(GME_ROOT)\Sdk\Bon\Common\ComponentDll.cpp">
- </ClCompile>
+ <ClCompile Include="$(GME_ROOT)\Sdk\Bon\Common\ComponentDll.cpp"/>
<ClCompile Include="$(GME_ROOT)\SDK\BON\Common\ComponentObj.cpp" />
<ClCompile Include="$(GME_ROOT)\Sdk\Bon\Common\Exceptions.cpp" />
+ <ClCompile Include="UdmConsole.cpp" />
<ClCompile Include="..\MetaGME2UML.cpp">
</ClCompile>
<ClCompile Include="..\MetaGME2UML_2.cpp">
@@ -578,24 +296,15 @@
<ClCompile Include="StdAfx.cpp">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
- <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='DebugVS9|Win32'">Create</PrecompiledHeader>
- <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='DebugVS9|x64'">Create</PrecompiledHeader>
<PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">stdafx.h</PrecompiledHeaderFile>
<PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">stdafx.h</PrecompiledHeaderFile>
- <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='DebugVS9|Win32'">stdafx.h</PrecompiledHeaderFile>
- <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='DebugVS9|x64'">stdafx.h</PrecompiledHeaderFile>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
- <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='ReleaseVS9|Win32'">Create</PrecompiledHeader>
- <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='ReleaseVS9|x64'">Create</PrecompiledHeader>
<PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">stdafx.h</PrecompiledHeaderFile>
<PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">stdafx.h</PrecompiledHeaderFile>
- <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='ReleaseVS9|Win32'">stdafx.h</PrecompiledHeaderFile>
- <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='ReleaseVS9|x64'">stdafx.h</PrecompiledHeaderFile>
</ClCompile>
<ClCompile Include="UdmApp.cpp">
</ClCompile>
- <ClCompile Include="UdmConsole.cpp" />
</ItemGroup>
<ItemGroup>
<None Include="Component.def" />
@@ -607,76 +316,42 @@
<ResourceCompile Include="Component.rc">
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='DebugVS9|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='DebugVS9|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OUTDIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OUTDIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='DebugVS9|Win32'">$(OUTDIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='DebugVS9|x64'">$(OUTDIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='ReleaseVS9|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='ReleaseVS9|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OUTDIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OUTDIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='ReleaseVS9|Win32'">$(OUTDIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='ReleaseVS9|x64'">$(OUTDIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
</ItemGroup>
<ItemGroup>
<Midl Include="$(GME_ROOT)\Sdk\Bon\Common\ComponentLib.idl">
<AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalOptions)</AdditionalOptions>
<AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalOptions)</AdditionalOptions>
- <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='DebugVS9|Win32'">%(AdditionalOptions)</AdditionalOptions>
- <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='DebugVS9|x64'">%(AdditionalOptions)</AdditionalOptions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='DebugVS9|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='DebugVS9|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<TargetEnvironment Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Win32</TargetEnvironment>
- <TargetEnvironment Condition="'$(Configuration)|$(Platform)'=='DebugVS9|Win32'">Win32</TargetEnvironment>
<TypeLibraryName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
</TypeLibraryName>
<TypeLibraryName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
</TypeLibraryName>
- <TypeLibraryName Condition="'$(Configuration)|$(Platform)'=='DebugVS9|Win32'">
- </TypeLibraryName>
- <TypeLibraryName Condition="'$(Configuration)|$(Platform)'=='DebugVS9|x64'">
- </TypeLibraryName>
<HeaderFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
</HeaderFileName>
<HeaderFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
</HeaderFileName>
- <HeaderFileName Condition="'$(Configuration)|$(Platform)'=='DebugVS9|Win32'">
- </HeaderFileName>
- <HeaderFileName Condition="'$(Configuration)|$(Platform)'=='DebugVS9|x64'">
- </HeaderFileName>
<AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalOptions)</AdditionalOptions>
<AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalOptions)</AdditionalOptions>
- <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='ReleaseVS9|Win32'">%(AdditionalOptions)</AdditionalOptions>
- <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='ReleaseVS9|x64'">%(AdditionalOptions)</AdditionalOptions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='ReleaseVS9|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='ReleaseVS9|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<TargetEnvironment Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Win32</TargetEnvironment>
- <TargetEnvironment Condition="'$(Configuration)|$(Platform)'=='ReleaseVS9|Win32'">Win32</TargetEnvironment>
<TypeLibraryName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
</TypeLibraryName>
<TypeLibraryName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
</TypeLibraryName>
- <TypeLibraryName Condition="'$(Configuration)|$(Platform)'=='ReleaseVS9|Win32'">
- </TypeLibraryName>
- <TypeLibraryName Condition="'$(Configuration)|$(Platform)'=='ReleaseVS9|x64'">
- </TypeLibraryName>
<HeaderFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
</HeaderFileName>
<HeaderFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
</HeaderFileName>
- <HeaderFileName Condition="'$(Configuration)|$(Platform)'=='ReleaseVS9|Win32'">
- </HeaderFileName>
- <HeaderFileName Condition="'$(Configuration)|$(Platform)'=='ReleaseVS9|x64'">
- </HeaderFileName>
</Midl>
</ItemGroup>
<ItemGroup>
@@ -691,7 +366,6 @@
<ClInclude Include="StdAfx.h" />
<ClInclude Include="UdmApp.h" />
<ClInclude Include="UdmConfig.h" />
- <ClInclude Include="UdmConsole.h" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\Libraries\MetaGMEAPI\MetaGMEAPIVS2010.vcxproj">
Modified: GReAT/trunk/Tools/MetaGME2UMX/MetaGME2UMX Interpreters/MetaGME2UMT_interpreterVS2010.vcxproj
==============================================================================
--- GReAT/trunk/Tools/MetaGME2UMX/MetaGME2UMX Interpreters/MetaGME2UMT_interpreterVS2010.vcxproj Thu Feb 8 12:22:28 2018 (r4410)
+++ GReAT/trunk/Tools/MetaGME2UMX/MetaGME2UMX Interpreters/MetaGME2UMT_interpreterVS2010.vcxproj Thu Feb 8 12:28:47 2018 (r4411)
@@ -35,7 +35,7 @@
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
- <ProjectName>MetaGME2UMT Interpreters</ProjectName>
+ <ProjectName>MetaGME2UMTInterpreter</ProjectName>
<ProjectGuid>{BB01B6C2-A5F2-4733-9DB4-558168B2E970}</ProjectGuid>
<RootNamespace>MetaGME2UMT Interpreters</RootNamespace>
</PropertyGroup>
Modified: GReAT/trunk/Tools/MetaGME2UMX/MetaGME2UMX Interpreters/RawComponent.cpp
==============================================================================
--- GReAT/trunk/Tools/MetaGME2UMX/MetaGME2UMX Interpreters/RawComponent.cpp Thu Feb 8 12:22:28 2018 (r4410)
+++ GReAT/trunk/Tools/MetaGME2UMX/MetaGME2UMX Interpreters/RawComponent.cpp Thu Feb 8 12:28:47 2018 (r4411)
@@ -6,8 +6,8 @@
///////////////////////////////////////////////////////////////////////////
#include "stdafx.h"
-#include <ComHelp.h>
-#include <GMECOM.h>
+#include "ComHelp.h"
+#include "GMECOM.h"
#include "ComponentConfig.h"
#include "UdmConfig.h"
#if _MSC_VER >= 1900 || !defined(__INTELLISENSE__)
More information about the Mobies-commit
mailing list