From d9093e3245f9619850cea391adcad1a12164d38e Mon Sep 17 00:00:00 2001
From: Loek Le Blansch <loek@pipeframe.xyz>
Date: Wed, 5 Jun 2024 16:32:46 +0200
Subject: the large library cleanup

---
 client/CMakeLists.txt        | 8 +++++---
 client/compile_commands.json | 1 -
 client/i2c.cpp               | 4 ++--
 3 files changed, 7 insertions(+), 6 deletions(-)
 delete mode 120000 client/compile_commands.json

(limited to 'client')

diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
index b1cfbaf..7d492b0 100644
--- a/client/CMakeLists.txt
+++ b/client/CMakeLists.txt
@@ -8,10 +8,11 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS 1)
 set(CMAKE_BUILD_TYPE Debug)
 add_compile_definitions(DEBUG)
 
-project(puzzlebox_client C CXX)
+project(pbc C CXX)
 
-include(../i2ctcp/include.cmake)
-include(../shared/pb.cmake)
+add_subdirectory(lib/mpack)
+add_subdirectory(lib/i2ctcp)
+add_subdirectory(lib/pbdrv)
 
 add_executable(pbc
 	main.cpp
@@ -27,5 +28,6 @@ target_link_libraries(pbc
 	i2ctcp
 	mpack
 	readline # this is such a common library that I did not bother adding it as a submodule
+	pbdrv
 	)
 
diff --git a/client/compile_commands.json b/client/compile_commands.json
deleted file mode 120000
index 25eb4b2..0000000
--- a/client/compile_commands.json
+++ /dev/null
@@ -1 +0,0 @@
-build/compile_commands.json
\ No newline at end of file
diff --git a/client/i2c.cpp b/client/i2c.cpp
index 951f654..4dbc724 100644
--- a/client/i2c.cpp
+++ b/client/i2c.cpp
@@ -5,8 +5,8 @@
 #include "sock.h"
 #include "xxd.h"
 
-#include "pb/bus.h"
-#include "pb/types.h"
+#include "pb.h"
+#include "pb-types.h"
 
 // #include "pb/mod/main.h"
 
-- 
cgit v1.2.3