diff --git a/addons/compat_cup_terrains/addon.toml b/addons/compat_cup_terrains/addon.toml new file mode 100644 index 0000000000..bf39213892 --- /dev/null +++ b/addons/compat_cup_terrains/addon.toml @@ -0,0 +1,3 @@ +[tools] +pboProject_noBinConfig = true +sqfvm_skipConfigChecks = true diff --git a/addons/compat_cup_terrains/config.cpp b/addons/compat_cup_terrains/config.cpp index a7020be4da..ab58974a32 100644 --- a/addons/compat_cup_terrains/config.cpp +++ b/addons/compat_cup_terrains/config.cpp @@ -1,6 +1,15 @@ #include "script_component.hpp" #include "\z\ace\addons\refuel\defines.hpp" +// Remove after next cup release +#pragma hemtt flag pe23_ignore_has_include +#if __has_include("\cup\CUP_Terrains_ACE_compat\config.bin") +#define PATCH_SKIP "CUP_Terrains_ACE_compat" +#endif + +#ifdef PATCH_SKIP +ACE_PATCH_NOT_LOADED(ADDON,PATCH_SKIP) +#else class CfgPatches { class ADDON { name = COMPONENT_NAME; @@ -25,3 +34,5 @@ class CfgPatches { #include "CfgVehicles.hpp" #include "CfgEventHandlers.hpp" + +#endif diff --git a/addons/compat_cup_vehicles/addon.toml b/addons/compat_cup_vehicles/addon.toml new file mode 100644 index 0000000000..bf39213892 --- /dev/null +++ b/addons/compat_cup_vehicles/addon.toml @@ -0,0 +1,3 @@ +[tools] +pboProject_noBinConfig = true +sqfvm_skipConfigChecks = true diff --git a/addons/compat_cup_vehicles/config.cpp b/addons/compat_cup_vehicles/config.cpp index 513993ef57..624d411fa4 100644 --- a/addons/compat_cup_vehicles/config.cpp +++ b/addons/compat_cup_vehicles/config.cpp @@ -1,5 +1,14 @@ #include "script_component.hpp" +// Remove after next cup release +#pragma hemtt flag pe23_ignore_has_include +#if __has_include("\cup\CUP_Vehicles_ACE_compat\config.bin") +#define PATCH_SKIP "CUP_Vehicles_ACE_compat" +#endif + +#ifdef PATCH_SKIP +ACE_PATCH_NOT_LOADED(ADDON,PATCH_SKIP) +#else class CfgPatches { class ADDON { name = COMPONENT_NAME; @@ -20,3 +29,5 @@ class CfgPatches { #include "CfgEventHandlers.hpp" #include "CfgVehicles.hpp" + +#endif diff --git a/addons/compat_cup_weapons/addon.toml b/addons/compat_cup_weapons/addon.toml new file mode 100644 index 0000000000..bf39213892 --- /dev/null +++ b/addons/compat_cup_weapons/addon.toml @@ -0,0 +1,3 @@ +[tools] +pboProject_noBinConfig = true +sqfvm_skipConfigChecks = true diff --git a/addons/compat_cup_weapons/config.cpp b/addons/compat_cup_weapons/config.cpp index e5fd022555..e4c073b084 100644 --- a/addons/compat_cup_weapons/config.cpp +++ b/addons/compat_cup_weapons/config.cpp @@ -1,5 +1,14 @@ #include "script_component.hpp" +// Remove after next cup release +#pragma hemtt flag pe23_ignore_has_include +#if __has_include("\cup\CUP_Weapons_ACE_compat\config.bin") +#define PATCH_SKIP "CUP_Weapons_ACE_compat" +#endif + +#ifdef PATCH_SKIP +ACE_PATCH_NOT_LOADED(ADDON,PATCH_SKIP) +#else class CfgPatches { class ADDON { name = COMPONENT_NAME; @@ -18,3 +27,5 @@ class CfgPatches { #include "CfgMagazines.hpp" #include "CfgWeapons.hpp" #include "CfgEventHandlers.hpp" + +#endif