diff --git a/.python-version b/.python-version deleted file mode 100644 index 0cbfaed0d9..0000000000 --- a/.python-version +++ /dev/null @@ -1 +0,0 @@ -3.8.5 diff --git a/SConstruct b/SConstruct index a865690fb8..1ea3476c8b 100644 --- a/SConstruct +++ b/SConstruct @@ -105,17 +105,22 @@ else: cpppath = [] if arch == "Darwin": + yuv_dir = "mac" if real_arch != "arm64" else "mac_arm64" libpath = [ - "#phonelibs/libyuv/mac/lib", - "#cereal", - "#selfdrive/common", + f"#phonelibs/libyuv/{yuv_dir}/lib", "/usr/local/lib", + "/opt/homebrew/lib", "/usr/local/opt/openssl/lib", + "/opt/homebrew/opt/openssl/lib", "/System/Library/Frameworks/OpenGL.framework/Libraries", ] cflags += ["-DGL_SILENCE_DEPRECATION"] cxxflags += ["-DGL_SILENCE_DEPRECATION"] - cpppath += ["/usr/local/opt/openssl/include"] + cpppath += [ + "/opt/homebrew/include", + "/usr/local/opt/openssl/include", + "/opt/homebrew/opt/openssl/include" + ] else: libpath = [ "#phonelibs/snpe/x86_64-linux-clang", @@ -279,7 +284,10 @@ if arch != "aarch64": qt_libs = [] if arch == "Darwin": - qt_env['QTDIR'] = "/usr/local/opt/qt@5" + if real_arch == "arm64": + qt_env['QTDIR'] = "/opt/homebrew/opt/qt@5" + else: + qt_env['QTDIR'] = "/usr/local/opt/qt@5" qt_dirs = [ os.path.join(qt_env['QTDIR'], "include"), ] diff --git a/cereal b/cereal index 2b28609003..90ce0e954f 160000 --- a/cereal +++ b/cereal @@ -1 +1 @@ -Subproject commit 2b286090032f671a55eeb838ad815551eab033aa +Subproject commit 90ce0e954f2ea0681e07deb81167716ff0394f3b diff --git a/phonelibs/libyuv/mac_arm64/lib/libyuv.a b/phonelibs/libyuv/mac_arm64/lib/libyuv.a new file mode 100644 index 0000000000..6a94a81a84 --- /dev/null +++ b/phonelibs/libyuv/mac_arm64/lib/libyuv.a @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b3243abd863e91d4021efd51f37ec695b0460380eb669db1d15e567caf9819ba +size 378608