Merge branch 'master' of https://bitbucket.org/4coder/4coder
This commit is contained in:
commit
8f7cab3217
|
@ -121,6 +121,7 @@ internal void LinuxStringDup(String*, void*, size_t);
|
||||||
|
|
||||||
////////////////////////////////
|
////////////////////////////////
|
||||||
|
|
||||||
|
global System_Functions sysfunc;
|
||||||
#include "linux_4ed_libraries.cpp"
|
#include "linux_4ed_libraries.cpp"
|
||||||
#include "4ed_standard_libraries.cpp"
|
#include "4ed_standard_libraries.cpp"
|
||||||
|
|
||||||
|
@ -190,7 +191,6 @@ struct Linux_Vars{
|
||||||
|
|
||||||
global Linux_Vars linuxvars;
|
global Linux_Vars linuxvars;
|
||||||
global Render_Target target;
|
global Render_Target target;
|
||||||
global System_Functions sysfunc;
|
|
||||||
global Application_Memory memory_vars;
|
global Application_Memory memory_vars;
|
||||||
global Plat_Settings plat_settings;
|
global Plat_Settings plat_settings;
|
||||||
|
|
||||||
|
|
|
@ -113,6 +113,7 @@ struct Win32_Coroutine{
|
||||||
|
|
||||||
////////////////////////////////
|
////////////////////////////////
|
||||||
|
|
||||||
|
global System_Functions sysfunc;
|
||||||
#include "win32_4ed_libraries.cpp"
|
#include "win32_4ed_libraries.cpp"
|
||||||
#include "4ed_standard_libraries.cpp"
|
#include "4ed_standard_libraries.cpp"
|
||||||
|
|
||||||
|
@ -159,7 +160,6 @@ struct Win32_Vars{
|
||||||
|
|
||||||
global Win32_Vars win32vars;
|
global Win32_Vars win32vars;
|
||||||
global Render_Target target;
|
global Render_Target target;
|
||||||
global System_Functions sysfunc;
|
|
||||||
global Application_Memory memory_vars;
|
global Application_Memory memory_vars;
|
||||||
global Plat_Settings plat_settings;
|
global Plat_Settings plat_settings;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue