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/javascript_main.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/javascript_main.cpp')
-rw-r--r-- | platform/javascript/javascript_main.cpp | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/platform/javascript/javascript_main.cpp b/platform/javascript/javascript_main.cpp index 00e531baa1..a0fb9b83e2 100644 --- a/platform/javascript/javascript_main.cpp +++ b/platform/javascript/javascript_main.cpp @@ -145,15 +145,10 @@ int main(int argc, char *argv[]) { /* Initialize the window */ printf("let it go dude!\n"); glutInit(&argc, argv); - os = new OS_JavaScript(_gfx_init, NULL, NULL); -#if 0 - char *args[]={"-test","gui","-v",NULL}; - Error err = Main::setup("apk",3,args); -#else - 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 + os = new OS_JavaScript(argv[0], _gfx_init, NULL, NULL); + + Error err = Main::setup(argv[0], argc - 1, &argv[1]); + ResourceLoader::set_abort_on_missing_resources(false); //ease up compatibility glutMouseFunc(_glut_mouse_button); |