mirror of
https://github.com/firestar5683/StarPilot.git
synced 2026-08-21 16:23:46 +08:00
Switch from json11 to nlohmann/json (#31093)
* Initial commit * fix release/file_common * Update common/swaglog.cc * Swtiched serialize cc * move to lfs --------- Co-authored-by: Adeeb Shihadeh <adeebshihadeh@gmail.com> old-commit-hash: ee036482b8152f0e7650895c6f4bac5d4f00e00f
This commit is contained in:
@@ -91,7 +91,7 @@ if GetOption('extras') and arch != "Darwin":
|
||||
# setup and factory resetter
|
||||
qt_env.Program("qt/setup/reset", ["qt/setup/reset.cc"], LIBS=qt_libs)
|
||||
qt_env.Program("qt/setup/setup", ["qt/setup/setup.cc", asset_obj],
|
||||
LIBS=qt_libs + ['curl', 'common', 'json11'])
|
||||
LIBS=qt_libs + ['curl', 'common'])
|
||||
|
||||
# build updater UI
|
||||
qt_env.Program("qt/setup/updater", ["qt/setup/updater.cc", asset_obj], LIBS=qt_libs)
|
||||
@@ -126,4 +126,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', 'zmq', 'visionipc', 'messaging'])
|
||||
|
||||
Reference in New Issue
Block a user