Clean up the KINC/KORE defines

Kode · Mar 28, 2024 · ffcf3c4 · ffcf3c4
1 parent 5b333a5
commit ffcf3c4
Show file tree

Hide file tree

Showing 10 changed files with 27 additions and 23 deletions.
diff --git a/Backends/Kinc-HL/kfile.js b/Backends/Kinc-HL/kfile.js
@@ -5,10 +5,10 @@ project.addExcludes('hl/src/std/unicase.c', 'hl/src/std/debug.c', 'hl/include/pc
 project.addIncludeDirs('hl/src', 'hl/include/pcre', 'hl/include/mbedtls/include', 'hl/include/zlib');
 project.addFiles('hl/include/mbedtls/library/**', 'hl/include/zlib/**', 'hl/libs/fmt/fmt.c', 'hl/libs/fmt/sha1.c', 'hl/libs/ssl/ssl.c');
 
-if (platform == Platform.OSX) project.addDefine('KORE_DEBUGDIR="osx-hl"');
-if (platform == Platform.iOS) project.addDefine('KORE_DEBUGDIR="ios-hl"');
+if (platform == Platform.OSX) project.addDefine('KINC_DEBUGDIR="osx-hl"');
+if (platform == Platform.iOS) project.addDefine('KINC_DEBUGDIR="ios-hl"');
 if (platform !== Platform.Windows || audio !== AudioApi.DirectSound) {
-	project.addDefine('KORE_MULTITHREADED_AUDIO');
+	project.addDefine('KINC_MULTITHREADED_AUDIO');
 }
 
 project.addDefine('KORE');

diff --git a/Backends/Kinc-HL/kinc-bridge/kinc.c.h b/Backends/Kinc-HL/kinc-bridge/kinc.c.h
@@ -43,7 +43,7 @@ static void update(void *data) {
 static bool mixThreadregistered = false;
 
 static void mix(kinc_a2_buffer_t *buffer, uint32_t samples, void *userdata) {
-#ifdef KORE_MULTITHREADED_AUDIO
+#ifdef KINC_MULTITHREADED_AUDIO
 	if (!mixThreadregistered) {
 		vdynamic *ret;
 		hl_register_thread(&ret);
@@ -65,7 +65,7 @@ static void mix(kinc_a2_buffer_t *buffer, uint32_t samples, void *userdata) {
 		}
 	}
 
-#ifdef KORE_MULTITHREADED_AUDIO
+#ifdef KINC_MULTITHREADED_AUDIO
 	hl_blocking(false);
 #endif
 }

diff --git a/Backends/Kinc-HL/kinc-bridge/texture.c.h b/Backends/Kinc-HL/kinc-bridge/texture.c.h
@@ -270,7 +270,7 @@ void hl_kinc_texture_unlock(vbyte *texture, vbyte *bytes) {
 	int stride = kinc_g4_texture_stride(tex);
 	for (int y = 0; y < tex->tex_height; ++y) {
 		for (int x = 0; x < tex->tex_width; ++x) {
-#ifdef KORE_DIRECT3D
+#ifdef KINC_DIRECT3D
 			if (tex->format == KINC_IMAGE_FORMAT_RGBA32) {
 				// RBGA->BGRA
 				btex[y * stride + x * size + 0] = b[(y * tex->tex_width + x) * size + 2];

diff --git a/Backends/Kinc-hxcpp/kfile.js b/Backends/Kinc-hxcpp/kfile.js
@@ -89,13 +89,15 @@ if (platform === Platform.WindowsApp) {
 	project.addDefine('HX_WINRT');
 }
 if (platform !== Platform.Windows || audio !== AudioApi.DirectSound) {
-	project.addDefine('KORE_MULTITHREADED_AUDIO');
+	project.addDefine('KINC_MULTITHREADED_AUDIO');
 }
 if (platform === Platform.OSX) {
 	project.addDefine('HXCPP_M64');
 	project.addDefine('HX_MACOS');
 }
-if (platform === Platform.Linux) project.addDefine('HX_LINUX');
+if (platform === Platform.Linux) {
+	project.addDefine('HX_LINUX');
+}
 if (platform === Platform.iOS) {
 	project.addDefine('IPHONE');
 	project.addDefine('HX_IPHONE');
@@ -110,10 +112,12 @@ if (platform === Platform.Android) {
 	project.addDefine('HXCPP_ANDROID_PLATFORM=24');
 }
 if (platform === Platform.OSX) {
-	project.addDefine('KORE_DEBUGDIR="osx"');
+	project.addDefine('KINC_DEBUGDIR="osx"');
 	project.addLib('Security');
 }
-if (platform === Platform.iOS) project.addDefine('KORE_DEBUGDIR="ios"');
+if (platform === Platform.iOS) {
+	project.addDefine('KINC_DEBUGDIR="ios"');
+}
 
 // project:addDefine('HXCPP_SCRIPTABLE');
 project.addDefine('STATIC_LINK');

diff --git a/Backends/Kinc-hxcpp/kha/Image.hx b/Backends/Kinc-hxcpp/kha/Image.hx
@@ -465,7 +465,7 @@ class Image implements Canvas implements Resource {
 		int stride = kinc_g4_texture_stride(&texture);
 		for (int y = 0; y < texture.tex_height; ++y) {
 			for (int x = 0; x < texture.tex_width; ++x) {
-#ifdef KORE_DIRECT3D
+#ifdef KINC_DIRECT3D
 				if (texture.format == KINC_IMAGE_FORMAT_RGBA32) {
 					//RBGA->BGRA
 					tex[y * stride + x * size + 0] = b[(y * originalWidth + x) * size + 2];

diff --git a/Backends/Kinc-hxcpp/kha/graphics4/ShaderStorageBuffer.hx b/Backends/Kinc-hxcpp/kha/graphics4/ShaderStorageBuffer.hx
@@ -4,7 +4,7 @@ package kha.graphics4;
 #include <kinc/graphics4/compute.h>
 ")
 @:headerClassCode("
-#ifdef KORE_OPENGL
+#ifdef KINC_OPENGL
 kinc_shader_storage_buffer buffer;
 #endif")
 class ShaderStorageBuffer {
@@ -19,7 +19,7 @@ class ShaderStorageBuffer {
 	}
 
 	@:functionCode("
-	#ifdef KORE_OPENGL
+	#ifdef KINC_OPENGL
 	kinc_g4_vertex_data type2;
 	switch (type) {
 	case 0:
@@ -48,7 +48,7 @@ class ShaderStorageBuffer {
 	}
 
 	@:functionCode("
-		#ifdef KORE_OPENGL
+		#ifdef KINC_OPENGL
 		kinc_shader_storage_buffer_destroy(&buffer);
 		#endif
 	")
@@ -59,7 +59,7 @@ class ShaderStorageBuffer {
 	}
 
 	@:functionCode("
-		#ifdef KORE_OPENGL
+		#ifdef KINC_OPENGL
 		int* indices = kinc_shader_storage_buffer_lock(&buffer);
 		for (int i = 0; i < myCount; ++i) {
 			indices[i] = data[i];

diff --git a/Backends/Kinc-hxcpp/kha/kore/graphics4/Graphics.hx b/Backends/Kinc-hxcpp/kha/kore/graphics4/Graphics.hx
@@ -454,7 +454,7 @@ class Graphics implements kha.graphics4.Graphics {
 
 	public function setShaderStorageBuffer(buffer: ShaderStorageBuffer, index: Int) {
 		untyped __cpp__("
-			#ifdef KORE_OPENGL
+			#ifdef KINC_OPENGL
 			kinc_g4_set_shader_storage_buffer(&buffer->buffer, index);
 			#endif
 		");

diff --git a/Backends/Kinc-hxcpp/khacpp b/Backends/Kinc-hxcpp/khacpp
diff --git a/Backends/Kinc-hxcpp/main.cpp b/Backends/Kinc-hxcpp/main.cpp
@@ -206,7 +206,7 @@ namespace {
 		using namespace Kore;
 
 		int t0 = 99;
-#ifdef KORE_MULTITHREADED_AUDIO
+#ifdef KINC_MULTITHREADED_AUDIO
 		if (!mixThreadregistered && !::kha::audio2::Audio_obj::disableGcInteractions) {
 			hx::SetTopOfStack(&t0, true);
 			mixThreadregistered = true;
@@ -228,7 +228,7 @@ namespace {
 
 		::kha::audio2::Audio_obj::_callCallback(samples * 2, kinc_a2_samples_per_second());
 
-#ifdef KORE_MULTITHREADED_AUDIO
+#ifdef KINC_MULTITHREADED_AUDIO
 		if (mixThreadregistered) {
 			hx::EnterGCFreeZone();
 		}
@@ -351,7 +351,7 @@ void run_kinc() {
 	kinc_log(KINC_LOG_LEVEL_INFO, "Starting application");
 	kinc_start();
 	kinc_log(KINC_LOG_LEVEL_INFO, "Application stopped");
-#if !defined(KORE_XBOX_ONE) && !defined(KORE_TIZEN) && !defined(KORE_HTML5)
+#if !defined(KINC_HTML5)
 	kinc_threads_quit();
 	kinc_stop();
 #endif
@@ -366,7 +366,7 @@ extern "C" void __hxcpp_main();
 extern int _hxcpp_argc;
 extern char **_hxcpp_argv;
 
-#ifdef KORE_WINDOWS
+#ifdef KINC_WINDOWS
 #include <Windows.h>
 #endif
 
@@ -386,7 +386,7 @@ int kickstart(int argc, char **argv) {
 	} catch (Dynamic e) {
 		__hx_dump_stack();
 		kinc_log(KINC_LOG_LEVEL_ERROR, "Error %s", e == null() ? "null" : e->toString().__CStr());
-#ifdef KORE_WINDOWS
+#ifdef KINC_WINDOWS
 		MessageBoxW(NULL, e->toString().__WCStr(), NULL, MB_OK);
 #endif
 		return -1;

diff --git a/Tools/khamake b/Tools/khamake
+1 −1		include/hx/LessThanEq.h
+2 −2		include/hx/Object.h
+2 −2		include/hx/Tls.h
+1 −1		include/hxString.h
+1 −1		project/thirdparty/mbedtls-2.28.2/include/mbedtls/bn_mul.h
+1 −1		project/thirdparty/mbedtls-2.28.2/include/mbedtls/config.h
+1 −1		project/thirdparty/mbedtls-2.28.2/include/mbedtls/threading.h
+5 −5		project/thirdparty/mbedtls-2.28.2/library/threading.c
+4 −4		project/thirdparty/mbedtls-2.28.2/library/timing.c
+3 −3		project/thirdparty/mbedtls-2.28.2/library/x509_crt.c
+3 −3		src/Array.cpp
+4 −4		src/Math.cpp
+5 −5		src/hx/Date.cpp
+1 −1		src/hx/Object.cpp
+4 −4		src/hx/StdLibs.cpp
+1 −1		src/hx/Thread.cpp
+2 −2		src/hx/gc/GcCommon.cpp
+1 −1		src/hx/gc/GcRegCapture.h
+2 −2		src/hx/gc/Immix.cpp
+2 −2		src/hx/libs/ssl/SSL.cpp
+11 −11		src/hx/libs/std/Process.cpp
+5 −5		src/hx/libs/std/Random.cpp
+1 −1		src/hx/libs/std/Socket.cpp
+26 −26		src/hx/libs/std/Sys.cpp