Fix watch3 compilation

commaai · Jun 10, 2024 · fa9a3fa · fa9a3fa
1 parent bbac13f
commit fa9a3fa
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 6 deletions.
diff --git a/SConstruct b/SConstruct
@@ -224,10 +224,8 @@ env = Environment(
   CFLAGS=["-std=gnu11"] + cflags,
   CXXFLAGS=["-std=c++1z"] + cxxflags,
   LIBPATH=libpath + [
-    "#cereal",
-    "#msgq",
+    "#msgq_repo",
     "#third_party",
-    "#opendbc/can",
     "#selfdrive/pandad",
     "#common",
     "#rednose/helpers",

diff --git a/selfdrive/controls/lib/lateral_mpc_lib/SConscript b/selfdrive/controls/lib/lateral_mpc_lib/SConscript
@@ -1,4 +1,4 @@
-Import('env', 'envCython', 'arch', 'messaging', 'msgq_python', 'common_python', 'opendbc_python')
+Import('env', 'envCython', 'arch', 'msgq_python', 'common_python', 'opendbc_python')
 
 gen = "c_generated_code"
 

diff --git a/selfdrive/controls/lib/longitudinal_mpc_lib/SConscript b/selfdrive/controls/lib/longitudinal_mpc_lib/SConscript
@@ -1,4 +1,4 @@
-Import('env', 'envCython', 'arch', 'messaging', 'msgq_python', 'common_python', 'opendbc_python')
+Import('env', 'envCython', 'arch', 'msgq_python', 'common_python', 'opendbc_python')
 
 gen = "c_generated_code"
 

diff --git a/selfdrive/ui/SConscript b/selfdrive/ui/SConscript
@@ -126,4 +126,4 @@ if GetOption('extras') and arch != "Darwin":
 
 # build watch3
 if arch in ['x86_64', 'aarch64', 'Darwin'] or GetOption('extras'):
-  qt_env.Program("watch3", ["watch3.cc"], LIBS=qt_libs + ['common', 'json11', 'zmq', 'visionipc', 'msgq'])
+  qt_env.Program("watch3", ["watch3.cc"], LIBS=qt_libs + ['common', 'json11', 'msgq', 'visionipc'])