Replace more strings

Kode · Feb 24, 2025 · 058c81c · 058c81c
1 parent 3c90b21
commit 058c81c
Show file tree

Hide file tree

Showing 34 changed files with 98 additions and 100 deletions.
diff --git a/backends/audio/directsound/sources/DirectSound.cpp b/backends/audio/directsound/sources/DirectSound.cpp
@@ -1,9 +1,9 @@
 #include <kore3/audio/audio.h>
 
-#include <kinc/system.h>
+#include <kore3/system.h>
 
-#include <kinc/backend/SystemMicrosoft.h>
-#include <kinc/backend/Windows.h>
+#include <kore3/backend/SystemMicrosoft.h>
+#include <kore3/backend/Windows.h>
 
 #include <dsound.h>
 

diff --git a/backends/audio/wasapi_winrt/sources/WASAPI.winrt.cpp b/backends/audio/wasapi_winrt/sources/WASAPI.winrt.cpp
@@ -1,10 +1,10 @@
-#include <kinc/audio2/audio.h>
+#include <kore3/audio2/audio.h>
 
-#include <kinc/backend/SystemMicrosoft.h>
+#include <kore3/backend/SystemMicrosoft.h>
 
-#include <kinc/error.h>
-#include <kinc/log.h>
-#include <kinc/threads/thread.h>
+#include <kore3/error.h>
+#include <kore3/log.h>
+#include <kore3/threads/thread.h>
 
 #include <AudioClient.h>
 #include <Windows.h>

diff --git a/backends/gpu/direct3d11/includes/kore3/direct3d11/device_functions.h b/backends/gpu/direct3d11/includes/kore3/direct3d11/device_functions.h
@@ -3,7 +3,7 @@
 
 #include <kore3/gpu/device.h>
 
-#include <kinc/math/matrix.h>
+#include <kore3/math/matrix.h>
 
 #include "descriptorset_structs.h"
 

diff --git a/backends/gpu/direct3d11/sources/device.c b/backends/gpu/direct3d11/sources/device.c
@@ -5,8 +5,8 @@
 #include <kore3/gpu/device.h>
 #include <kore3/util/align.h>
 
-#include <kinc/log.h>
-#include <kinc/window.h>
+#include <kore3/log.h>
+#include <kore3/window.h>
 
 #include <assert.h>
 

diff --git a/backends/gpu/direct3d11/sources/pipeline.c b/backends/gpu/direct3d11/sources/pipeline.c
@@ -1,7 +1,7 @@
 #include "pipeline_functions.h"
 #include "pipeline_structs.h"
 
