mirror of
https://github.com/godotengine/godot.git
synced 2026-01-03 18:11:19 +03:00
-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..
This commit is contained in:
@@ -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"
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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>
|
||||
|
||||
Reference in New Issue
Block a user