diff options
| author | Pedro J. Estébanez <pedrojrulez@gmail.com> | 2023-11-17 20:44:38 +0100 |
|---|---|---|
| committer | Pedro J. Estébanez <pedrojrulez@gmail.com> | 2023-11-18 11:56:05 +0100 |
| commit | fe4850c0d0e8eed3fe851007c667206684aab0fc (patch) | |
| tree | c71ad807d00a3ed83a8f73dd630b62ed76cca211 /modules | |
| parent | ad72de508363ca8d10c6b148be44a02cdf12be13 (diff) | |
| download | redot-engine-fe4850c0d0e8eed3fe851007c667206684aab0fc.tar.gz | |
Use mingw-std-threads in MinGW builds
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/gdscript/gdscript_tokenizer.h | 6 | ||||
| -rw-r--r-- | modules/gltf/editor/editor_scene_importer_blend.cpp | 5 |
2 files changed, 11 insertions, 0 deletions
diff --git a/modules/gdscript/gdscript_tokenizer.h b/modules/gdscript/gdscript_tokenizer.h index 6dd8a98652..a64aaf6820 100644 --- a/modules/gdscript/gdscript_tokenizer.h +++ b/modules/gdscript/gdscript_tokenizer.h @@ -37,6 +37,12 @@ #include "core/templates/vector.h" #include "core/variant/variant.h" +#ifdef MINGW_ENABLED +#undef CONST +#undef IN +#undef VOID +#endif + class GDScriptTokenizer { public: enum CursorPlace { diff --git a/modules/gltf/editor/editor_scene_importer_blend.cpp b/modules/gltf/editor/editor_scene_importer_blend.cpp index 2fad475e92..9587604e56 100644 --- a/modules/gltf/editor/editor_scene_importer_blend.cpp +++ b/modules/gltf/editor/editor_scene_importer_blend.cpp @@ -45,6 +45,11 @@ #include "main/main.h" #include "scene/gui/line_edit.h" +#ifdef MINGW_ENABLED +#define near +#define far +#endif + #ifdef WINDOWS_ENABLED #include <shlwapi.h> #endif |