diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2016-01-20 00:29:34 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2016-01-20 00:29:34 -0300 |
| commit | c9580965ea6577071fa84c9f064aa22ffa7ca920 (patch) | |
| tree | 37051522dc40fdbd024b735a5658d478dda33a99 /tools/editor | |
| parent | 891e31b139b269fb154d30b8c7d7887267708d8b (diff) | |
-Remote deploy now uses FS over USB on Android, super fast!
Diffstat (limited to 'tools/editor')
| -rw-r--r-- | tools/editor/editor_import_export.cpp | 4 | ||||
| -rw-r--r-- | tools/editor/editor_import_export.h | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/tools/editor/editor_import_export.cpp b/tools/editor/editor_import_export.cpp index 5203ace125..77331256f3 100644 --- a/tools/editor/editor_import_export.cpp +++ b/tools/editor/editor_import_export.cpp @@ -1000,6 +1000,9 @@ void EditorExportPlatform::gen_export_flags(Vector<String> &r_flags, int p_flags String host = EditorSettings::get_singleton()->get("network/debug_host"); + if (p_flags&EXPORT_REMOTE_DEBUG_LOCALHOST) + host="localhost"; + if (p_flags&EXPORT_DUMB_CLIENT) { int port = EditorSettings::get_singleton()->get("file_server/port"); String passwd = EditorSettings::get_singleton()->get("file_server/password"); @@ -1014,6 +1017,7 @@ void EditorExportPlatform::gen_export_flags(Vector<String> &r_flags, int p_flags if (p_flags&EXPORT_REMOTE_DEBUG) { r_flags.push_back("-rdebug"); + r_flags.push_back(host+":"+String::num(GLOBAL_DEF("debug/debug_port", 6007))); List<String> breakpoints; diff --git a/tools/editor/editor_import_export.h b/tools/editor/editor_import_export.h index 1a0686fb50..272464d9b0 100644 --- a/tools/editor/editor_import_export.h +++ b/tools/editor/editor_import_export.h @@ -136,8 +136,9 @@ public: enum ExportFlags { EXPORT_DUMB_CLIENT=1, EXPORT_REMOTE_DEBUG=2, - EXPORT_VIEW_COLLISONS=4, - EXPORT_VIEW_NAVIGATION=8 + EXPORT_REMOTE_DEBUG_LOCALHOST=4, + EXPORT_VIEW_COLLISONS=8, + EXPORT_VIEW_NAVIGATION=16, }; |