diff options
| author | Zachary Pierson <zacpiersonhehe@gmail.com> | 2018-07-02 02:50:08 -0500 |
|---|---|---|
| committer | Zachary Pierson <zacpiersonhehe@gmail.com> | 2018-07-02 02:50:08 -0500 |
| commit | 5de3b07e2b54fcf3be089e0cf064265abcb13e63 (patch) | |
| tree | a0ea082b108e39eec4f2611625499a3b8104173c | |
| parent | c0ca4d4635ebdc280278f483980365069380a06e (diff) | |
Made `os_osx.odin` use the new-style `runtime.args__` and added `read_directory` for macOS
| -rw-r--r-- | core/os/os_osx.odin | 5 | ||||
| -rw-r--r-- | src/common.cpp | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/core/os/os_osx.odin b/core/os/os_osx.odin index befd97257..411107706 100644 --- a/core/os/os_osx.odin +++ b/core/os/os_osx.odin @@ -3,6 +3,7 @@ package os foreign import dl "system:dl" foreign import libc "system:c" +import "core:runtime" import "core:strings" OS :: "osx"; @@ -287,8 +288,8 @@ dlerror :: proc() -> string { _alloc_command_line_arguments :: proc() -> []string { - args := make([]string, len(__args__)); - for arg, i in __args__ { + args := make([]string, len(runtime.args__)); + for arg, i in runtime.args__ { args[i] = string(arg); } return args; diff --git a/src/common.cpp b/src/common.cpp index ec6ec7798..adeebc410 100644 --- a/src/common.cpp +++ b/src/common.cpp @@ -822,7 +822,7 @@ ReadDirectoryError read_directory(String path, Array<FileInfo> *fi) { return ReadDirectory_None; } -#elif defined(GB_SYSTEM_LINUX) +#elif defined(GB_SYSTEM_LINUX) || defined(GB_SYSTEM_OSX) #include <dirent.h> |