diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2017-03-29 15:21:52 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-29 15:21:52 +0200 |
| commit | 000e8730088ed241439a311c1bd0167f741ffbd1 (patch) | |
| tree | f178ebbe6c842324dbc6ababa62a51db267bb55b /platform/javascript/os_javascript.cpp | |
| parent | d4740a98537b1e7dcb6fb48176abdebe27eee83c (diff) | |
| parent | 7df7e9cc8bbe25148698f4350123a42e17033881 (diff) | |
| download | redot-engine-000e8730088ed241439a311c1bd0167f741ffbd1.tar.gz | |
Merge pull request #8191 from eska014/webgl2-export
WebGL 2 export per WebAssembly or asm.js
Diffstat (limited to 'platform/javascript/os_javascript.cpp')
| -rw-r--r-- | platform/javascript/os_javascript.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/platform/javascript/os_javascript.cpp b/platform/javascript/os_javascript.cpp index 08c17e1e9c..bcb7365204 100644 --- a/platform/javascript/os_javascript.cpp +++ b/platform/javascript/os_javascript.cpp @@ -750,7 +750,7 @@ String OS_JavaScript::get_data_dir() const { String OS_JavaScript::get_executable_path() const { - return String(); + return OS::get_executable_path(); } void OS_JavaScript::_close_notification_funcs(const String &p_file, int p_flags) { @@ -828,7 +828,8 @@ int OS_JavaScript::get_power_percent_left() { return power_manager->get_power_percent_left(); } -OS_JavaScript::OS_JavaScript(GFXInitFunc p_gfx_init_func, void *p_gfx_init_ud, GetDataDirFunc p_get_data_dir_func) { +OS_JavaScript::OS_JavaScript(const char *p_execpath, GFXInitFunc p_gfx_init_func, void *p_gfx_init_ud, GetDataDirFunc p_get_data_dir_func) { + set_cmdline(p_execpath, get_cmdline_args()); gfx_init_func = p_gfx_init_func; gfx_init_ud = p_gfx_init_ud; last_button_mask = 0; |