2
0
Эх сурвалжийг харах

Merge pull request #72663 from akien-mga/project-converter-fix-no-regex-build

Fix no-regex build for ProjectConverter3to4
Rémi Verschelde 2 жил өмнө
parent
commit
62f2d122e6

+ 4 - 3
editor/project_converter_3_to_4.cpp

@@ -30,13 +30,14 @@
 
 #include "project_converter_3_to_4.h"
 
-#include "modules/modules_enabled.gen.h"
-
 #ifndef DISABLE_DEPRECATED
-#ifdef MODULE_REGEX_ENABLED
 
 const int ERROR_CODE = 77;
 
+#include "modules/modules_enabled.gen.h" // For regex.
+
+#ifdef MODULE_REGEX_ENABLED
+
 #include "modules/regex/regex.h"
 
 #include "core/io/dir_access.h"

+ 2 - 1
editor/project_converter_3_to_4.h

@@ -29,9 +29,10 @@
 /**************************************************************************/
 
 #ifndef PROJECT_CONVERTER_3_TO_4_H
-#ifndef DISABLE_DEPRECATED
 #define PROJECT_CONVERTER_3_TO_4_H
 
+#ifndef DISABLE_DEPRECATED
+
 #include "core/io/file_access.h"
 #include "core/object/ref_counted.h"
 #include "core/string/ustring.h"