diff --git a/SConstruct b/SConstruct index 60ec20e39e..e4c88534b0 100644 --- a/SConstruct +++ b/SConstruct @@ -43,7 +43,7 @@ if arch == "aarch64" or arch == "larch64": ] if arch == "larch64": - cpppath += ["#phonelibs/capnp-cpp/include", "#phonelibs/capnp-c/include"] + cpppath += ["#phonelibs/capnp-cpp/include"] libpath += ["#phonelibs/snpe/larch64"] libpath += ["#phonelibs/libyuv/larch64/lib"] libpath += ["#external/capnparm/lib", "/usr/lib/aarch64-linux-gnu"] @@ -63,7 +63,6 @@ else: } cpppath = [ "#phonelibs/capnp-cpp/include", - "#phonelibs/capnp-c/include", "#phonelibs/zmq/x64/include", "#external/tensorflow/include", ] @@ -71,7 +70,6 @@ else: if arch == "Darwin": libpath = [ "#phonelibs/capnp-cpp/mac/lib", - "#phonelibs/capnp-c/mac/lib", "#phonelibs/libyuv/mac/lib", "#cereal", "#selfdrive/common", @@ -81,7 +79,6 @@ else: else: libpath = [ "#phonelibs/capnp-cpp/x64/lib", - "#phonelibs/capnp-c/x64/lib", "#phonelibs/snpe/x86_64-linux-clang", "#phonelibs/zmq/x64/lib", "#phonelibs/libyuv/x64/lib", diff --git a/cereal b/cereal index 8573a24d2e..42e0a7e6bc 160000 --- a/cereal +++ b/cereal @@ -1 +1 @@ -Subproject commit 8573a24d2e19e00f5667aee6d2bf689dfda35ee7 +Subproject commit 42e0a7e6bcb0c1191774f0595560486de2d6ee0c diff --git a/external/mac/capnpc-c b/external/mac/capnpc-c deleted file mode 100755 index d1a3e31730..0000000000 Binary files a/external/mac/capnpc-c and /dev/null differ diff --git a/selfdrive/boardd/boardd_setup.py b/selfdrive/boardd/boardd_setup.py index b8997f8542..5956c11a52 100644 --- a/selfdrive/boardd/boardd_setup.py +++ b/selfdrive/boardd/boardd_setup.py @@ -35,7 +35,6 @@ setup(name='Boardd API Implementation', library_dirs=[ './', PHONELIBS + '/capnp-cpp/' + ARCH_DIR + '/lib/', - PHONELIBS + '/capnp-c/' + ARCH_DIR + '/lib/' ], sources=['boardd_api_impl.pyx'], language="c++", diff --git a/tools/README.md b/tools/README.md index f198ed2bee..ea0fd7d83a 100644 --- a/tools/README.md +++ b/tools/README.md @@ -120,15 +120,6 @@ TODO: These instructions maybe outdated, follow ubuntu_setup.sh setup instructio ./configure --prefix=/usr/local CPPFLAGS=-DPIC CFLAGS=-fPIC CXXFLAGS=-fPIC LDFLAGS=-fPIC --disable-shared --enable-static make -j4 sudo make install - - cd .. - git clone https://github.com/commaai/c-capnproto.git - cd c-capnproto - git submodule update --init --recursive - autoreconf -f -i -s - CFLAGS="-fPIC" ./configure --prefix=/usr/local - make -j4 - sudo make install ``` 2. Clone openpilot if you haven't already