ed/Odin
1
0
Fork 0
mirror of https://github.com/Ed94/Odin.git synced 2026-07-30 19:30:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merging from gingerBill's master

Browse Source
This commit is contained in:
Zachary Pierson
2017-02-11 23:35:07 -06:00
parent 3f3122bccc e1fdd675ce
commit c50aabd916
12 changed files with 163 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/_preload.odin
+1 -1
View File
@@ -169,7 +169,7 @@ Context :: struct #ordered {
user_index: int,
}
thread_local __context: Context;
#thread_local __context: Context;
DEFAULT_ALIGNMENT :: align_of([vector 4]f32);
core/opengl.odin
+1 -1
View File
@@ -1,6 +1,6 @@
#foreign_system_library lib "opengl32.lib" when ODIN_OS == "windows";
#import win32 "sys/windows.odin" when ODIN_OS == "windows";
#include "opengl_constants.odin";
#load "opengl_constants.odin";
Clear :: proc(mask: u32) #foreign lib "glClear";
ClearColor :: proc(r, g, b, a: f32) #foreign lib "glClearColor";
core/os.odin
+1 -2
View File
@@ -1,4 +1,3 @@
#include "os_windows.odin" when ODIN_OS == "windows";
#include "os_x.odin" when ODIN_OS == "osx";
#include "os_linux.odin" when ODIN_OS == "linux";
#include "os_linux.odin" when ODIN_OS == "linux";