diff --git a/Kha/Kore/Tools/macos_arm64/kmake b/Kha/Kore/Tools/macos_arm64/kmake index 6b0c55a8..7af6a2a4 100755 Binary files a/Kha/Kore/Tools/macos_arm64/kmake and b/Kha/Kore/Tools/macos_arm64/kmake differ diff --git a/Kha/Tools/khamake/out/main.js b/Kha/Tools/khamake/out/main.js index f9e0a373..b4ff8262 100644 --- a/Kha/Tools/khamake/out/main.js +++ b/Kha/Tools/khamake/out/main.js @@ -242,6 +242,7 @@ function checkKorePlatform(platform) { || platform === 'windowsapp' || platform === 'ios' || platform === 'osx' + || platform === 'macos' || platform === 'android' || platform === 'linux' || platform === 'emscripten' @@ -256,7 +257,9 @@ function checkKorePlatform(platform) { } function koreplatform(platform) { if (platform.endsWith('-hl')) - return platform.substr(0, platform.length - '-hl'.length); + platform = platform.substr(0, platform.length - '-hl'.length); + if (platform === 'macos') + return 'osx'; // krafix only recognizes osx, not macos else return platform; } @@ -413,7 +416,7 @@ async function exportKhaProject(options) { } } } - let shaderCompiler = new ShaderCompiler_1.ShaderCompiler(exporter, baseTarget, options.krafix, shaderDir, temp, buildDir, options, project.shaderMatchers); + let shaderCompiler = new ShaderCompiler_1.ShaderCompiler(exporter, options.target, options.krafix, shaderDir, temp, buildDir, options, project.shaderMatchers); lastShaderCompiler = shaderCompiler; try { if (baseTarget !== Platform_1.Platform.Java && baseTarget !== Platform_1.Platform.WPF) { diff --git a/Kha/Tools/khamake/src/main.ts b/Kha/Tools/khamake/src/main.ts index d8da2c0a..eb755b0d 100644 --- a/Kha/Tools/khamake/src/main.ts +++ b/Kha/Tools/khamake/src/main.ts @@ -273,6 +273,7 @@ function checkKorePlatform(platform: string) { || platform === 'windowsapp' || platform === 'ios' || platform === 'osx' + || platform === 'macos' || platform === 'android' || platform === 'linux' || platform === 'emscripten' @@ -287,8 +288,12 @@ function checkKorePlatform(platform: string) { } function koreplatform(platform: string) { - if (platform.endsWith('-hl')) return platform.substr(0, platform.length - '-hl'.length); - else return platform; + if (platform.endsWith('-hl')) + platform = platform.substr(0, platform.length - '-hl'.length); + if (platform === 'macos') + return 'osx'; // krafix only recognizes osx, not macos + else + return platform; } let kore = false;