From 51fc6d4de818eb787c7fa4fb45149c024f23cb13 Mon Sep 17 00:00:00 2001 From: Your Name Date: Fri, 10 May 2024 00:39:50 -0500 Subject: [PATCH] wip --- selfdrive/ui/SConscript | 16 +++++++++------- .../tools/{webview.cc => qt_webview.cc} | 0 2 files changed, 9 insertions(+), 7 deletions(-) rename system/clearpilot/tools/{webview.cc => qt_webview.cc} (100%) diff --git a/selfdrive/ui/SConscript b/selfdrive/ui/SConscript index 4842a40..e14bc21 100644 --- a/selfdrive/ui/SConscript +++ b/selfdrive/ui/SConscript @@ -18,13 +18,6 @@ if arch == "Darwin": # FIXME: remove this once we're on 5.15 (24.04) qt_env['CXXFLAGS'] += ["-Wno-deprecated-declarations"] -# Clearpilot -qt_env['CXXFLAGS'] += ["-I/usr/include/aarch64-linux-gnu/qt5/QtWebEngine"] -qt_env['CXXFLAGS'] += ["-I/usr/include/aarch64-linux-gnu/qt5/QtWebEngineCore"] -qt_env['CXXFLAGS'] += ["-I/usr/include/aarch64-linux-gnu/qt5/QtWebEngineWidgets"] -qt_env['CXXFLAGS'] += ["-I/usr/include/aarch64-linux-gnu/qt5/QtWebChannel"] -base_libs += ['Qt5WebEngineWidgets'] - qt_util = qt_env.Library("qt_util", ["#selfdrive/ui/qt/api.cc", "#selfdrive/ui/qt/util.cc"], LIBS=base_libs) widgets_src = ["ui.cc", "qt/widgets/input.cc", "qt/widgets/drive_stats.cc", "qt/widgets/wifi.cc", "qt/widgets/ssh_keys.cc", "qt/widgets/toggle.cc", "qt/widgets/controls.cc", @@ -89,7 +82,16 @@ qt_env.Program("_text", ["qt/text.cc"], LIBS=qt_libs) qt_env.Program("_spinner", ["qt/spinner.cc"], LIBS=qt_libs) # Clearpilot tools + +# Clearpilot +qt_env['CXXFLAGS'] += ["-I/usr/include/aarch64-linux-gnu/qt5/QtWebEngine"] +qt_env['CXXFLAGS'] += ["-I/usr/include/aarch64-linux-gnu/qt5/QtWebEngineCore"] +qt_env['CXXFLAGS'] += ["-I/usr/include/aarch64-linux-gnu/qt5/QtWebEngineWidgets"] +qt_env['CXXFLAGS'] += ["-I/usr/include/aarch64-linux-gnu/qt5/QtWebChannel"] +qt_webengine_libs = base_libs + ['Qt5WebEngineWidgets'] + qt_env.Program("/data/openpilot/system/clearpilot/tools/qt_shell", ["/data/openpilot/system/clearpilot/tools/qt_shell.cc"], LIBS=qt_libs) +qt_env.Program("/data/openpilot/system/clearpilot/tools/qt_webview", ["/data/openpilot/system/clearpilot/tools/qt_webview.cc"], LIBS=qt_webengine_libs) # build main UI qt_env.Program("ui", qt_src + [asset_obj], LIBS=qt_libs) diff --git a/system/clearpilot/tools/webview.cc b/system/clearpilot/tools/qt_webview.cc similarity index 100% rename from system/clearpilot/tools/webview.cc rename to system/clearpilot/tools/qt_webview.cc