Skip to content

Commit d6600ec

Browse files
ogruetzmannogruetzmann
committed
Adds EDDM Version
1 parent e790c3d commit d6600ec

File tree

4 files changed

+80
-1
lines changed

4 files changed

+80
-1
lines changed

‎.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -342,3 +342,5 @@ healthchecksdb
342342
/EsCenterLines/version.txt
343343
/EsCenterLines/SectorFileProviderDescriptor.txt
344344
/EsCenterLines/euroscope_sector_providers.txt
345+
/Release-EDDM
346+
/EsCenterLines/Release-EDDM/EsCenterLines.tlog

‎EsCenterLines.sln

+6
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ Global
1111
Debug|x86 = Debug|x86
1212
Release|x64 = Release|x64
1313
Release|x86 = Release|x86
14+
Release-EDDM|x64 = Release-EDDM|x64
15+
Release-EDDM|x86 = Release-EDDM|x86
1416
EndGlobalSection
1517
GlobalSection(ProjectConfigurationPlatforms) = postSolution
1618
{1CE802AD-3CB0-4510-B804-581A4205C1F9}.Debug|x64.ActiveCfg = Debug|x64
@@ -21,6 +23,10 @@ Global
2123
{1CE802AD-3CB0-4510-B804-581A4205C1F9}.Release|x64.Build.0 = Release|x64
2224
{1CE802AD-3CB0-4510-B804-581A4205C1F9}.Release|x86.ActiveCfg = Release|Win32
2325
{1CE802AD-3CB0-4510-B804-581A4205C1F9}.Release|x86.Build.0 = Release|Win32
26+
{1CE802AD-3CB0-4510-B804-581A4205C1F9}.Release-EDDM|x64.ActiveCfg = Release-EDDM|x64
27+
{1CE802AD-3CB0-4510-B804-581A4205C1F9}.Release-EDDM|x64.Build.0 = Release-EDDM|x64
28+
{1CE802AD-3CB0-4510-B804-581A4205C1F9}.Release-EDDM|x86.ActiveCfg = Release-EDDM|Win32
29+
{1CE802AD-3CB0-4510-B804-581A4205C1F9}.Release-EDDM|x86.Build.0 = Release-EDDM|Win32
2430
EndGlobalSection
2531
GlobalSection(SolutionProperties) = preSolution
2632
HideSolutionNode = FALSE

‎EsCenterLines/EsCenterLines.cpp

