diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2023-02-06 15:36:23 +0100 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2023-02-06 15:36:23 +0100 |
| commit | 62f2d122e605599575c83c1e738e59466ec9afe5 (patch) | |
| tree | f3e871de49efd45d3a3e9706293baa00e7daba59 /editor | |
| parent | 9d3b4b0b407536347a61d473c77e3a1cce2afa07 (diff) | |
| parent | 480e991656986137fea880886ce2cfde979a9489 (diff) | |
Merge pull request #72663 from akien-mga/project-converter-fix-no-regex-build
Fix no-regex build for ProjectConverter3to4
Diffstat (limited to 'editor')
| -rw-r--r-- | editor/project_converter_3_to_4.cpp | 7 | ||||
| -rw-r--r-- | editor/project_converter_3_to_4.h | 3 |
2 files changed, 6 insertions, 4 deletions
diff --git a/editor/project_converter_3_to_4.cpp b/editor/project_converter_3_to_4.cpp index 26f872421e..706466a974 100644 --- a/editor/project_converter_3_to_4.cpp +++ b/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" diff --git a/editor/project_converter_3_to_4.h b/editor/project_converter_3_to_4.h index 6ec2dd188d..641bc467ac 100644 --- a/editor/project_converter_3_to_4.h +++ b/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" |