Cleanup

armory3d · Feb 18, 2025 · 5aba6a1 · 5aba6a1
1 parent efe5373
commit 5aba6a1
Show file tree

Hide file tree

Showing 52 changed files with 672 additions and 1,147 deletions.
diff --git a/armorcore/project.js b/armorcore/project.js
@@ -7,7 +7,6 @@ let project = new Project(flags.name);
 	let g5 = false;
 
 	project.add_cfiles("sources/kinc/*");
-	project.add_cfiles("sources/kinc/threads/*");
 	project.add_include_dir("sources");
 
 	function add_backend(name) {
@@ -267,9 +266,6 @@ if (flags.with_audio) {
 	project.add_define("KINC_A2");
 	project.add_define("WITH_AUDIO");
 	project.add_define("arm_audio");
-
-	project.add_cfiles("sources/kinc/audio1/*");
-	project.add_cfiles("sources/kinc/audio2/*");
 	project.add_cfiles("sources/libs/stb_vorbis.c");
 }
 

diff --git a/armorcore/sources/backends/android/kinc/backend/system.c.h b/armorcore/sources/backends/android/kinc/backend/system.c.h
@@ -13,7 +13,7 @@
 #include <kinc/surface.h>
 #include <kinc/log.h>
 #include <kinc/system.h>
-#include <kinc/threads/mutex.h>
+#include <kinc/mutex.h>
 #include <kinc/video.h>
 #include <kinc/window.h>
 #include <unistd.h>

diff --git a/armorcore/sources/backends/apple/kinc/backend/thread.m.h b/armorcore/sources/backends/apple/kinc/backend/thread.m.h
@@ -1,8 +1,8 @@
 #include <stdio.h>
 #include <string.h>
 #include <Foundation/Foundation.h>
-#include <kinc/threads/mutex.h>
-#include <kinc/threads/thread.h>
+#include <kinc/mutex.h>
+#include <kinc/thread.h>
 #include <pthread.h>
 #include <stdio.h>
 #include <wchar.h>

diff --git a/armorcore/sources/backends/microsoft/kinc/backend/event.c.h b/armorcore/sources/backends/microsoft/kinc/backend/event.c.h
diff --git a/armorcore/sources/backends/microsoft/kinc/backend/event.h b/armorcore/sources/backends/microsoft/kinc/backend/event.h
diff --git a/armorcore/sources/backends/microsoft/kinc/backend/fiber.c.h b/armorcore/sources/backends/microsoft/kinc/backend/fiber.c.h
diff --git a/armorcore/sources/backends/microsoft/kinc/backend/fiber.h b/armorcore/sources/backends/microsoft/kinc/backend/fiber.h
diff --git a/armorcore/sources/backends/microsoft/kinc/backend/microsoftunit.c b/armorcore/sources/backends/microsoft/kinc/backend/microsoftunit.c
@@ -48,9 +48,5 @@
 #include <stdio.h>
 
 #include "system_microsoft.c.h"
-#include "event.c.h"
-#include "fiber.c.h"
 #include "mutex.c.h"
-#include "semaphore.c.h"
 #include "thread.c.h"
-#include "threadlocal.c.h"
diff --git a/armorcore/sources/backends/microsoft/kinc/backend/mutex.c.h b/armorcore/sources/backends/microsoft/kinc/backend/mutex.c.h
@@ -1,4 +1,4 @@
-#include <kinc/threads/mutex.h>
+#include <kinc/mutex.h>
 
 void kinc_mutex_init(kinc_mutex_t *mutex) {
 	assert(sizeof(RTL_CRITICAL_SECTION) == sizeof(kinc_microsoft_critical_section_t));

diff --git a/armorcore/sources/backends/microsoft/kinc/backend/semaphore.c.h b/armorcore/sources/backends/microsoft/kinc/backend/semaphore.c.h
diff --git a/armorcore/sources/backends/microsoft/kinc/backend/semaphore.h b/armorcore/sources/backends/microsoft/kinc/backend/semaphore.h
diff --git a/armorcore/sources/backends/microsoft/kinc/backend/thread.c.h b/armorcore/sources/backends/microsoft/kinc/backend/thread.c.h
@@ -1,4 +1,4 @@
-#include <kinc/threads/thread.h>
+#include <kinc/thread.h>
 
 void kinc_threads_init() {}
 

diff --git a/armorcore/sources/backends/microsoft/kinc/backend/threadlocal.c.h b/armorcore/sources/backends/microsoft/kinc/backend/threadlocal.c.h
diff --git a/armorcore/sources/backends/microsoft/kinc/backend/threadlocal.h b/armorcore/sources/backends/microsoft/kinc/backend/threadlocal.h
diff --git a/armorcore/sources/backends/posix/kinc/backend/event.c.h b/armorcore/sources/backends/posix/kinc/backend/event.c.h
diff --git a/armorcore/sources/backends/posix/kinc/backend/event.h b/armorcore/sources/backends/posix/kinc/backend/event.h
diff --git a/armorcore/sources/backends/posix/kinc/backend/mutex.c.h b/armorcore/sources/backends/posix/kinc/backend/mutex.c.h
@@ -1,4 +1,4 @@
-#include <kinc/threads/mutex.h>
+#include <kinc/mutex.h>
 #include <assert.h>
 
 void kinc_mutex_init(kinc_mutex_t *mutex) {

diff --git a/armorcore/sources/backends/posix/kinc/backend/posixunit.c b/armorcore/sources/backends/posix/kinc/backend/posixunit.c
@@ -1,5 +1,2 @@
-#include "event.c.h"
 #include "mutex.c.h"
-#include "semaphore.c.h"
 #include "thread.c.h"
-#include "threadlocal.c.h"
diff --git a/armorcore/sources/backends/posix/kinc/backend/semaphore.c.h b/armorcore/sources/backends/posix/kinc/backend/semaphore.c.h
diff --git a/armorcore/sources/backends/posix/kinc/backend/semaphore.h b/armorcore/sources/backends/posix/kinc/backend/semaphore.h
diff --git a/armorcore/sources/backends/posix/kinc/backend/thread.c.h b/armorcore/sources/backends/posix/kinc/backend/thread.c.h
@@ -1,4 +1,4 @@
-#include <kinc/threads/thread.h>
+#include <kinc/thread.h>
 #include <assert.h>
 #include <stdio.h>
 #include <string.h>

diff --git a/armorcore/sources/backends/posix/kinc/backend/threadlocal.c.h b/armorcore/sources/backends/posix/kinc/backend/threadlocal.c.h
diff --git a/armorcore/sources/backends/posix/kinc/backend/threadlocal.h b/armorcore/sources/backends/posix/kinc/backend/threadlocal.h