match CLB project folder structure

vygr · Jul 21, 2023 · c5a8b17 · c5a8b17
1 parent 5af3b39
commit c5a8b17
Show file tree

Hide file tree

Showing 8 changed files with 7 additions and 3 deletions.
diff --git a/Makefile b/Makefile
@@ -2,8 +2,12 @@ SRC_DIR := ./src
 OBJ_DIR_GUI := ./src/obj/gui
 OBJ_DIR_TUI := ./src/obj/tui
 
-SRC_FILES := $(wildcard $(SRC_DIR)/*.cpp)
-SRC_FILES += $(wildcard $(SRC_DIR)/*.c)
+SRC_DIRS := $(shell find $(SRC_DIR) -type d | grep -v "/obj")
+OBJ_DIRS := $(patsubst $(SRC_DIR)/%,$(OBJ_DIR_GUI)/%,$(SRC_DIRS))
+OBJ_DIRS += $(patsubst $(SRC_DIR)/%,$(OBJ_DIR_TUI)/%,$(SRC_DIRS))
+
+SRC_FILES := $(shell find $(SRC_DIR) -name "*.cpp")
+SRC_FILES += $(shell find $(SRC_DIR) -name "*.c")
 
 OBJ_FILES_GUI := $(patsubst $(SRC_DIR)/%.cpp,$(OBJ_DIR_GUI)/%.o,$(SRC_FILES))
 OBJ_FILES_GUI := $(patsubst $(SRC_DIR)/%.c,$(OBJ_DIR_GUI)/%.o,$(OBJ_FILES_GUI))
@@ -60,7 +64,7 @@ endif
 	@echo $(CPU) > cpu
 	@echo $(OS) > os
 	@echo $(ABI) > abi
-	mkdir -p obj/$(CPU)/$(ABI)/$(OS) $(OBJ_DIR_GUI) $(OBJ_DIR_TUI)
+	mkdir -p obj/$(CPU)/$(ABI)/$(OS) $(OBJ_DIRS)
 
 snapshot:
 	rm -f snapshot.zip

diff --git a/src/gui_fb.c → src/host/gui_fb.c b/src/gui_fb.c → src/host/gui_fb.c
diff --git a/src/gui_raw.cpp → src/host/gui_raw.cpp b/src/gui_raw.cpp → src/host/gui_raw.cpp
diff --git a/src/gui_sdl.cpp → src/host/gui_sdl.cpp b/src/gui_sdl.cpp → src/host/gui_sdl.cpp
diff --git a/src/main.cpp → src/host/main.cpp b/src/main.cpp → src/host/main.cpp
diff --git a/src/pii.h → src/host/pii.h b/src/pii.h → src/host/pii.h
diff --git a/src/sdl-dummy.h → src/host/sdl-dummy.h b/src/sdl-dummy.h → src/host/sdl-dummy.h
diff --git a/src/vp64.cpp → src/host/vp64.cpp b/src/vp64.cpp → src/host/vp64.cpp