diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2017-02-21 00:05:15 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2017-02-21 00:06:30 -0300 |
| commit | de0045cf1b0a5e20fbf74da192039d344ee8d0c7 (patch) | |
| tree | 2581bd8995461f1c3d9245f336fd88175b52770e /platform/javascript | |
| parent | 6e2bf31e5a8f3dbe18e31b1aff9c26ee184ad8c8 (diff) | |
-renamed globals.h to global_config.cpp (this seems to have caused a few modified files)
-.pck and .zip exporting redone, seems to be working..
Diffstat (limited to 'platform/javascript')
| -rw-r--r-- | platform/javascript/export/export.cpp | 2 | ||||
| -rw-r--r-- | platform/javascript/javascript_main.cpp | 5 | ||||
| -rw-r--r-- | platform/javascript/os_javascript.cpp | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/platform/javascript/export/export.cpp b/platform/javascript/export/export.cpp index 73ec7bbc54..2657eaddb5 100644 --- a/platform/javascript/export/export.cpp +++ b/platform/javascript/export/export.cpp @@ -33,7 +33,7 @@ #include "tools/editor/editor_node.h" #include "io/zip_io.h" #include "io/marshalls.h" -#include "globals.h" +#include "global_config.h" #include "os/file_access.h" #include "os/os.h" #include "platform/javascript/logo.h" diff --git a/platform/javascript/javascript_main.cpp b/platform/javascript/javascript_main.cpp index 94320d53c1..e096e96a36 100644 --- a/platform/javascript/javascript_main.cpp +++ b/platform/javascript/javascript_main.cpp @@ -158,9 +158,8 @@ int main(int argc, char *argv[]) { char *args[]={"-test","gui","-v",NULL}; Error err = Main::setup("apk",3,args); #else - //char *args[]={"-v",NULL};// - //Error err = Main::setup("",1,args); - Error err = Main::setup("",0,NULL); + char *args[]={"-main_pack","data.pck",NULL}; //pass location of main pack manually, because it wont get an executable name + Error err = Main::setup("",2,args); #endif ResourceLoader::set_abort_on_missing_resources(false); //ease up compatibility diff --git a/platform/javascript/os_javascript.cpp b/platform/javascript/os_javascript.cpp index b8c3dea3b4..931f60ea82 100644 --- a/platform/javascript/os_javascript.cpp +++ b/platform/javascript/os_javascript.cpp @@ -34,7 +34,7 @@ #include "drivers/unix/dir_access_unix.h" #include "servers/visual/visual_server_raster.h" #include "main/main.h" -#include "core/globals.h" +#include "core/global_config.h" #include "dom_keys.h" #include <stdlib.h> |