-#include <kinc/log.h>
+#include <kore3/log.h>
 
 void kore_d3d11_render_pipeline_init(kore_d3d11_device *device, kore_d3d11_render_pipeline *pipe, const kore_d3d11_render_pipeline_parameters *parameters) {
 

diff --git a/backends/gpu/direct3d12/sources/fence.cpp b/backends/gpu/direct3d12/sources/fence.cpp
@@ -2,7 +2,7 @@
 
 #include <kore3/gpu/fence.h>
 
-#include <kinc/backend/SystemMicrosoft.h>
+#include <kore3/backend/SystemMicrosoft.h>
 
 void kore_d3d12_fence_destroy(kore_gpu_fence *fence) {
 	fence->d3d12.fence->Release();

diff --git a/backends/gpu/opengl/includes/kore3/webgpu/device_functions.h b/backends/gpu/opengl/includes/kore3/webgpu/device_functions.h
@@ -3,7 +3,7 @@
 
 #include <kore3/gpu/device.h>
 
-#include <kinc/math/matrix.h>
+#include <kore3/math/matrix.h>
 
 #include "descriptorset_structs.h"
 

diff --git a/backends/gpu/opengl/sources/device.c b/backends/gpu/opengl/sources/device.c
@@ -5,8 +5,8 @@
 #include <kore3/gpu/device.h>
 #include <kore3/util/align.h>
 
-#include <kinc/log.h>
-#include <kinc/window.h>
+#include <kore3/log.h>
+#include <kore3/window.h>
 
 #include <assert.h>
 

diff --git a/backends/gpu/opengl/sources/pipeline.c b/backends/gpu/opengl/sources/pipeline.c
@@ -1,7 +1,7 @@
 #include "pipeline_functions.h"
 #include "pipeline_structs.h"
 
-#include <kinc/log.h>
+#include <kore3/log.h>
 
 void kore_opengl_render_pipeline_init(kore_opengl_device *device, kore_opengl_render_pipeline *pipe, const kore_opengl_render_pipeline_parameters *parameters) {
 

diff --git a/backends/system/android/sources/system.c b/backends/system/android/sources/system.c
@@ -3,11 +3,11 @@
 #include <kore3/error.h>
 // #include <GLContext.h>
 #include <kore3/backend/android.h>
-//#include <kinc/graphics4/graphics.h>
+//#include <kore3/graphics4/graphics.h>
 #include <kore3/input/gamepad.h>
 #include <kore3/input/keyboard.h>
 #include <kore3/input/mouse.h>
-// #include <kinc/input/sensor.h>
+// #include <kore3/input/sensor.h>
 #include <kore3/backend/android_native_app_glue.h>
 #include <android/sensor.h>
 #include <android/window.h>

diff --git a/backends/system/android/sources/window.c b/backends/system/android/sources/window.c
@@ -1,5 +1,5 @@
 #include <kore3/display.h>
-// #include <kinc/graphics4/graphics.h>
+// #include <kore3/graphics4/graphics.h>
 #include <kore3/window.h>
 
 static void (*resizeCallback)(int x, int y, void *data) = NULL;

diff --git a/backends/system/emscripten/sources/system.c b/backends/system/emscripten/sources/system.c
@@ -5,7 +5,7 @@
 #include <emscripten/emscripten.h>
 
 #include <kore3/audio/audio.h>
-//#include <kinc/graphics4/graphics.h>
+//#include <kore3/graphics4/graphics.h>
 #include <kore3/input/keyboard.h>
 #include <kore3/input/mouse.h>
 #include <kore3/log.h>

diff --git a/backends/system/ios/sources/GLView.m b/backends/system/ios/sources/GLView.m
@@ -11,7 +11,7 @@
 #include <kore3/system.h>
 
 #ifdef KORE_OPENGL
-#include <kinc/backend/graphics4/OpenGLWindow.h>
+#include <kore3/backend/graphics4/OpenGLWindow.h>
 #endif
 
 static const int touchmaxcount = 20;

diff --git a/backends/system/linux/includes/kore3/backend/video.h b/backends/system/linux/includes/kore3/backend/video.h
@@ -5,7 +5,7 @@ extern "C" {
 #endif
 
 #if defined(KORE_VIDEO_GSTREAMER)
-#include <kinc/backend/video_gstreamer.h>
+#include <kore3/backend/video_gstreamer.h>
 #else
 typedef struct {
 	int nothing;

diff --git a/backends/system/linux/sources/system.c b/backends/system/linux/sources/system.c
@@ -1,4 +1,4 @@
-//#include "kinc/graphics4/graphics.h"
+//#include "kore3/graphics4/graphics.h"
 #include <kore3/display.h>
 #include <kore3/input/gamepad.h>
 #include <kore3/input/keyboard.h>

diff --git a/backends/system/linux/sources/window.c b/backends/system/linux/sources/window.c
@@ -1,7 +1,7 @@
 #include <kore3/backend/funcs.h>
 
 #include <kore3/display.h>
-//#include <kinc/graphics4/graphics.h>
+//#include <kore3/graphics4/graphics.h>
 #include <kore3/window.h>
 
 #include <string.h>

diff --git a/backends/system/macos/sources/BasicOpenGLView.m b/backends/system/macos/sources/BasicOpenGLView.m
@@ -6,7 +6,7 @@
 #include <kore3/system.h>
 
 #ifdef KORE_METAL
-//#include <kinc/graphics5/graphics.h>
+//#include <kore3/graphics5/graphics.h>
 #endif
 
 @implementation BasicOpenGLView

diff --git a/backends/system/windows/sources/steamvr.cpp b/backends/system/windows/sources/steamvr.cpp
@@ -1,10 +1,10 @@
 #ifdef KORE_STEAMVR
 
-#include <Kinc/graphics4/graphics.h>
-#include <Kinc/graphics4/rendertarget.h>
-#include <Kinc/math/quaternion.h>
-#include <Kinc/math/vector.h>
-#include <Kinc/vr/vrinterface.h>
+#include <kore3/graphics4/graphics.h>
+#include <kore3/graphics4/rendertarget.h>
+#include <kore3/math/quaternion.h>
+#include <kore3/math/vector.h>
+#include <kore3/vr/vrinterface.h>
 #include <Kore/Input/Gamepad.h>
 #include <Kore/Log.h>
 // #include "Direct3D11.h"

diff --git a/backends/system/windowsapp/sources/system.winrt.cpp b/backends/system/windowsapp/sources/system.winrt.cpp
@@ -1,4 +1,4 @@
-//#include <kinc/graphics4/graphics.h>
+//#include <kore3/graphics4/graphics.h>
 #include <kore3/input/gamepad.h>
 #include <kore3/input/keyboard.h>
 #include <kore3/input/mouse.h>

diff --git a/create_single_header_libs.js b/create_single_header_libs.js
@@ -57,7 +57,7 @@ function miniPreprocessor(source) {
 								}
 							}
 							else {
-								if (headerPath.startsWith('kinc/backend')) {
+								if (headerPath.startsWith('kore3/backend')) {
 									filePath = path.resolve('Backends', 'System', 'Microsoft', 'Sources', headerPath);
 								}
 								else {
@@ -133,7 +133,7 @@ const audio2_header = fs.readFileSync(path.resolve('Sources', 'kinc', 'audio2',
 let lib = '#pragma once\n' + miniPreprocessor(audio2_header);
 
 let windows_backend = fs.readFileSync(path.resolve('Backends', 'Audio2', 'WASAPI', 'Sources', 'kinc', 'backend', 'wasapi.c'), {encoding: 'utf8'});
-windows_backend = windows_backend.replace('#include <kinc/audio2/audio.h>', '');
+windows_backend = windows_backend.replace('#include <kore3/audio2/audio.h>', '');
 windows_backend = miniPreprocessor(windows_backend);
 
 lib = lib.replace('// BACKENDS-PLACEHOLDER', '#ifdef KORE_WINDOWS\n' + windows_backend + '\n#endif');

diff --git a/includes/kore3/2d/2d.h b/includes/kore3/2d/2d.h
@@ -1,12 +1,12 @@
 #ifndef KORE_2D_HEADER
 #define KORE_2D_HEADER
 
-#include <kinc/global.h>
+#include <kore3/global.h>
 
 #if 0
 
-#include <kinc/graphics4/texture.h>
-#include <kinc/math/matrix.h>
+#include <kore3/graphics4/texture.h>
+#include <kore3/math/matrix.h>
 
 /*! \file graphics.h
     \brief This is still in progress, please don't use it.

diff --git a/includes/kore3/simd/type_conversions.h b/includes/kore3/simd/type_conversions.h
@@ -2,7 +2,7 @@
 #define KORE_SIMD_TYPE_CONVERSIONS_HEADER
 
 #include "types.h"
-#include <kinc/global.h>
+#include <kore3/global.h>
 #include <string.h>
 
 /*! \file type_conversions.h

diff --git a/includes/kore3/vr/vr.h b/includes/kore3/vr/vr.h
@@ -1,7 +1,7 @@
 #ifndef KORE_VR_HEADER
 #define KORE_VR_HEADER
 
-#include <kinc/global.h>
+#include <kore3/global.h>
 
 #include <kore3/math/matrix.h>
 #include <kore3/math/quaternion.h>

diff --git a/kfile.js b/kfile.js
@@ -32,8 +32,6 @@ let a3 = false;
 // which is a little more restrictive than Kinc's zlib license.
 const lz4x = true;
 
-project.addFile('sources/kinc/**');
-
 project.addFile('includes/**');
 
 function addUnit(name) {
@@ -528,7 +526,7 @@ if (g4) {
 }
 else {
 	project.addExclude('sources/Kore/Graphics4/**');
-	project.addExclude('sources/kinc/graphics4/**');
+	project.addExclude('sources/kore3/graphics4/**');
 }
 
 addKincDefine('G5');

diff --git a/sources/2d/2d_soft.c b/sources/2d/2d_soft.c
@@ -2,9 +2,9 @@
 
 #if 0
 
-#include <kinc/graphics1/graphics.h>
-#include <kinc/math/core.h>
-#include <kinc/math/matrix.h>
+#include <kore3/graphics1/graphics.h>
+#include <kore3/math/core.h>
+#include <kore3/math/matrix.h>
 
 #include <stdint.h>
 #include <string.h>

diff --git a/sources/2d/colored_painter.c b/sources/2d/colored_painter.c
@@ -1,7 +1,7 @@
-#include <kinc/graphics4/graphics.h>
-#include <kinc/graphics4/indexbuffer.h>
-#include <kinc/graphics4/vertexbuffer.h>
-#include <kinc/math/matrix.h>
+#include <kore3/graphics4/graphics.h>
+#include <kore3/graphics4/indexbuffer.h>
+#include <kore3/graphics4/vertexbuffer.h>
+#include <kore3/math/matrix.h>
 
 #include <kong.h>
 

diff --git a/sources/2d/graphics.c b/sources/2d/graphics.c
@@ -1,8 +1,8 @@
 #include "graphics.h"
 
-#include <kinc/image.h>
-#include <kinc/math/matrix.h>
-#include <kinc/video.h>
+#include <kore3/image.h>
+#include <kore3/math/matrix.h>
+#include <kore3/video.h>
 
 #include <assert.h>
 #include <math.h>

diff --git a/sources/2d/image_painter.c b/sources/2d/image_painter.c
@@ -1,8 +1,8 @@
-#include <kinc/graphics4/graphics.h>
-#include <kinc/graphics4/indexbuffer.h>
-#include <kinc/graphics4/texture.h>
-#include <kinc/graphics4/vertexbuffer.h>
-#include <kinc/math/matrix.h>
+#include <kore3/graphics4/graphics.h>
+#include <kore3/graphics4/indexbuffer.h>
+#include <kore3/graphics4/texture.h>
+#include <kore3/graphics4/vertexbuffer.h>
+#include <kore3/math/matrix.h>
 
 #include <kong.h>
 

diff --git a/sources/framebuffer/framebuffer.c b/sources/framebuffer/framebuffer.c
@@ -2,14 +2,14 @@
 
 #if 0
 
-#include <kinc/graphics4/graphics.h>
-#include <kinc/graphics4/indexbuffer.h>
-#include <kinc/graphics4/pipeline.h>
-#include <kinc/graphics4/shader.h>
-#include <kinc/graphics4/texture.h>
-#include <kinc/graphics4/vertexbuffer.h>
-#include <kinc/io/filereader.h>
-#include <kinc/log.h>
+#include <kore3/graphics4/graphics.h>
+#include <kore3/graphics4/indexbuffer.h>
+#include <kore3/graphics4/pipeline.h>
+#include <kore3/graphics4/shader.h>
+#include <kore3/graphics4/texture.h>
+#include <kore3/graphics4/vertexbuffer.h>
+#include <kore3/io/filereader.h>
+#include <kore3/log.h>
 
 #if 0
 

diff --git a/tests/display/sources/display.c b/tests/display/sources/display.c
@@ -1,5 +1,5 @@
-#include <kinc/display.h>
-#include <kinc/log.h>
+#include <kore3/display.h>
+#include <kore3/log.h>
 
 void print_mode(const char *indent, kore_display_mode_t mode) {
 	kore_log(KORE_LOG_LEVEL_INFO, "%sx: %i", indent, mode.x);

diff --git a/tests/input/sources/input.c b/tests/input/sources/input.c
@@ -1,8 +1,8 @@
-#include "kinc/input/keyboard.h"
-#include "kinc/log.h"
-#include <kinc/graphics4/graphics.h>
-#include <kinc/input/mouse.h>
-#include <kinc/system.h>
+#include "kore3/input/keyboard.h"
+#include "kore3/log.h"
+#include <kore3/graphics4/graphics.h>
+#include <kore3/input/mouse.h>
+#include <kore3/system.h>
 
 #include <assert.h>
 #include <stdlib.h>

diff --git a/tests/multiwindow/sources/multiwindow.c b/tests/multiwindow/sources/multiwindow.c
@@ -1,13 +1,13 @@
-#include <kinc/graphics4/graphics.h>
-#include <kinc/graphics4/indexbuffer.h>
-#include <kinc/graphics4/pipeline.h>
-#include <kinc/graphics4/shader.h>
-#include <kinc/graphics4/vertexbuffer.h>
-#include <kinc/input/mouse.h>
-#include <kinc/io/filereader.h>
-#include <kinc/log.h>
-#include <kinc/system.h>
-#include <kinc/window.h>
+#include <kore3/graphics4/graphics.h>
+#include <kore3/graphics4/indexbuffer.h>
+#include <kore3/graphics4/pipeline.h>
+#include <kore3/graphics4/shader.h>
+#include <kore3/graphics4/vertexbuffer.h>
+#include <kore3/input/mouse.h>
+#include <kore3/io/filereader.h>
+#include <kore3/log.h>
+#include <kore3/system.h>
+#include <kore3/window.h>
 
 #include <assert.h>
 #include <stdlib.h>