diff options
| -rw-r--r-- | modules/gdscript/gd_editor.cpp | 2 | ||||
| -rw-r--r-- | platform/osx/detect.py | 8 |
2 files changed, 7 insertions, 3 deletions
diff --git a/modules/gdscript/gd_editor.cpp b/modules/gdscript/gd_editor.cpp index d6969c142d..863009f1a7 100644 --- a/modules/gdscript/gd_editor.cpp +++ b/modules/gdscript/gd_editor.cpp @@ -2485,7 +2485,7 @@ Error GDScriptLanguage::complete_code(const String &p_code, const String &p_base #else -Error GDScriptLanguage::complete_code(const String &p_code, const String &p_base_path, Object *p_owner, List<String> *r_options, String &r_call_hint) { +Error GDScriptLanguage::complete_code(const String &p_code, const String &p_base_path, Object *p_owner, List<String> *r_options, bool &r_forced, String &r_call_hint) { return OK; } diff --git a/platform/osx/detect.py b/platform/osx/detect.py index d9891dda61..661da6e7c1 100644 --- a/platform/osx/detect.py +++ b/platform/osx/detect.py @@ -65,10 +65,14 @@ def configure(env): else: # osxcross build root = os.environ.get("OSXCROSS_ROOT", 0) - if env["bits"] == "64": + if env["bits"] == "fat": basecmd = root + "/target/bin/x86_64-apple-" + env["osxcross_sdk"] + "-" - else: + env.Append(CCFLAGS=['-arch', 'i386', '-arch', 'x86_64']) + env.Append(LINKFLAGS=['-arch', 'i386', '-arch', 'x86_64']) + elif env["bits"] == "32": basecmd = root + "/target/bin/i386-apple-" + env["osxcross_sdk"] + "-" + else: # 64-bit, default + basecmd = root + "/target/bin/x86_64-apple-" + env["osxcross_sdk"] + "-" env['CC'] = basecmd + "cc" env['CXX'] = basecmd + "c++" |