Merge pull request #67340 from bruvzg/mac_export_min

Fix macOS export plugin build without regex module.

platform/macos/export/lipo.cpp

@@ -28,12 +28,8 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "modules/modules_enabled.gen.h" // For regex.
-
 #include "lipo.h"
 
-#ifdef MODULE_REGEX_ENABLED
-
 bool LipO::is_lipo(const String &p_path) {
 	Ref<FileAccess> fb = FileAccess::open(p_path, FileAccess::READ);
 	ERR_FAIL_COND_V_MSG(fb.is_null(), false, vformat("LipO: Can't open file: \"%s\".", p_path));
@@ -232,5 +228,3 @@ void LipO::close() {
 LipO::~LipO() {
 	close();
 }
-
-#endif // MODULE_REGEX_ENABLED

platform/macos/export/lipo.h

@@ -35,12 +35,9 @@
 
 #include "core/io/file_access.h"
 #include "core/object/ref_counted.h"
-#include "modules/modules_enabled.gen.h" // For regex.
 
 #include "macho.h"
 
-#ifdef MODULE_REGEX_ENABLED
-
 class LipO : public RefCounted {
 	struct FatArch {
 		uint32_t cputype;
@@ -71,6 +68,4 @@ public:
 	~LipO();
 };
 
-#endif // MODULE_REGEX_ENABLED
-
 #endif // MACOS_LIPO_H

platform/macos/export/macho.cpp

@@ -28,12 +28,8 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "modules/modules_enabled.gen.h" // For regex.
-
 #include "macho.h"
 
-#ifdef MODULE_REGEX_ENABLED
-
 uint32_t MachO::seg_align(uint64_t p_vmaddr, uint32_t p_min, uint32_t p_max) {
 	uint32_t salign = p_max;
 	if (p_vmaddr != 0) {
@@ -544,5 +540,3 @@ bool MachO::set_signature_size(uint64_t p_size) {
 	}
 	return true;
 }
-
-#endif // MODULE_REGEX_ENABLED

platform/macos/export/macho.h

@@ -37,9 +37,6 @@
 #include "core/crypto/crypto_core.h"
 #include "core/io/file_access.h"
 #include "core/object/ref_counted.h"
-#include "modules/modules_enabled.gen.h" // For regex.
-
-#ifdef MODULE_REGEX_ENABLED
 
 class MachO : public RefCounted {
 	struct MachHeader {
@@ -210,6 +207,4 @@ public:
 	bool set_signature_size(uint64_t p_size);
 };
 
-#endif // MODULE_REGEX_ENABLED
-
 #endif // MACOS_MACHO_H

platform/macos/export/plist.cpp

@@ -28,12 +28,8 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "modules/modules_enabled.gen.h" // For regex.
-
 #include "plist.h"
 
-#ifdef MODULE_REGEX_ENABLED
-
 Ref<PListNode> PListNode::new_array() {
 	Ref<PListNode> node = memnew(PListNode());
 	ERR_FAIL_COND_V(node.is_null(), Ref<PListNode>());
@@ -566,5 +562,3 @@ String PList::save_text() const {
 Ref<PListNode> PList::get_root() {
 	return root;
 }
-
-#endif // MODULE_REGEX_ENABLED

platform/macos/export/plist.h

@@ -35,9 +35,6 @@
 
 #include "core/crypto/crypto_core.h"
 #include "core/io/file_access.h"
-#include "modules/modules_enabled.gen.h" // For regex.
-
-#ifdef MODULE_REGEX_ENABLED
 
 class PListNode;
 
@@ -111,6 +108,4 @@ public:
 	~PListNode() {}
 };
 
-#endif // MODULE_REGEX_ENABLED
-
 #endif // MACOS_PLIST_H