Avoid wrapping whole Makefile in bear

Makefile

@@ -153,7 +153,7 @@ builddir:
 	@mkdir -p "$(BUILD_DIR)"
 
 build-c-test:
-	$(CC) $(CSTD) $(CFLAGS) $(BUILD_FLAGS) $(TEST_INCLUDE) $(TEST_C_SRC) -o "$(TEST_C_OUT)"
+	bear -- $(CC) $(CSTD) $(CFLAGS) $(BUILD_FLAGS) $(TEST_INCLUDE) $(TEST_C_SRC) -o "$(TEST_C_OUT)"
 
 run-c-test: build-c-test
 	@echo -e "\n\033[34;1mRUNNING C TESTS\033[0m"
@@ -161,7 +161,7 @@ run-c-test: build-c-test
 	@rm "$(TEST_C_OUT)"
 
 build-cc-test:
-	$(CXX) $(CXXSTD) $(CFLAGS) $(BUILD_FLAGS) $(TEST_INCLUDE) $(TEST_CXX_SRC) "$(LIB_OUT)" -o "$(TEST_CXX_OUT)"
+	bear -a -- $(CXX) $(CXXSTD) $(CFLAGS) $(BUILD_FLAGS) $(TEST_INCLUDE) $(TEST_CXX_SRC) "$(LIB_OUT)" -o "$(TEST_CXX_OUT)"
 
 run-cc-test: build-cc-test
 	@echo -e "\n\033[34;1mRUNNING C++ TESTS\033[0m"
@@ -175,6 +175,6 @@ install: build-lib
 	@bash $(HEADER_INSTALL_CMD) $(LIB_SRC) "$(INCLUDE_INSTALL)" $(INCLUDES)
 
 build-lib: builddir
-	$(CC) -c $(CSTD) $(CFLAGS) $(BUILD_FLAGS) $(LIBFLAGS) $(LIB_SRC) -o "$(OBJ_OUT)"
+	bear -a -- $(CC) -c $(CSTD) $(CFLAGS) $(BUILD_FLAGS) $(LIBFLAGS) $(LIB_SRC) -o "$(OBJ_OUT)"
 	$(AR) r "$(LIB_OUT)" "$(OBJ_OUT)"
 	@rm "$(OBJ_OUT)"

build

@@ -55,4 +55,4 @@ if ! contains ${BUILD_TYPE} "${ACCEPTED_BUILD_TYPES[@]}"; then
   exit 1
 fi
 
-bear -- make BUILD_TYPE=$BUILD_TYPE $ARGS
+make BUILD_TYPE=$BUILD_TYPE $ARGS

src/common/aliases/aliases.h

@@ -60,7 +60,7 @@ typedef intptr_t iptr;
 
 #ifdef WAPP_PLATFORM_CPP
 #define wapp_class_mem static
-#define BEGIN_C_LINKAGE extern "C" {
+#define BEGIN_C_LINKAGE wapp_extern "C" {
 #define END_C_LINKAGE }
 #endif // WAPP_PLATFORM_CPP
 

src/common/assert/assert.h

@@ -13,7 +13,7 @@
 BEGIN_C_LINKAGE
 #endif // !WAPP_PLATFORM_CPP
 
-#define wapp_static_assert(EXPR, MSG) extern char ASSERTION_FAILED[EXPR ? 1 : -1]
+#define wapp_static_assert(EXPR, MSG) wapp_extern char ASSERTION_FAILED[EXPR ? 1 : -1]
 
 #ifndef WAPP_NO_RUNTIME_ASSERT
 	#define wapp_runtime_assert(EXPR, MSG) __wapp_runtime_assert(EXPR, MSG)

src/os/file/file.h

@@ -12,6 +12,9 @@ BEGIN_C_LINKAGE
 #endif // !WAPP_PLATFORM_CPP
 
 typedef struct WFile WFile;
+// wapp_extern WFile *WF_STDIN;
+// wapp_extern WFile *WF_STDOUT;
+// wapp_extern WFile *WF_STDERR;
 
 typedef enum {
 	WAPP_ACCESS_READ,                       // Equivalent to r
@@ -47,14 +50,14 @@ i32    wapp_file_close(WFile *file);
 i32    wapp_file_rename(Str8RO *old_filepath, Str8RO *new_filepath);
 i32    wapp_file_remove(Str8RO *filepath);
 
-extern WFile *_file_open(const Allocator *allocator, Str8RO *filepath, FileAccessMode mode);
+wapp_extern WFile *_file_open(const Allocator *allocator, Str8RO *filepath, FileAccessMode mode);
-extern i64    _file_seek(WFile *file, i64 offset, FileSeekOrigin origin);
+wapp_extern i64    _file_seek(WFile *file, i64 offset, FileSeekOrigin origin);
-extern u64    _file_read(void *dst_buf, u64 byte_count, WFile *file, u64 file_length);
+wapp_extern u64    _file_read(void *dst_buf, u64 byte_count, WFile *file, u64 file_length);
-extern i64    _file_write(const void *src_buf, WFile *file, u64 byte_count);
+wapp_extern i64    _file_write(const void *src_buf, WFile *file, u64 byte_count);
-extern i32    _file_flush(WFile *file);
+wapp_extern i32    _file_flush(WFile *file);
-extern i32    _file_close(WFile *file);
+wapp_extern i32    _file_close(WFile *file);
-extern i32    _file_rename(Str8RO *old_filepath, Str8RO *new_filepath);
+wapp_extern i32    _file_rename(Str8RO *old_filepath, Str8RO *new_filepath);
-extern i32    _file_remove(Str8RO *filepath);
+wapp_extern i32    _file_remove(Str8RO *filepath);
 
 #ifdef WAPP_PLATFORM_CPP
 END_C_LINKAGE

src/os/shell/commander/commander.c

@@ -86,7 +86,7 @@ EXECUTE_COMMAND_CLOSE:
 wapp_intern CMDError get_command_output(FILE *fp, CMDOutHandling out_handling, Str8 *out_buf) {
 	Str8 out = wapp_str8_buf(OUT_BUF_LEN);
 
-	out.size = fread((void *)out.buf, sizeof(u8), out.capacity, fp);
+	out.size = fread((void *)out.buf, sizeof(c8), out.capacity, fp);
 	if (out_handling == SHELL_OUTPUT_CAPTURE && out_buf != NULL) {
 		if (out.size >= out_buf->capacity) {
 			return SHELL_ERR_OUT_BUF_FULL;

src/os/shell/commander/commander.h

@@ -10,6 +10,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 
+// TODO (Abdelrahman): This module needs rethinking
+
 #ifdef WAPP_PLATFORM_CPP
 BEGIN_C_LINKAGE
 #endif // !WAPP_PLATFORM_CPP