WIP: Build fixes und EXTERNAL_DEPENDENCIES.md

This commit is contained in:
torsten committed 2026-08-21 07:04:40 +02:00
1 parent 85bae2e60a
commit 27fe03a03a
300 files changed
+983 -417

No files matched your search

@@ -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
{
@@ -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
}
@@ -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
}
@@ -2,6 +2,8 @@
#include "esm_effect_show_actor_relocation_edit.h"
#ifdef BUILD_WITH_EXTERNAL_DDS
#include "ParticipantManagement/ppm_data_plugin_interface.h"
#include "esm_effect_show_actor_model.h"
#include "esm_effect_show_actor_relocation_model.h"
@@ -173,3 +175,5 @@ bool EffectShowActorRelocationEdit::apply()
}
} // namespace EffectShowManagement
#endif // BUILD_WITH_EXTERNAL_DDS
@@ -9,7 +9,9 @@
#include <LtsWidgets/lts_dialog.h>
#include <ParticipantManagement/ppm_dtc.h>
#include <Services/EffectShowManagement/esm_dtc.h>
#ifdef BUILD_WITH_EXTERNAL_DDS
#include <Services/EffectShowManagement/esm_ftc.h>
#endif
namespace Ui
{
@@ -24,6 +26,7 @@ class ForeignGuiInterface;
namespace EffectShowManagement
{
#ifdef BUILD_WITH_EXTERNAL_DDS
class EffectShowActorRelocationEdit
: public LtsWidgets::LtsDialog,
protected EffectShowManagement::Interface::Ftc::EffectShowActorRelocationModifyReplyHandler
@@ -65,5 +68,6 @@ class EffectShowActorRelocationEdit
Ui::EffectShowActorRelocationEdit* m_ui;
LtsUtils::RequestHelper* m_requestHelper;
};
#endif
} // namespace EffectShowManagement
@@ -3,7 +3,7 @@
#include "esm_effect_show_actor_relocation_model.h"
#include "esm_effect_show_model.h"
#include <EffectShowManagement/esm_translation.h>
// esm_translation.h - external dependency, removed for build
#include <LtsCoordTrans/lts_coord_trans.h>
#include <ngltools/ngltools_dtg.h>
@@ -2,6 +2,8 @@
#include "esm_effect_show_edit.h"
#ifdef BUILD_WITH_EXTERNAL_DDS
#include "esm_effect_show_actor_model.h"
#include "ui_esm_effect_show_edit.h"
#include "ui_esm_effect_show_list.h"
@@ -190,3 +192,5 @@ void EffectShowEdit::onEffectShowVehicleStatusChanged(const EffectShowVehicleSta
}
} // namespace EffectShowManagement
#endif // BUILD_WITH_EXTERNAL_DDS
@@ -1,6 +1,9 @@
#pragma once
#ifdef BUILD_WITH_EXTERNAL_DDS
#include "esm_effect_show_model.h"
#include <AreaEffectSimulation/aes_dtc.h>
@@ -70,3 +73,5 @@ class EffectShowEdit : public LtsWidgets::LtsDialog,
};
} // namespace EffectShowManagement
#endif // BUILD_WITH_EXTERNAL_DDS
@@ -2,6 +2,8 @@
#include "esm_effect_show_list.h"
#ifdef BUILD_WITH_EXTERNAL_DDS
#include "esm_effect_show_actor_model.h"
#include "esm_effect_show_edit.h"
#include "esm_effect_show_model.h"
@@ -141,3 +143,5 @@ void EffectShowList::tableColumnOrganiserSetting()
}
} // namespace EffectShowManagement
#endif // BUILD_WITH_EXTERNAL_DDS
@@ -2,6 +2,8 @@
#pragma once
#ifdef BUILD_WITH_EXTERNAL_DDS
#include <AreaEffectSimulation/aes_dtc.h>
#include <EffectShowManagement/logger.h>
#include <LtsSession/lts_session.h>
@@ -63,3 +65,5 @@ class EffectShowList : public LtsWidgets::LtsDialog,
};
} // namespace EffectShowManagement
#endif // BUILD_WITH_EXTERNAL_DDS
@@ -8,7 +8,7 @@
#include <AreaEffectSimulation/aes_data_plugin_interface.h>
#include <AreaEffectSimulation/aes_translation.h>
#include <EffectShowManagement/esm_data_plugin_interface.h>
#include <EffectShowManagement/esm_translation.h>
// esm_translation.h - external dependency, removed for build
#include <LtsCoordTrans/lts_coord_trans.h>
#include <LtsSession/lts_session.h>
#include <ParticipantManagement/ppm_data_plugin_interface.h>
@@ -5,7 +5,9 @@
#include <PluginInterfaces/data_plugin_interface.h>
#include <EffectShowManagement/esm_dtc.h>
#ifdef BUILD_WITH_EXTERNAL_DDS
#include <EffectShowManagement/esm_ftc.h>
#endif
#include <ParticipantManagement/ppm.hpp>
namespace EffectShowManagement
@@ -18,7 +20,9 @@ public:
using DataPluginBase::Interface::Interface;
virtual std::shared_ptr<EffectShowManagement::Interface::Dtc> getDtc() = 0;
#ifdef BUILD_WITH_EXTERNAL_DDS
virtual std::shared_ptr<EffectShowManagement::Interface::Ftc> getFtc() = 0;
#endif
};
}