WIP: Build fixes und EXTERNAL_DEPENDENCIES.md
This commit is contained in:
300 files changed
+983
-417
No files matched your search
+2
-1
@@ -3,7 +3,8 @@
|
||||
|
||||
#include "esm_combobox.h"
|
||||
#include <QComboBox>
|
||||
#include <EffectShowManagement/esm_translation.h>
|
||||
|
||||
// esm_translation.h - external dependency, removed for build
|
||||
|
||||
namespace EffectShowManagement
|
||||
{
|
||||
|
||||
+7
-1
@@ -2,13 +2,18 @@
|
||||
|
||||
#include "esm_combobox_gui_plugin.h"
|
||||
#include "esm_combobox.h"
|
||||
#include <EffectShowManagement/esm_translation.h>
|
||||
#include <LtsWidgets/lts_combo_box.h>
|
||||
#include <LtsCoordTrans/lts_coord_trans.h>
|
||||
|
||||
#ifdef BUILD_WITH_EXTERNAL_DDS
|
||||
#include <EffectShowManagement/esm_translation.h>
|
||||
// External DDS types available
|
||||
#endif
|
||||
|
||||
namespace EffectShowManagement
|
||||
{
|
||||
|
||||
#ifdef BUILD_WITH_EXTERNAL_DDS
|
||||
ForeignGuiComboboxInterfaceImpl::ForeignGuiComboboxInterfaceImpl()
|
||||
: m_dtc(nullptr)
|
||||
{}
|
||||
@@ -189,5 +194,6 @@ bool ForeignGuiComboboxInterfaceImpl::isMatchedByFilter(const EffectShowVehicleS
|
||||
|
||||
return true;
|
||||
}
|
||||
#endif
|
||||
|
||||
}
|
||||
+29
-2
@@ -4,15 +4,19 @@
|
||||
#pragma once
|
||||
|
||||
#include <EffectShowManagement/esm_dtc.h>
|
||||
#include <ParticipantManagement/ppm.hpp>
|
||||
#include <AreaEffectSimulation/aes_dtc.h>
|
||||
#include <EffectShowManagement/esm_gui_combobox_plugin_interface.h>
|
||||
#include <LtsSession/lts_session.h>
|
||||
|
||||
#ifdef BUILD_WITH_EXTERNAL_DDS
|
||||
#include <ParticipantManagement/ppm.hpp>
|
||||
#include <AreaEffectSimulation/aes_dtc.h>
|
||||
#endif
|
||||
|
||||
namespace EffectShowManagement
|
||||
{
|
||||
enum class ComboBoxType;
|
||||
|
||||
#ifdef BUILD_WITH_EXTERNAL_DDS
|
||||
class ForeignGuiComboboxInterfaceImpl : public QObject, public ForeignGuiComboboxInterface
|
||||
{
|
||||
Q_OBJECT
|
||||
@@ -39,5 +43,28 @@ private:
|
||||
int m_featureFilter;
|
||||
QComboBox *m_cbx;
|
||||
};
|
||||
#else
|
||||
// STUB: External DDS dependencies not available
|
||||
class ForeignGuiComboboxInterfaceImpl : public QObject, public ForeignGuiComboboxInterface
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
ForeignGuiComboboxInterfaceImpl() = default;
|
||||
~ForeignGuiComboboxInterfaceImpl() override = default;
|
||||
|
||||
bool init(const std::shared_ptr<EffectShowManagement::Interface::Dtc> &/*dtc*/,
|
||||
const std::shared_ptr<ParticipantManagement::Interface::Dtc> &/*ppmDtc*/,
|
||||
const std::shared_ptr<AreaEffectSimulation::Interface::Dtc> &/*aesDtc*/)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
void uninit() {}
|
||||
|
||||
bool fillActorComboBox(QComboBox */*cbx*/, const Core::GeoPosition &/*targetPosition*/, const bool /*isSmoke*/, const int /*featureFilter*/) override
|
||||
{
|
||||
return false;
|
||||
}
|
||||
};
|
||||
#endif
|
||||
|
||||
}
|
||||
Reference in new issue
Block a user