Skip to content

Commit e6cb232

Browse files
committed
Fix build for 3.6
1 parent dd65d3d commit e6cb232

File tree

4 files changed

+10
-4
lines changed

4 files changed

+10
-4
lines changed

detect.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ def get_opts():
4141
return [
4242
BoolVariable("use_sanitizer", "Use LLVM compiler address sanitizer", False),
4343
BoolVariable("use_leak_sanitizer", "Use LLVM compiler memory leaks sanitizer (implies use_sanitizer)", False),
44+
BoolVariable("use_lto", "", False),
4445
EnumVariable("debug_symbols", "Add debugging symbols to release builds", "yes", ("yes", "no", "full")),
4546
BoolVariable("separate_debug_symbols", "Create a separate file containing debugging symbols", False),
4647
BoolVariable("touch", "Enable touch events", True),

export/export.cpp

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ class EditorExportPlatformSwitch : public EditorExportPlatform {
276276
return OK;
277277
}
278278

279-
virtual bool can_export(const Ref<EditorExportPreset> &p_preset, String &r_error, bool &r_missing_templates) const {
279+
virtual bool has_valid_export_configuration(const Ref<EditorExportPreset> &p_preset, String &r_error, bool &r_missing_templates) const {
280280
String err;
281281
r_missing_templates =
282282
find_export_template(TEMPLATE_RELEASE) == String() ||
@@ -296,6 +296,10 @@ class EditorExportPlatformSwitch : public EditorExportPlatform {
296296
return valid;
297297
}
298298

299+
virtual bool has_valid_project_configuration(const Ref<EditorExportPreset> &p_preset, String &r_error) const {
300+
return true;
301+
}
302+
299303
virtual List<String> get_binary_extensions(const Ref<EditorExportPreset> &p_preset) const {
300304
List<String> list;
301305
list.push_back("nro");
@@ -592,6 +596,7 @@ void register_switch_exporter() {
592596
EDITOR_DEF("export/switch/build_romfs", "");
593597
EditorSettings::get_singleton()->add_property_hint(PropertyInfo(Variant::STRING, "export/switch/build_romfs", PROPERTY_HINT_GLOBAL_FILE, exe_ext));
594598

595-
Ref<EditorExportPlatformSwitch> exporter = Ref<EditorExportPlatformSwitch>(memnew(EditorExportPlatformSwitch));
599+
Ref<EditorExportPlatformSwitch> exporter;
600+
exporter.instance();
596601
EditorExport::get_singleton()->add_export_platform(exporter);
597602
}

os_switch.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ void OS_Switch::alert(const String &p_alert, const String &p_title) {
217217
errorApplicationCreate(&config, p_title.utf8().ptr(), p_alert.utf8().ptr());
218218
errorApplicationShow(&config);
219219
}
220-
String OS_Switch::get_stdin_string(bool p_block) {
220+
String OS_Switch::get_stdin_string() {
221221
return "";
222222
}
223223
Point2 OS_Switch::get_mouse_position() const {

os_switch.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ class OS_Switch : public OS {
6868
virtual bool _check_internal_feature_support(const String &p_feature);
6969

7070
virtual void alert(const String &p_alert, const String &p_title = "ALERT!");
71-
virtual String get_stdin_string(bool p_block = true);
71+
virtual String get_stdin_string();
7272
virtual Point2 get_mouse_position() const;
7373
virtual int get_mouse_button_state() const;
7474
virtual void set_window_title(const String &p_title);

0 commit comments

Comments
 (0)