diff options
| -rw-r--r-- | doc/base/classes.xml | 6 | ||||
| -rw-r--r-- | platform/windows/export/export.cpp | 4 | ||||
| -rw-r--r-- | platform/windows/export/export.h | 2 | ||||
| -rw-r--r-- | tools/pe_bliss/pe_section.cpp | 1 |
4 files changed, 9 insertions, 4 deletions
diff --git a/doc/base/classes.xml b/doc/base/classes.xml index e805adce6d..da53cb90a5 100644 --- a/doc/base/classes.xml +++ b/doc/base/classes.xml @@ -26857,7 +26857,11 @@ This method controls whether the position between two cached points is interpola Lazy (non-greedy) quantifiers [code]*?[/code] Begining [code]^[/code] and end [code]$[/code] anchors Alternation [code]|[/code] - Backreferences [code]\1[/code] to [code]\99[/code] + Backreferences [code]\1[/code] to [code]\9[/code] + POSIX character classes [code][[:alnum:]][/code] + Lookahead [code](?=)[/code], [code](?!)[/code] and lookbehind [code](?<=)[/code], [code](?<!)[/code] + ASCII [code]\xFF[/code] and Unicode [code]\uFFFF[/code] code points (in a style similar to Python) + Word boundaries [code]\b[/code], [code]\B[/code] </description> <methods> <method name="compile"> diff --git a/platform/windows/export/export.cpp b/platform/windows/export/export.cpp index d09152234a..29f21bf227 100644 --- a/platform/windows/export/export.cpp +++ b/platform/windows/export/export.cpp @@ -197,9 +197,9 @@ void EditorExportPlatformWindows::_get_property_list( List<PropertyInfo> *p_list } -Error EditorExportPlatformWindows::export_project(const String& p_path, bool p_debug, bool p_dumb,bool p_remote_debug) { +Error EditorExportPlatformWindows::export_project(const String& p_path, bool p_debug, int p_flags) { - Error err = EditorExportPlatformPC::export_project(p_path, p_debug, p_dumb, p_remote_debug); + Error err = EditorExportPlatformPC::export_project(p_path, p_debug, p_flags); if(err != OK) { return err; diff --git a/platform/windows/export/export.h b/platform/windows/export/export.h index 702acc04b2..ada74b9d77 100644 --- a/platform/windows/export/export.h +++ b/platform/windows/export/export.h @@ -29,7 +29,7 @@ protected: void _get_property_list( List<PropertyInfo> *p_list) const; public: - Error export_project(const String& p_path, bool p_debug, bool p_dumb=false, bool p_remote_debug=false); + Error export_project(const String& p_path, bool p_debug, int p_flags=0); EditorExportPlatformWindows(); }; diff --git a/tools/pe_bliss/pe_section.cpp b/tools/pe_bliss/pe_section.cpp index 7aed5e2c26..72127e22e2 100644 --- a/tools/pe_bliss/pe_section.cpp +++ b/tools/pe_bliss/pe_section.cpp @@ -19,6 +19,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ +#include <algorithm> #include <string.h> #include "utils.h" #include "pe_section.h" |