WIP: Build fixes und EXTERNAL_DEPENDENCIES.md
This commit is contained in:
300 files changed
+983
-417
No files matched your search
@@ -8,7 +8,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <LtsUtilsCore/qpoint3d.h>
|
||||
#include <LtsUtils/LtsUtilsCore/qpoint3d.h>
|
||||
|
||||
//----------------------------------------------------------------------------
|
||||
namespace SituationMap
|
||||
|
||||
+9
@@ -17,6 +17,7 @@
|
||||
namespace AdvancedSymbology
|
||||
{
|
||||
|
||||
#ifdef BUILD_WITH_EXTERNAL_DDS
|
||||
// forwarding of enum which is declared within a class is not possible:
|
||||
// enum class ParticipantManagement::Role;
|
||||
|
||||
@@ -44,6 +45,14 @@ AdvancedSymbology::Role roleToRole(const PARTICIPANT_ROLE_TYPE role)
|
||||
|
||||
return AdvancedSymbology::Role::Unknown;
|
||||
}
|
||||
#else
|
||||
// STUB: Role-Conversion ohne externe DDS-Typen
|
||||
template<class PARTICIPANT_ROLE_TYPE>
|
||||
AdvancedSymbology::Role roleToRole(const PARTICIPANT_ROLE_TYPE /*role*/)
|
||||
{
|
||||
return AdvancedSymbology::Role::Unknown;
|
||||
}
|
||||
#endif
|
||||
|
||||
} // namespace AdvancedSymbology
|
||||
|
||||
@@ -25,11 +25,13 @@
|
||||
class QValidator;
|
||||
|
||||
|
||||
#ifdef BUILD_ARCGIS
|
||||
# include <arcgis/arcgisversion.h> // This file is created by RME, not ESRI
|
||||
|
||||
#if ACRGIS_VERSION >= 0x640600 // 100.6.0 / Update 6
|
||||
//# define USE_ARCADE_SYMBOLOGY
|
||||
#endif
|
||||
#endif // BUILD_ARCGIS
|
||||
|
||||
|
||||
//----------------------------------------------------------------------------
|
||||
|
||||
Reference in new issue
Block a user