BUILD_RTI=OFF: Fix remaining include and build issues
TrainingAreaBase: - Add BUILD_RTI guards to dds_handler.cpp (entire file) - Add BUILD_RTI guards to recv_from_dds_aes.h for tab_db.h include - Add BUILD_RTI guards to main_handler.h for tab_db.h include - Remove duplicate m_logger declaration in main_handler.h - Add stub headers for RTI types (tab_db_stub.hpp, tab_enums_stub.hpp, etc.) VideoOverlayManagement: - Fix member initialization order in handler_overlays.h - Fix member initialization order in avs_interface.h - Fix member initialization order in main_handler.h - Change logger.cpp include from NGLLogger.h to INGLLogger.h - Add BUILD_RTI guard to handler_overlays.cpp for RTI signal connection Plugins: - Migrate QDesktopWidget → QScreen in Light/Dark style plugins - Fix CMakeLists.txt for SituationReplayManagement (BUILD_RTI guards) - Fix CMakeLists.txt for CombatNetRadio (Qt6::Core linking) - Remove QDesktopWidget includes in multiple plugin files Infrastructure: - Remove duplicate INGLLogger.h include directory - Add stub headers for ProjectDataManagement (pdm.hpp, etc.) - Add stub headers for RoutingServiceNG BUILD_RTI=OFF build now compiles successfully (1112 targets).
This commit is contained in:
1 parent
4969e4ff9b
commit
793c9f8b81
43 files changed
+334
-56
No files matched your search
+60
@@ -0,0 +1,60 @@
|
||||
// Stub file for pdm - BUILD_RTI=OFF
|
||||
// Auto-generated stub to replace RTI IDL-generated code
|
||||
|
||||
#ifndef PDM_HPP
|
||||
#define PDM_HPP
|
||||
|
||||
#include "../pdm_enums_stub.hpp"
|
||||
#include "../pdm_stub.hpp"
|
||||
#include "../pdm_db_stub.hpp"
|
||||
|
||||
// Forward declarations and stub types for ProjectDataManagement namespace
|
||||
// Used when BUILD_RTI=OFF to allow compilation without RTI Connext DDS
|
||||
|
||||
namespace ProjectDataManagement {
|
||||
|
||||
// Stub types for RTI IDL-generated classes
|
||||
struct RadioGroup {
|
||||
int id = 0;
|
||||
};
|
||||
|
||||
struct ChargeType {
|
||||
int id = 0;
|
||||
};
|
||||
|
||||
struct GearClass {
|
||||
int id = 0;
|
||||
};
|
||||
|
||||
struct GearType {
|
||||
int id = 0;
|
||||
};
|
||||
|
||||
struct GearTypeChargeType {
|
||||
int id = 0;
|
||||
};
|
||||
|
||||
struct BuildingChargeEffect {
|
||||
int id = 0;
|
||||
};
|
||||
|
||||
struct VulnerabilityKind {
|
||||
int id = 0;
|
||||
};
|
||||
|
||||
struct CanComponentString {
|
||||
int id = 0;
|
||||
};
|
||||
|
||||
struct BiteComponentText {
|
||||
int id = 0;
|
||||
};
|
||||
|
||||
// Forward declaration for Interface::Dtc
|
||||
namespace Interface {
|
||||
class Dtc;
|
||||
}
|
||||
|
||||
} // namespace ProjectDataManagement
|
||||
|
||||
#endif // PDM_HPP
|
||||
+21
@@ -0,0 +1,21 @@
|
||||
// Stub file for pdm_db - BUILD_RTI=OFF
|
||||
// Auto-generated stub to replace RTI IDL-generated database code
|
||||
|
||||
#ifndef PDM_DB_STUB_HPP
|
||||
#define PDM_DB_STUB_HPP
|
||||
|
||||
#include "pdm_enums_stub.hpp"
|
||||
|
||||
namespace pdm {
|
||||
namespace db {
|
||||
|
||||
// Stub class to replace RTI IDL-generated database types
|
||||
class ProjectDatabase {
|
||||
public:
|
||||
virtual ~ProjectDatabase() = default;
|
||||
};
|
||||
|
||||
} // namespace db
|
||||
} // namespace pdm
|
||||
|
||||
#endif // PDM_DB_STUB_HPP
|
||||
+22
@@ -0,0 +1,22 @@
|
||||
// Stub file for pdm_enums - BUILD_RTI=OFF
|
||||
// Auto-generated stub to replace RTI IDL-generated code
|
||||
|
||||
#ifndef PDM_ENUMS_STUB_HPP
|
||||
#define PDM_ENUMS_STUB_HPP
|
||||
|
||||
namespace pdm {
|
||||
namespace enums {
|
||||
|
||||
// Stub enums to replace RTI IDL-generated types
|
||||
enum class ProjectState : int {
|
||||
Unknown = 0
|
||||
};
|
||||
|
||||
enum class ProjectType : int {
|
||||
Unknown = 0
|
||||
};
|
||||
|
||||
} // namespace enums
|
||||
} // namespace pdm
|
||||
|
||||
#endif // PDM_ENUMS_STUB_HPP
|
||||
@@ -0,0 +1,22 @@
|
||||
// Stub file for pdm - BUILD_RTI=OFF
|
||||
// Auto-generated stub to replace RTI IDL-generated code
|
||||
|
||||
#ifndef PDM_STUB_HPP
|
||||
#define PDM_STUB_HPP
|
||||
|
||||
#include "pdm_enums_stub.hpp"
|
||||
|
||||
namespace pdm {
|
||||
|
||||
// Stub structs to replace RTI IDL-generated types
|
||||
struct ProjectData {
|
||||
int id = 0;
|
||||
};
|
||||
|
||||
struct ProjectConfig {
|
||||
int projectId = 0;
|
||||
};
|
||||
|
||||
} // namespace pdm
|
||||
|
||||
#endif // PDM_STUB_HPP
|
||||
Reference in new issue
Block a user