From c7c887d0557a3aa855611a142d1847aae85dfb78 Mon Sep 17 00:00:00 2001 From: arne182 Date: Fri, 18 May 2018 16:37:13 +0200 Subject: [PATCH] Add compatibility for newest acado release The library file has been renamed and the execution of the generator requires the library path to be given. --- selfdrive/controls/lib/longitudinal_mpc/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/selfdrive/controls/lib/longitudinal_mpc/Makefile b/selfdrive/controls/lib/longitudinal_mpc/Makefile index 409715cf17e9d6..1039249d005289 100644 --- a/selfdrive/controls/lib/longitudinal_mpc/Makefile +++ b/selfdrive/controls/lib/longitudinal_mpc/Makefile @@ -13,9 +13,9 @@ QPOASES_FLAGS = -I$(PHONELIBS)/qpoases -I$(PHONELIBS)/qpoases/INCLUDE -I$(PHONEL ACADO_FLAGS = -I$(PHONELIBS)/acado/include -I$(PHONELIBS)/acado/include/acado ifeq ($(UNAME_M),aarch64) -ACADO_LIBS := -L $(PHONELIBS)/acado/aarch64/lib -l:libacado_toolkit.a -l:libacado_casadi.a -l:libacado_csparse.a +ACADO_LIBS := -L $(PHONELIBS)/acado/aarch64/lib -l:libacado_toolkit_s.so -l:libacado_casadi.a -l:libacado_csparse.a else -ACADO_LIBS := -L $(PHONELIBS)/acado/x64/lib -l:libacado_toolkit.a -l:libacado_casadi.a -l:libacado_csparse.a +ACADO_LIBS := -L $(PHONELIBS)/acado/x64/lib -l:libacado_toolkit_s.so -l:libacado_casadi.a -l:libacado_csparse.a endif OBJS = \ @@ -85,7 +85,7 @@ generator: generator.cpp .PHONY: generate generate: generator - ./generator + LD_LIBRARY_PATH=../../../../phonelibs/acado/x64/lib ./generator .PHONY: clean clean: