diff --git a/scripts/dev.py b/scripts/dev.py index 1eff5a4d..1e3390cd 100644 --- a/scripts/dev.py +++ b/scripts/dev.py @@ -647,6 +647,9 @@ def install(args): shutil.copy("src/ext/angle/bin/libEGL.dylib", runtime_bin_dir) shutil.copy("src/ext/angle/bin/libGLESv2.dylib", runtime_bin_dir) + with open(os.path.join(versions_dir, "current"), "w") as f: + f.write(version) + print() print("The Orca tooling has been installed to the following directory:") print(tool_bin_dir) diff --git a/src/tool/sdk_path.c b/src/tool/sdk_path.c index bf4891e7..a3541d22 100644 --- a/src/tool/sdk_path.c +++ b/src/tool/sdk_path.c @@ -6,24 +6,22 @@ * **************************************************************************/ -#include -#include #include -#include +#include + +#if OC_PLATFORM_WINDOWS + #include + #include + #include + #include + #include "platform/win32_string_helpers.h" +#endif #include "flag.h" #include "platform/platform_path.h" -#include "platform/win32_string_helpers.h" -#include "util/lists.h" #include "util/strings.h" #include "util/memory.h" #include "util.h" -#include "system.h" - -#if OC_PLATFORM_WINDOWS - #include - #include -#endif oc_str8 getOrcaDir(oc_arena* a); oc_str8 getCurrentVersionDir(oc_arena* a, oc_str8 orcaDir); @@ -76,6 +74,13 @@ oc_str8 getOrcaDir(oc_arena* a) oc_win32_path_normalize_slash_in_place(path); return path; } +#elif OC_PLATFORM_MACOS +oc_str8 getOrcaDir(oc_arena* a) +{ + oc_str8 path = OC_STR8(getenv("HOME")); + path = oc_path_append(a, path, OC_STR8(".orca")); + return path; +} #else #error "Unknown platform for sdk-path" #endif