mawei/dragonpilot
1
0
Fork 0
mirror of https://github.com/dragonpilot/dragonpilot.git synced 2026-08-21 08:03:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/commaai/openpilot into master3

Browse Source
This commit is contained in:
Rick Lan
2024-06-12 13:51:15 +08:00
parent b2542d0101 83ac80c6c8
commit e3693fe996
374 changed files with 10496 additions and 6679 deletions
Download Patch File Download Diff File Expand all files Collapse all files
selfdrive/ui/SConscript
+5 -6
View File
@@ -1,16 +1,15 @@
import os
import json
Import('qt_env', 'arch', 'common', 'messaging', 'visionipc',
'cereal', 'transformations')
Import('qt_env', 'arch', 'common', 'messaging', 'visionipc', 'transformations')
base_libs = [common, messaging, visionipc, transformations,
'm', 'OpenCL', 'ssl', 'crypto', 'pthread'] + qt_env["LIBS"]
def insert_src(list, after_src, src):
return list[:list.index(after_src)+1] + src + list[list.index(after_src)+1:]
dp_priv = len(os.listdir(Dir(f"#dp_priv/").abspath)) > 2
base_libs = [common, messaging, cereal, visionipc, transformations, 'zmq',
'capnp', 'kj', 'm', 'OpenCL', 'ssl', 'crypto', 'pthread'] + qt_env["LIBS"]
if arch == 'larch64':
base_libs.append('EGL')
@@ -143,4 +142,4 @@ if GetOption('extras') and arch != "Darwin":
# build watch3
if arch in ['x86_64', 'aarch64', 'Darwin'] or GetOption('extras'):
qt_env.Program("watch3", ["watch3.cc"], LIBS=qt_libs + ['common', 'json11', 'zmq', 'visionipc', 'messaging'])
qt_env.Program("watch3", ["watch3.cc"], LIBS=qt_libs + ['common', 'json11', 'msgq', 'visionipc'])