diff --git a/selfdrive/ui/SConscript b/selfdrive/ui/SConscript index 9d1ac05c0..f3dea7ce3 100644 --- a/selfdrive/ui/SConscript +++ b/selfdrive/ui/SConscript @@ -23,18 +23,23 @@ if arch == "Darwin": # FIXME: remove this once we're on 5.15 (24.04) qt_env['CXXFLAGS'] += ["-Wno-deprecated-declarations"] -qt_util = qt_env.Library("qt_util", ["#selfdrive/ui/qt/api.cc", "#selfdrive/ui/qt/util.cc"], LIBS=base_libs) +qt_util = qt_env.Library("qt_util", insert_src(["#selfdrive/ui/qt/api.cc", "#selfdrive/ui/qt/util.cc"], "#selfdrive/ui/qt/util.cc", ["#dp_priv/selfdrive/ui/qt/util.cc"] if dp_priv else []), LIBS=base_libs) widgets_src = ["ui.cc", "qt/widgets/input.cc", "qt/widgets/wifi.cc", "qt/widgets/ssh_keys.cc", "qt/widgets/toggle.cc", "qt/widgets/controls.cc", "qt/widgets/offroad_alerts.cc", "qt/widgets/prime.cc", "qt/widgets/keyboard.cc", "qt/widgets/scrollview.cc", "qt/widgets/cameraview.cc", "#third_party/qrcode/QrCode.cc", "qt/request_repeater.cc", "qt/qt_window.cc", "qt/network/networking.cc", "qt/network/wifi_manager.cc"] +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_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) @@ -48,6 +53,10 @@ qt_src = ["main.cc", "qt/sidebar.cc", "qt/body.cc", "qt/onroad/onroad_home.cc", "qt/onroad/annotated_camera.cc", "qt/onroad/buttons.cc", "qt/onroad/alerts.cc"] +if dp_priv: +# qt_src = insert_src(qt_src, "qt/sidebar.cc", ["#dp_priv/selfdrive/ui/qt/sidebar.cc", "#dp_priv/selfdrive/ui/qt/onroad.cc"]) + qt_src = insert_src(qt_src, "qt/offroad/settings.cc", ["#dp_priv/selfdrive/ui/qt/offroad/settings.cc", "#dp_priv/selfdrive/ui/qt/offroad/settings_dp.cc"]) + # build translation files with open(File("translations/languages.json").abspath) as f: languages = json.loads(f.read())