mirror of
https://github.com/sunnypilot/sunnypilot.git
synced 2026-09-30 04:03:44 +08:00
Merge branch 'master' into sync-priv-20240220
# Conflicts: # CHANGELOGS.md # panda # selfdrive/car/toyota/interface.py # selfdrive/controls/controlsd.py # selfdrive/manager/manager.py # selfdrive/modeld/fill_model_msg.py # selfdrive/modeld/modeld.py
This commit is contained in:
@@ -83,8 +83,8 @@ asset_obj = qt_env.Object("assets", assets)
|
||||
qt_env.SharedLibrary("qt/python_helpers", ["qt/qt_window.cc"], LIBS=qt_libs)
|
||||
|
||||
# spinner and text window
|
||||
qt_env.Program("qt/text", ["qt/text.cc"], LIBS=qt_libs)
|
||||
qt_env.Program("qt/spinner", ["qt/spinner.cc"], LIBS=qt_libs)
|
||||
qt_env.Program("_text", ["qt/text.cc"], LIBS=qt_libs)
|
||||
qt_env.Program("_spinner", ["qt/spinner.cc"], LIBS=qt_libs)
|
||||
|
||||
# build main UI
|
||||
# include dashcam / screenrecorder
|
||||
|
||||
Reference in New Issue
Block a user