Library directories

11 files changed, 19 insertions, 8 deletions

diff --git a/Makefile b/Makefile
index 53bf441..238fb87 100644
--- a/Makefile
+++ b/Makefile
@@ -6,19 +6,26 @@ INC_DIR=include/
 
 # Source files
 SRC_DIR=src/
-SRC_OBJ_DIR=$(BUILD_DIR)obj/src/
+SRC_OBJ_DIR=$(BUILD_DIR)obj/$(SRC_DIR)
 SRC_SRCS=$(shell find $(SRC_DIR) -iname \*.c)
 SRC_OBJS_sub=$(subst $(SRC_DIR),$(SRC_OBJ_DIR),$(SRC_SRCS))
 SRC_OBJS=$(SRC_OBJS_sub:.c=.o)
 SRC_OBJ_DIRS_sub=$(shell find $(SRC_DIR) -type d)
 SRC_OBJ_DIRS=$(subst $(SRC_DIR),$(SRC_OBJ_DIR),$(SRC_OBJ_DIRS_sub))
 
-$(info $(SRC_SRCS))
-$(info $(SRC_OBJ_DIR))
-$(info $(SRC_OBJ_DIRS))
-$(info $(SRC_OBJS))
-
 # Library files
+LIB_DIR=lib/
+LIB_OBJ_DIR=$(BUILD_DIR)obj/$(LIB_DIR)
+LIB_SRCS=$(shell find $(LIB_DIR) -iname \*.c)
+LIB_OBJS_sub=$(subst $(LIB_DIR),$(LIB_OBJ_DIR),$(LIB_SRCS))
+LIB_OBJS=$(LIB_OBJS_sub:.c=.o)
+LIB_OBJ_DIRS_sub=$(shell find $(LIB_DIR) -type d)
+LIB_OBJ_DIRS=$(subst $(LIB_DIR),$(LIB_OBJ_DIR),$(LIB_OBJ_DIRS_sub))
+
+$(info $(LIB_SRCS))
+$(info $(LIB_OBJ_DIR))
+$(info $(LIB_OBJ_DIRS))
+$(info $(LIB_OBJS))
 
 # Include raylib if we want a visual experience
 ifdef RAYLIB
@@ -55,7 +62,7 @@ default: clean build
 
 build: $(BUILD_DIR)$(EXE)
 
-$(BUILD_DIR)$(EXE): $(SRC_OBJS)
+$(BUILD_DIR)$(EXE): $(SRC_OBJS) $(LIB_OBJS)
 	@echo LD --\> $@
 	@gcc -o $@ $(LDFLAGS) $^
 
@@ -63,10 +70,14 @@ $(SRC_OBJ_DIR)%.o: $(SRC_DIR)%.c
 	@echo CC $< --\> $@
 	@gcc -o $@ $(CFLAGS) -c $<
 
+$(LIB_OBJ_DIR)%.o: $(LIB_DIR)%.c
+	@echo CC $< --\> $@
+	@gcc -o $@ $(CFLAGS) -c $<
+
 clean:
 	@echo Cleaning build files...
 	@-rm -rf $(OBJ_DIR) $(BUILD_DIR)
-	@mkdir -p $(BUILD_DIR) $(SRC_OBJ_DIRS)
+	@mkdir -p $(BUILD_DIR) $(SRC_OBJ_DIRS) $(LIB_OBJ_DIRS)
 
 run: $(BUILD_DIR)$(EXE)
 	@echo Executing...
diff --git a/src/lib/algo/avl_tree.c b/lib/algo/avl_tree.c
index db4fa4b..db4fa4b 100644
--- a/src/lib/algo/avl_tree.c
+++ b/lib/algo/avl_tree.c
diff --git a/src/lib/algo/flood_fill.c b/lib/algo/flood_fill.c
index 62db658..62db658 100644
--- a/src/lib/algo/flood_fill.c
+++ b/lib/algo/flood_fill.c
diff --git a/src/lib/color.c b/lib/color.c
index 902a93d..902a93d 100644
--- a/src/lib/color.c
+++ b/lib/color.c
diff --git a/src/lib/dir.c b/lib/dir.c
index be2a2ac..be2a2ac 100644
--- a/src/lib/dir.c
+++ b/lib/dir.c
diff --git a/src/lib/file.c b/lib/file.c
index b6ec1d0..b6ec1d0 100644
--- a/src/lib/file.c
+++ b/lib/file.c
diff --git a/src/lib/lib.c b/lib/lib.c
index c1f26fc..c1f26fc 100644
--- a/src/lib/lib.c
+++ b/lib/lib.c
diff --git a/src/lib/png.c b/lib/png.c
index d12a765..d12a765 100644
--- a/src/lib/png.c
+++ b/lib/png.c
diff --git a/src/lib/seg/mask_data.c b/lib/seg/mask_data.c
index 8c4b037..8c4b037 100644
--- a/src/lib/seg/mask_data.c
+++ b/lib/seg/mask_data.c
diff --git a/src/lib/seg/util.c b/lib/seg/util.c
index 677e8f5..677e8f5 100644
--- a/src/lib/seg/util.c
+++ b/lib/seg/util.c
diff --git a/src/lib/time.c b/lib/time.c
index 085ef80..085ef80 100644
--- a/src/lib/time.c
+++ b/lib/time.c