Skip to content

Commit

Permalink
Add json11 as dependency
Browse files Browse the repository at this point in the history
  • Loading branch information
fredyshox committed Aug 2, 2023
1 parent c0bd64d commit 7736861
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions SConscript
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,10 @@ messaging_objects = env.SharedObject([
messaging_lib = env.Library('messaging', messaging_objects)
Depends('messaging/impl_zmq.cc', services_h)

env.Program('messaging/bridge', ['messaging/bridge.cc'], LIBS=[messaging_lib, 'zmq', common])
env.Program('messaging/bridge', ['messaging/bridge.cc'], LIBS=[messaging_lib, 'zmq', 'json11', common])
Depends('messaging/bridge.cc', services_h)

envCython.Program('messaging/messaging_pyx.so', 'messaging/messaging_pyx.pyx', LIBS=envCython["LIBS"]+[messaging_lib, "zmq", common])
envCython.Program('messaging/messaging_pyx.so', 'messaging/messaging_pyx.pyx', LIBS=envCython["LIBS"]+[messaging_lib, "zmq", 'json11', common])


# Build Vision IPC
Expand All @@ -51,7 +51,7 @@ vipc_sources = [
'visionipc/visionbuf.cc',
]

if target == "agnos-aarch64":
if target == 'agnos-aarch64':
vipc_sources += ['visionipc/visionbuf_ion.cc']
else:
vipc_sources += ['visionipc/visionbuf_cl.cc']
Expand All @@ -61,16 +61,16 @@ vipc = env.Library('visionipc', vipc_objects)


vipc_frameworks = []
vipc_libs = envCython["LIBS"] + [vipc, messaging_lib, common, "zmq"]
if target == "Darwin":
vipc_libs = envCython["LIBS"] + [vipc, messaging_lib, common, 'zmq', 'json11']
if target == 'Darwin':
vipc_frameworks.append('OpenCL')
else:
vipc_libs.append('OpenCL')
envCython.Program('visionipc/visionipc_pyx.so', 'visionipc/visionipc_pyx.pyx',
LIBS=vipc_libs, FRAMEWORKS=vipc_frameworks)

if GetOption('test'):
env.Program('messaging/test_runner', ['messaging/test_runner.cc', 'messaging/msgq_tests.cc'], LIBS=[messaging_lib, common])
env.Program('messaging/test_runner', ['messaging/test_runner.cc', 'messaging/msgq_tests.cc'], LIBS=[messaging_lib, common, 'json11'])

env.Program('visionipc/test_runner', ['visionipc/test_runner.cc', 'visionipc/visionipc_tests.cc'],
LIBS=['pthread'] + vipc_libs, FRAMEWORKS=vipc_frameworks)

0 comments on commit 7736861

Please sign in to comment.