Move os layer to be part of the core

src/core/wapp_core.c

@@ -7,5 +7,15 @@
 #include "mem_arena_allocator.c"
 #include "mem_allocator.c"
 #include "str8.c"
+#include "termcolour_win.c"
+#include "termcolour_posix.c"
+#include "termcolour.c"
+#include "commander_win.c"
+#include "commander.c"
+#include "commander_posix.c"
+#include "mem_os_win.c"
+#include "mem_os.c"
+#include "mem_os_posix.c"
+#include "cpath.c"
 
 #endif // !WAPP_CORE_C

src/core/wapp_core.h

@@ -6,6 +6,16 @@
 #include "mem_utils.h"
 #include "mem_allocator.h"
 #include "str8.h"
+#include "termcolour.h"
+#include "terminal_colours.h"
+#include "shell_utils.h"
+#include "commander_output.h"
+#include "commander.h"
+#include "mem_os_ops.h"
+#include "mem_os_win.h"
+#include "mem_os.h"
+#include "mem_os_posix.h"
+#include "cpath.h"
 #include "wapp_common.h"
 
 #endif // !WAPP_CORE_H

src/os/wapp_os.c

@@ -1,17 +0,0 @@
-#ifndef WAPP_OS_C
-#define WAPP_OS_C
-
-#include "wapp_os.h"
-#include "termcolour_win.c"
-#include "termcolour_posix.c"
-#include "termcolour.c"
-#include "commander_win.c"
-#include "commander.c"
-#include "commander_posix.c"
-#include "mem_os_win.c"
-#include "mem_os.c"
-#include "mem_os_posix.c"
-#include "cpath.c"
-#include "wapp_core.c"
-
-#endif // !WAPP_OS_C

src/os/wapp_os.h

@@ -1,17 +0,0 @@
-#ifndef WAPP_OS_H
-#define WAPP_OS_H
-
-#include "termcolour.h"
-#include "terminal_colours.h"
-#include "shell_utils.h"
-#include "commander_output.h"
-#include "commander.h"
-#include "mem_os_ops.h"
-#include "mem_os_win.h"
-#include "mem_os.h"
-#include "mem_os_posix.h"
-#include "cpath.h"
-#include "wapp_common.h"
-#include "wapp_core.h"
-
-#endif // !WAPP_OS_H

src/testing/wapp_testing.c

@@ -4,6 +4,5 @@
 #include "wapp_testing.h"
 #include "tester.c"
 #include "wapp_core.c"
-#include "wapp_os.c"
 
 #endif // !WAPP_TESTING_C

src/testing/wapp_testing.h

@@ -4,6 +4,5 @@
 #include "tester.h"
 #include "wapp_common.h"
 #include "wapp_core.h"
-#include "wapp_os.h"
 
 #endif // !WAPP_TESTING_H

src/wapp.c

@@ -3,7 +3,6 @@
 
 #include "wapp.h"
 #include "wapp_core.c"
-#include "wapp_os.c"
 #include "wapp_testing.c"
 
 #endif // !WAPP_C

src/wapp.h

@@ -3,7 +3,6 @@
 
 #include "wapp_common.h"
 #include "wapp_core.h"
-#include "wapp_os.h"
 #include "wapp_testing.h"
 
 #endif // !WAPP_H