ps
/
4coder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://bitbucket.org/4coder/4coder

This commit is contained in:
Allen Webster 2017-07-19 16:24:08 -04:00
parent 1ca4ed357e 14adfea27c
commit 5c9016ddf2
2 changed files with 36 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
platform_linux/linux_4ed.cpp
View File

@ -1583,6 +1583,16 @@ LinuxHandleX11Events(void)
int int
main(int argc, char **argv){ main(int argc, char **argv){
//
// System Linkage
//
link_system_code();
//
// Memory init
//
memset(&linuxvars, 0, sizeof(linuxvars)); memset(&linuxvars, 0, sizeof(linuxvars));
memset(&target, 0, sizeof(target)); memset(&target, 0, sizeof(target));
memset(&memory_vars, 0, sizeof(memory_vars)); memset(&memory_vars, 0, sizeof(memory_vars));
@ -1592,13 +1602,19 @@ main(int argc, char **argv){
memset(&app, 0, sizeof(app)); memset(&app, 0, sizeof(app));
memset(&custom_api, 0, sizeof(custom_api)); memset(&custom_api, 0, sizeof(custom_api));
memory_init();
//
// HACK(allen):
// Previously zipped stuff is here, it should be zipped in the new pattern now.
//
init_shared_vars(); init_shared_vars();
// //
// Linkage // Dynamic Linkage
// //
link_system_code();
load_app_code(); load_app_code();
link_rendering(); link_rendering();
#if defined(FRED_SUPER) #if defined(FRED_SUPER)
@ -1607,12 +1623,6 @@ main(int argc, char **argv){
custom_api.get_bindings = get_bindings; custom_api.get_bindings = get_bindings;
#endif #endif
//
// Memory init
//
memory_init();
// //
// Read command line // Read command line
// //

26
platform_win32/win32_4ed.cpp
View File

@ -1019,6 +1019,16 @@ WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdS
i32 argc = __argc; i32 argc = __argc;
char **argv = __argv; char **argv = __argv;
//
// System Linkage
//
link_system_code();
//
// Memory init
//
memset(&win32vars, 0, sizeof(win32vars)); memset(&win32vars, 0, sizeof(win32vars));
memset(&target, 0, sizeof(target)); memset(&target, 0, sizeof(target));
memset(&memory_vars, 0, sizeof(memory_vars)); memset(&memory_vars, 0, sizeof(memory_vars));
@ -1028,13 +1038,19 @@ WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdS
memset(&app, 0, sizeof(app)); memset(&app, 0, sizeof(app));
memset(&custom_api, 0, sizeof(custom_api)); memset(&custom_api, 0, sizeof(custom_api));
memory_init();
//
// HACK(allen):
// Previously zipped stuff is here, it should be zipped in the new pattern now.
//
init_shared_vars(); init_shared_vars();
// //
// Linkage // Dynamic Linkage
// //
link_system_code();
load_app_code(); load_app_code();
link_rendering(); link_rendering();
#if defined(FRED_SUPER) #if defined(FRED_SUPER)
@ -1043,12 +1059,6 @@ WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdS
custom_api.get_bindings = get_bindings; custom_api.get_bindings = get_bindings;
#endif #endif
//
// Memory init
//
memory_init();
// //
// Read Command Line // Read Command Line
// //