diff --git a/Kha/Backends/Kore-HL/kfile.js b/Kha/Backends/Kore-HL/kfile.js index 40fa7fda..1d2ff382 100644 --- a/Kha/Backends/Kore-HL/kfile.js +++ b/Kha/Backends/Kore-HL/kfile.js @@ -5,7 +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('KINC_DEBUGDIR="osx-hl"'); +if (platform == Platform.OSX) { + project.addDefine('KINC_DEBUGDIR="macos-hl"'); + 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('KINC_MULTITHREADED_AUDIO'); diff --git a/leenkx/blender/lnx/make.py b/leenkx/blender/lnx/make.py index 6a7d6c61..6829be82 100644 --- a/leenkx/blender/lnx/make.py +++ b/leenkx/blender/lnx/make.py @@ -531,7 +531,7 @@ def build(target, is_play=False, is_publish=False, is_export=False): target = 'windows-hl' elif current_os == 'linux': target = 'linux-hl' - elif current_os == 'macos': + elif current_os == 'mac' or current_os == 'macos': target = 'macos-hl' else: log.error(f"Unsupported OS '{current_os}' for Hashlink runtime.") diff --git a/lib/aura/khafile.js b/lib/aura/khafile.js index 8a42d839..994861a7 100644 --- a/lib/aura/khafile.js +++ b/lib/aura/khafile.js @@ -3,8 +3,8 @@ const fs = require("fs"); const optickPathKey = "AURA_OPTICK_PATH"; // See https://github.com/Kode/Kha/wiki/Hashlink -const targetsHL = ["windows-hl", "linux-hl", "osx-hl", "android-hl", "ios-hl"]; -const targetsCPP = ["windows", "linux", "osx"]; +const targetsHL = ["windows-hl", "linux-hl", "macos-hl", "osx-hl", "android-hl", "ios-hl"]; +const targetsCPP = ["windows", "linux", "macos", "osx"]; const targetsHTML5 = ["html5", "debug-html5"]; function addBackends(project) { @@ -13,7 +13,6 @@ function addBackends(project) { const isHL = targetsHL.indexOf(Project.platform) >= 0; if (isHL) { - project.addLibrary("hl"); project.addDefine("AURA_BACKEND_HL"); console.log("[Aura] Using HL/C backend"); }