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

Merge remote-tracking branch 'origin/master' into master3

Browse Source
This commit is contained in:
Rick Lan
2024-06-21 13:16:13 +08:00
parent 017e31db3e 442e9f4ae4
commit 41fc49dcc4
229 changed files with 202 additions and 6397 deletions
Download Patch File Download Diff File Expand all files Collapse all files
selfdrive/ui/SConscript
+1 -13
View File
@@ -1,6 +1,6 @@
import os
import json
Import('qt_env', 'arch', 'common', 'messaging', 'visionipc', 'transformations', 'UBUNTU_FOCAL')
Import('qt_env', 'arch', 'common', 'messaging', 'visionipc', 'transformations')
base_libs = [common, messaging, visionipc, transformations,
'm', 'OpenCL', 'ssl', 'crypto', 'pthread'] + qt_env["LIBS"]
@@ -13,8 +13,6 @@ dp_priv = len(os.listdir(Dir(f"#dp_priv/").abspath)) > 2
if arch == 'larch64':
base_libs.append('EGL')
maps = arch in ['larch64', 'aarch64', 'x86_64'] and not UBUNTU_FOCAL
if arch == "Darwin":
del base_libs[base_libs.index('OpenCL')]
qt_env['FRAMEWORKS'] += ['OpenCL']
@@ -32,16 +30,6 @@ if dp_priv:
widgets_src = insert_src(widgets_src, "ui.cc", ["#dp_priv/selfdrive/ui/ui.cc"])
widgets_src = insert_src(widgets_src, "qt/widgets/controls.cc", ["#dp_priv/selfdrive/ui/qt/widgets/controls.cc"])
qt_env['CPPDEFINES'] = []
if maps:
base_libs += ['QMapLibre']
widgets_src += ["qt/maps/map_helpers.cc", "qt/maps/map_settings.cc", "qt/maps/map.cc", "qt/maps/map_panel.cc",
"qt/maps/map_eta.cc", "qt/maps/map_instructions.cc"]
if dp_priv:
widgets_src = insert_src(widgets_src, "qt/maps/map_helpers.cc", ["#dp_priv/selfdrive/ui/qt/maps/map_helpers.cc"])
# widgets_src = insert_src(widgets_src, "qt/maps/map_settings.cc", ["#dp_priv/selfdrive/ui/qt/maps/map_settings.cc"])
qt_env['CPPDEFINES'] += ["ENABLE_MAPS"]
widgets = qt_env.Library("qt_widgets", widgets_src, LIBS=base_libs)
Export('widgets')
qt_libs = [widgets, qt_util] + base_libs