diff options
| author | Kostadin Damyanov <maxmight@gmail.com> | 2015-08-09 12:45:21 +0300 |
|---|---|---|
| committer | Kostadin Damyanov <maxmight@gmail.com> | 2015-08-09 12:45:21 +0300 |
| commit | cdf1ac7d58f3dc026cd316a66450771762d74432 (patch) | |
| tree | 635ab608220b2940674098253efddbca7a69377a /platform/javascript/export/export.cpp | |
| parent | f5bfd497aab7e24a6f4dc0315e9e9333504067a0 (diff) | |
| parent | c2e2f2e0aebf6342e6f18ae5d67b6a825590675a (diff) | |
| download | redot-engine-cdf1ac7d58f3dc026cd316a66450771762d74432.tar.gz | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'platform/javascript/export/export.cpp')
| -rw-r--r-- | platform/javascript/export/export.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/platform/javascript/export/export.cpp b/platform/javascript/export/export.cpp index 55b1ccbcaa..b262684a59 100644 --- a/platform/javascript/export/export.cpp +++ b/platform/javascript/export/export.cpp @@ -77,11 +77,11 @@ public: virtual int get_device_count() const { return show_run?1:0; }; virtual String get_device_name(int p_device) const { return "Run in Browser"; } virtual String get_device_info(int p_device) const { return "Run exported HTML in the system's default browser."; } - virtual Error run(int p_device,bool p_dumb=false); + virtual Error run(int p_device,bool p_dumb=false,bool p_remote_debug=false); virtual bool requieres_password(bool p_debug) const { return false; } virtual String get_binary_extension() const { return "html"; } - virtual Error export_project(const String& p_path,bool p_debug,bool p_dumb=false); + virtual Error export_project(const String& p_path,bool p_debug,bool p_dumb=false,bool p_remote_debug=false); virtual bool can_export(String *r_error=NULL) const; @@ -194,7 +194,7 @@ struct JSExportData { -Error EditorExportPlatformJavaScript::export_project(const String& p_path, bool p_debug, bool p_dumb) { +Error EditorExportPlatformJavaScript::export_project(const String& p_path, bool p_debug, bool p_dumb, bool p_remote_debug) { String src_template; @@ -299,7 +299,7 @@ Error EditorExportPlatformJavaScript::export_project(const String& p_path, bool } -Error EditorExportPlatformJavaScript::run(int p_device, bool p_dumb) { +Error EditorExportPlatformJavaScript::run(int p_device, bool p_dumb, bool p_remote_debug) { String path = EditorSettings::get_singleton()->get_settings_path()+"/tmp/tmp_export.html"; Error err = export_project(path,true,""); |