Prechádzať zdrojové kódy

Move os_*.odin files to os/

gingerBill 7 rokov pred
rodič
commit
f4cf88c2ca
6 zmenil súbory, kde vykonal 24 pridanie a 25 odobranie
  1. 2 2
      core/mem.odin
  2. 4 4
      core/os.odin
  3. 0 0
      core/os/essence.odin
  4. 0 0
      core/os/linux.odin
  5. 0 0
      core/os/osx.odin
  6. 18 19
      core/os/windows.odin

+ 2 - 2
core/mem.odin

@@ -38,8 +38,8 @@ slice_to_bytes :: proc "contextless" (slice: $E/[]$T) -> []byte {
 }
 }
 
 
 ptr_to_bytes :: proc "contextless" (ptr: ^$T, len := 1) -> []byte {
 ptr_to_bytes :: proc "contextless" (ptr: ^$T, len := 1) -> []byte {
-    assert(len >= 0);
-    return transmute([]byte)raw.Slice{ptr, len*size_of(T)};
+	assert(len >= 0);
+	return transmute([]byte)raw.Slice{ptr, len*size_of(T)};
 }
 }
 
 
 any_to_bytes :: proc "contextless" (val: any) -> []byte {
 any_to_bytes :: proc "contextless" (val: any) -> []byte {

+ 4 - 4
core/os.odin

@@ -1,7 +1,7 @@
-when ODIN_OS == "windows" do export "core:os_windows.odin";
-when ODIN_OS == "osx"     do export "core:os_x.odin";
-when ODIN_OS == "linux"   do export "core:os_linux.odin";
-when ODIN_OS == "essence" do export "core:os_essence.odin";
+when ODIN_OS == "windows" do export "core:os/windows.odin";
+when ODIN_OS == "osx"     do export "core:os/osx.odin";
+when ODIN_OS == "linux"   do export "core:os/linux.odin";
+when ODIN_OS == "essence" do export "core:os/essence.odin";
 
 
 import "mem.odin";
 import "mem.odin";
 
 

+ 0 - 0
core/os_essence.odin → core/os/essence.odin


+ 0 - 0
core/os_linux.odin → core/os/linux.odin


+ 0 - 0
core/os_x.odin → core/os/osx.odin


+ 18 - 19
core/os_windows.odin → core/os/windows.odin

@@ -260,26 +260,25 @@ current_thread_id :: proc() -> int {
 
 
 
 
 
 
-
 _alloc_command_line_arguments :: proc() -> []string {
 _alloc_command_line_arguments :: proc() -> []string {
-    arg_count: i32;
-    arg_list_ptr := win32.command_line_to_argv_w(win32.get_command_line_w(), &arg_count);
-    arg_list := make([]string, int(arg_count));
-    for _, i in arg_list {
-        wc_str := (arg_list_ptr+i)^;
-        olen := win32.wide_char_to_multi_byte(win32.CP_UTF8, 0, wc_str, -1,
-                                              nil, 0, nil, nil);
-
-        buf := make([]byte, olen);
-       	n := win32.wide_char_to_multi_byte(win32.CP_UTF8, 0, wc_str, -1,
-       	                                   cstring(&buf[0]), olen, nil, nil);
-       	if n > 0 {
-       		n -= 1;
-       	}
-        arg_list[i] = string(buf[..n]);
-    }
-
-    return arg_list;
+	arg_count: i32;
+	arg_list_ptr := win32.command_line_to_argv_w(win32.get_command_line_w(), &arg_count);
+	arg_list := make([]string, int(arg_count));
+	for _, i in arg_list {
+		wc_str := (arg_list_ptr+i)^;
+		olen := win32.wide_char_to_multi_byte(win32.CP_UTF8, 0, wc_str, -1,
+		                                      nil, 0, nil, nil);
+
+		buf := make([]byte, olen);
+		n := win32.wide_char_to_multi_byte(win32.CP_UTF8, 0, wc_str, -1,
+		                                   cstring(&buf[0]), olen, nil, nil);
+		if n > 0 {
+			n -= 1;
+		}
+		arg_list[i] = string(buf[..n]);
+	}
+
+	return arg_list;
 }
 }