mirror of
https://github.com/Ed94/Odin.git
synced 2026-07-29 02:40:05 +00:00
Merge remote-tracking branch 'origin/master'
This commit is contained in:
+1
-1
@@ -4,7 +4,7 @@
|
||||
when ODIN_OS == "windows" {
|
||||
import win32 "core:sys/windows.odin"
|
||||
}
|
||||
_ :: compile_assert(ODIN_ARCH == "amd64"); // TODO(bill): x86 version
|
||||
#assert(ODIN_ARCH == "amd64"); // TODO(bill): x86 version
|
||||
|
||||
|
||||
yield_thread :: proc() { win32.mm_pause(); }
|
||||
|
||||
+1
-1
@@ -29,7 +29,7 @@ c_double :: f64;
|
||||
c_complex_float :: complex64;
|
||||
c_complex_double :: complex128;
|
||||
|
||||
_ :: compile_assert(size_of(uintptr) == size_of(int));
|
||||
#assert(size_of(uintptr) == size_of(int));
|
||||
|
||||
c_size_t :: uint;
|
||||
c_ssize_t :: int;
|
||||
|
||||
+1
-1
@@ -8,7 +8,7 @@ when ODIN_OS == "windows" {
|
||||
|
||||
export "core:opengl_constants.odin"
|
||||
|
||||
_ := compile_assert(ODIN_OS != "osx");
|
||||
(ODIN_OS != "osx");
|
||||
|
||||
@(default_calling_convention="c", link_prefix="gl")
|
||||
foreign lib {
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
_ :: compile_assert(ODIN_OS == "windows");
|
||||
#assert(ODIN_OS == "windows");
|
||||
|
||||
when ODIN_OS == "windows" {
|
||||
import win32 "core:sys/windows.odin"
|
||||
|
||||
Reference in New Issue
Block a user