From: Trent Huber <trentmhuber@gmail.com>
Date: Tue, 15 Oct 2024 00:58:28 +0000 (-0400)
Subject: Removed object files, implemented cbs cleaning subcommand
X-Git-Url: https://trenthuber.com/code?a=commitdiff_plain;h=6bfa4419a1c07af391e7513218653f74d6deac48;p=xpmview.git

Removed object files, implemented cbs cleaning subcommand
---

diff --git a/.gitignore b/.gitignore
index 65b3e9c..9b1518a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 *swp
 *cbs
 bin/
+*.o
diff --git a/cbs.c b/cbs.c
index 423187b..8b8104f 100644
--- a/cbs.c
+++ b/cbs.c
@@ -19,7 +19,17 @@ int main(int argc, char **argv) {
 	cbs_rebuild_self(argv);
 	cbs_shift_args(&argc, &argv);
 
-	// Build our dependencies
+	const char *subcommand = cbs_shift_args(&argc, &argv);
+	if (subcommand && cbs_string_eq(subcommand, "clean")) {
+		Cbs_Cmd cmd = {0};
+		cbs_cmd_build(&cmd, "rm", "-rf", "./bin");
+		Cbs_File_Paths obj_files = {0};
+		cbs_file_paths_build_file_ext(&obj_files, "./src", ".o");
+		cbs_cmd_build_file_paths(&cmd, obj_files);
+		cbs_cmd_run(&cmd);
+		return 0;
+	}
+
 	cbs_subbuild("./external");
 
 	cbs_run("mkdir", "-p", "./bin");
@@ -28,14 +38,14 @@ int main(int argc, char **argv) {
 	cbs_file_paths_for_each (src_file, src_files) {
 		const char *obj_file = cbs_string_build(cbs_strip_file_ext(src_file), ".o");
 		if (cbs_needs_rebuild(obj_file, src_file))
-			cbs_run(CC, CFLAGS, "-c", "-I./include", "-I./external/raylib/src",
-			        "-I./external/stb", "-o", obj_file, src_file);
+		    cbs_run(CC, CFLAGS, "-c", "-I./external/raylib/src",
+		            "-I./external/stb", "-o", obj_file, src_file);
 	}
 
 	Cbs_File_Paths obj_files = {0};
 	cbs_file_paths_build_file_ext(&obj_files, "./src", ".o");
-	const char *bin_file = "./bin/simplexpm";
 	Cbs_Cmd cmd = {0};
+	const char *bin_file = "./bin/simplexpm";
 	cbs_cmd_build(&cmd, CC, "-o", bin_file);
 	cbs_cmd_build_file_paths(&cmd, obj_files);
 	cbs_cmd_build(&cmd, LDFLAGS);
diff --git a/src/main.c b/src/main.c
index 90195e5..1640627 100644
--- a/src/main.c
+++ b/src/main.c
@@ -9,6 +9,10 @@
 
 #define FILE_PATH_CAP 2048
 
+// TODO: Implement writing to PNG file (stb image write)
+// TODO: Add ability to reload current file
+// TODO: Update visual interface
+
 int main(int argc, char **argv) {
 	char file_path[FILE_PATH_CAP] = {0};
 	Texture2D texture = {0};
diff --git a/src/main.o b/src/main.o
deleted file mode 100644
index ddc851e..0000000
Binary files a/src/main.o and /dev/null differ
diff --git a/include/parser.h b/src/parser.h
similarity index 100%
rename from include/parser.h
rename to src/parser.h
diff --git a/src/parser.o b/src/parser.o
deleted file mode 100644
index 283a23b..0000000
Binary files a/src/parser.o and /dev/null differ
diff --git a/include/tokenizer.h b/src/tokenizer.h
similarity index 100%
rename from include/tokenizer.h
rename to src/tokenizer.h
diff --git a/src/tokenizer.o b/src/tokenizer.o
deleted file mode 100644
index 4526e74..0000000
Binary files a/src/tokenizer.o and /dev/null differ
diff --git a/include/utils.h b/src/utils.h
similarity index 100%
rename from include/utils.h
rename to src/utils.h
diff --git a/src/utils.o b/src/utils.o
deleted file mode 100644
index c6608d2..0000000
Binary files a/src/utils.o and /dev/null differ
diff --git a/include/xpm_mode.h b/src/xpm_mode.h
similarity index 100%
rename from include/xpm_mode.h
rename to src/xpm_mode.h
diff --git a/src/xpm_mode.o b/src/xpm_mode.o
deleted file mode 100644
index 33dd389..0000000
Binary files a/src/xpm_mode.o and /dev/null differ