Building on M1 (#20796)

* cereal builds

* UI builds

* libyuv
old-commit-hash: c65c6102a6
commatwo_master
Adeeb Shihadeh 4 years ago committed by GitHub
parent 1846ddbc14
commit 31f13e7747
  1. 1
      .python-version
  2. 18
      SConstruct
  3. 2
      cereal
  4. 3
      phonelibs/libyuv/mac_arm64/lib/libyuv.a

@ -105,17 +105,22 @@ else:
cpppath = [] cpppath = []
if arch == "Darwin": if arch == "Darwin":
yuv_dir = "mac" if real_arch != "arm64" else "mac_arm64"
libpath = [ libpath = [
"#phonelibs/libyuv/mac/lib", f"#phonelibs/libyuv/{yuv_dir}/lib",
"#cereal",
"#selfdrive/common",
"/usr/local/lib", "/usr/local/lib",
"/opt/homebrew/lib",
"/usr/local/opt/openssl/lib", "/usr/local/opt/openssl/lib",
"/opt/homebrew/opt/openssl/lib",
"/System/Library/Frameworks/OpenGL.framework/Libraries", "/System/Library/Frameworks/OpenGL.framework/Libraries",
] ]
cflags += ["-DGL_SILENCE_DEPRECATION"] cflags += ["-DGL_SILENCE_DEPRECATION"]
cxxflags += ["-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: else:
libpath = [ libpath = [
"#phonelibs/snpe/x86_64-linux-clang", "#phonelibs/snpe/x86_64-linux-clang",
@ -279,7 +284,10 @@ if arch != "aarch64":
qt_libs = [] qt_libs = []
if arch == "Darwin": 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 = [ qt_dirs = [
os.path.join(qt_env['QTDIR'], "include"), os.path.join(qt_env['QTDIR'], "include"),
] ]

@ -1 +1 @@
Subproject commit 2b286090032f671a55eeb838ad815551eab033aa Subproject commit 90ce0e954f2ea0681e07deb81167716ff0394f3b

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b3243abd863e91d4021efd51f37ec695b0460380eb669db1d15e567caf9819ba
size 378608
Loading…
Cancel
Save