+5-1
Original file line numberDiff line numberDiff line change
@@ -188,12 +188,16 @@ void EsCenterLines::ReadRunways()
188188
SectorContainer container(this, EuroScopePlugIn::SECTOR_ELEMENT_RUNWAY);
189189
for (auto runway : container)
190190
{
191+
#ifdef __EDDM
192+
std::string name2 = runway.GetAirportName();
193+
if (!name2.starts_with("EDDM"))
194+
continue;
195+
#endif
191196
bool apt_active_arrival{ false };
192197
SectorContainer container(this, EuroScopePlugIn::SECTOR_ELEMENT_AIRPORT);
193198
for (auto airport : container)
194199
{
195200
auto name = airport.GetName();
196-
auto name2 = runway.GetAirportName();
197201
if (!strncmp(name, runway.GetAirportName(), strlen(name)))
198202
apt_active_arrival = airport.IsElementActive(false);
199203
}

‎EsCenterLines/EsCenterLines.vcxproj

+67
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,14 @@
55
<Configuration>Debug</Configuration>
66
<Platform>Win32</Platform>
77
</ProjectConfiguration>
8+
<ProjectConfiguration Include="Release-EDDM|Win32">
9+
<Configuration>Release-EDDM</Configuration>
10+
<Platform>Win32</Platform>
11+
</ProjectConfiguration>
12+
<ProjectConfiguration Include="Release-EDDM|x64">
13+
<Configuration>Release-EDDM</Configuration>
14+
<Platform>x64</Platform>
15+
</ProjectConfiguration>
816
<ProjectConfiguration Include="Release|Win32">
917
<Configuration>Release</Configuration>
1018
<Platform>Win32</Platform>
@@ -38,6 +46,13 @@
3846
<WholeProgramOptimization>true</WholeProgramOptimization>
3947
<CharacterSet>Unicode</CharacterSet>
4048
</PropertyGroup>
49+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-EDDM|Win32'" Label="Configuration">
50+
<ConfigurationType>DynamicLibrary</ConfigurationType>
51+
<UseDebugLibraries>false</UseDebugLibraries>
52+
<PlatformToolset>v142</PlatformToolset>
53+
<WholeProgramOptimization>true</WholeProgramOptimization>
54+
<CharacterSet>Unicode</CharacterSet>
55+
</PropertyGroup>
4156
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
4257
<ConfigurationType>Application</ConfigurationType>
4358
<UseDebugLibraries>true</UseDebugLibraries>
@@ -51,6 +66,13 @@
5166
<WholeProgramOptimization>true</WholeProgramOptimization>
5267
<CharacterSet>MultiByte</CharacterSet>
5368
</PropertyGroup>
69+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-EDDM|x64'" Label="Configuration">
70+
<ConfigurationType>Application</ConfigurationType>
71+
<UseDebugLibraries>false</UseDebugLibraries>
72+
<PlatformToolset>v142</PlatformToolset>
73+
<WholeProgramOptimization>true</WholeProgramOptimization>
74+
<CharacterSet>MultiByte</CharacterSet>
75+
</PropertyGroup>
5476
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
5577
<ImportGroup Label="ExtensionSettings">
5678
</ImportGroup>
@@ -62,19 +84,29 @@
6284
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
6385
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
6486
</ImportGroup>
87+
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-EDDM|Win32'" Label="PropertySheets">
88+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
89+
</ImportGroup>
6590
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
6691
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
6792
</ImportGroup>
6893
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
6994
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
7095
</ImportGroup>
96+
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-EDDM|x64'" Label="PropertySheets">
97+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
98+
</ImportGroup>
7199
<PropertyGroup Label="UserMacros" />
72100
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
73101
<TargetExt>.dll</TargetExt>
74102
</PropertyGroup>
75103
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
76104
<TargetExt>.dll</TargetExt>
77105
</PropertyGroup>
106+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-EDDM|Win32'">
107+
<TargetExt>.dll</TargetExt>
108+
<TargetName>$(ProjectName)-EDDM</TargetName>
109+
</PropertyGroup>
78110
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
79111
<ClCompile>
80112
<WarningLevel>Level3</WarningLevel>
@@ -122,6 +154,26 @@
122154
<AdditionalDependencies>EuroScopePlugInDll.lib;Geographic.lib;%(AdditionalDependencies)</AdditionalDependencies>
123155
</Link>
124156
</ItemDefinitionGroup>
157+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-EDDM|Win32'">
158+
<ClCompile>
159+
<WarningLevel>Level3</WarningLevel>
160+
<Optimization>MaxSpeed</Optimization>
161+
<FunctionLevelLinking>true</FunctionLevelLinking>
162+
<IntrinsicFunctions>true</IntrinsicFunctions>
163+
<SDLCheck>true</SDLCheck>
164+
<ConformanceMode>true</ConformanceMode>
165+
<AdditionalIncludeDirectories>C:\GeographicLib-1.50\include;C:\Program Files %28x86%29\EuroScope\PlugInEnvironment;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
166+
<LanguageStandard>stdcpplatest</LanguageStandard>
167+
<PreprocessorDefinitions>GEOGRAPHICLIB_SHARED_LIB=0;__EDDM;%(PreprocessorDefinitions)</PreprocessorDefinitions>
168+
</ClCompile>
169+
<Link>
170+
<SubSystem>Console</SubSystem>
171+
<EnableCOMDATFolding>true</EnableCOMDATFolding>
172+
<OptimizeReferences>true</OptimizeReferences>
173+
<AdditionalLibraryDirectories>C:\Program Files (x86)\EuroScope\PlugInEnvironment;C:\GeographicLib-1.50\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
174+
<AdditionalDependencies>EuroScopePlugInDll.lib;Geographic.lib;%(AdditionalDependencies)</AdditionalDependencies>
175+
</Link>
176+
</ItemDefinitionGroup>
125177
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
126178
<ClCompile>
127179
<WarningLevel>Level3</WarningLevel>
@@ -137,6 +189,21 @@
137189
<OptimizeReferences>true</OptimizeReferences>
138190
</Link>
139191
</ItemDefinitionGroup>
192+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-EDDM|x64'">
193+
<ClCompile>
194+
<WarningLevel>Level3</WarningLevel>
195+
<Optimization>MaxSpeed</Optimization>
196+
<FunctionLevelLinking>true</FunctionLevelLinking>
197+
<IntrinsicFunctions>true</IntrinsicFunctions>
198+
<SDLCheck>true</SDLCheck>
199+
<ConformanceMode>true</ConformanceMode>
200+
</ClCompile>
201+
<Link>
202+
<SubSystem>Console</SubSystem>
203+
<EnableCOMDATFolding>true</EnableCOMDATFolding>
204+
<OptimizeReferences>true</OptimizeReferences>
205+
</Link>
206+
</ItemDefinitionGroup>
140207
<ItemGroup>
141208
<ClCompile Include="CenterLinesScreen.cpp" />
142209
<ClCompile Include="EsCenterLines.cpp" />

0 commit comments

Comments
 (0)