diff --git a/selfdrive/common/i2c.cc b/selfdrive/common/i2c.cc index a37b144dc2..95d0aedd5e 100644 --- a/selfdrive/common/i2c.cc +++ b/selfdrive/common/i2c.cc @@ -12,7 +12,10 @@ #ifdef QCOM2 // TODO: decide if we want to isntall libi2c-dev everywhere -#include +extern "C" { + #include + #include +} I2CBus::I2CBus(uint8_t bus_id){ char bus_name[20]; diff --git a/selfdrive/sensord/SConscript b/selfdrive/sensord/SConscript index facbf6403a..01b0eec844 100644 --- a/selfdrive/sensord/SConscript +++ b/selfdrive/sensord/SConscript @@ -17,4 +17,7 @@ else: 'sensors/lsm6ds3_gyro.cc', 'sensors/lsm6ds3_temp.cc', ] - env.Program('_sensord', ['sensors_qcom2.cc'] + sensors, LIBS=[common, cereal, messaging, 'capnp', 'zmq', 'kj']) + libs = [common, cereal, messaging, 'capnp', 'zmq', 'kj'] + if arch == "larch64": + libs.append('i2c') + env.Program('_sensord', ['sensors_qcom2.cc'] + sensors, LIBS=libs) diff --git a/selfdrive/ui/SConscript b/selfdrive/ui/SConscript index 808d2094f0..ca60133265 100644 --- a/selfdrive/ui/SConscript +++ b/selfdrive/ui/SConscript @@ -27,6 +27,7 @@ if arch in ["x86_64", "Darwin", "larch64"]: f"/usr/include/{real_arch}-linux-gnu/qt5/QtDBus", f"/usr/include/{real_arch}-linux-gnu/qt5/QtMultimedia", f"/usr/include/{real_arch}-linux-gnu/qt5/QtGui/5.5.1/QtGui", + f"/usr/include/{real_arch}-linux-gnu/qt5/QtGui/5.12.8/QtGui", ] qt_env.Tool('qt')