mawei/sunnypilot
1
0
Fork 0
mirror of https://github.com/sunnypilot/sunnypilot.git synced 2026-02-18 17:43:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Switch from json11 to nlohmann/json (#31093)"

Browse Source 
This reverts commit 8fa1e8aa53defca264272a66531d639b3d569418.

old-commit-hash: 88757c12b3
This commit is contained in:
Adeeb Shihadeh
2024-01-22 22:41:59 -08:00
parent cb3a834067
commit 12d2d861f2
17 changed files with 1098 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
common/SConscript
View File

@@ -12,7 +12,7 @@ common_libs = [
if arch != "Darwin":
common_libs.append('gpio.cc')
_common = env.Library('common', common_libs)
_common = env.Library('common', common_libs, LIBS="json11")
files = [
'clutil.cc',
@@ -24,10 +24,10 @@ Export('_common', '_gpucommon')
if GetOption('extras'):
env.Program('tests/test_common',
['tests/test_runner.cc', 'tests/test_params.cc', 'tests/test_util.cc', 'tests/test_swaglog.cc'],
LIBS=[_common, 'zmq', 'pthread'])
LIBS=[_common, 'json11', 'zmq', 'pthread'])
# Cython bindings
params_python = envCython.Program('params_pyx.so', 'params_pyx.pyx', LIBS=envCython['LIBS'] + [_common, 'zmq'])
params_python = envCython.Program('params_pyx.so', 'params_pyx.pyx', LIBS=envCython['LIBS'] + [_common, 'zmq', 'json11'])
SConscript([
'transformations/SConscript',