godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Fix no-regex build for ProjectConverter3to4
This commit is contained in:
Rémi Verschelde 2023-02-06 15:36:23 +01:00
commit 62f2d122e6
No known key found for this signature in database
GPG Key ID: C3336907360768E1
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
editor/project_converter_3_to_4.cpp
View File

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

3
editor/project_converter_3_to_4.h
View File

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