This commit is contained in:
Gorochu
2026-05-30 22:14:11 -07:00
parent a428fb684d
commit c467b54dd0
3 changed files with 12 additions and 4 deletions

Binary file not shown.

View File

@ -242,6 +242,7 @@ function checkKorePlatform(platform) {
|| platform === 'windowsapp' || platform === 'windowsapp'
|| platform === 'ios' || platform === 'ios'
|| platform === 'osx' || platform === 'osx'
|| platform === 'macos'
|| platform === 'android' || platform === 'android'
|| platform === 'linux' || platform === 'linux'
|| platform === 'emscripten' || platform === 'emscripten'
@ -256,7 +257,9 @@ function checkKorePlatform(platform) {
} }
function koreplatform(platform) { function koreplatform(platform) {
if (platform.endsWith('-hl')) 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 else
return platform; 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; lastShaderCompiler = shaderCompiler;
try { try {
if (baseTarget !== Platform_1.Platform.Java && baseTarget !== Platform_1.Platform.WPF) { if (baseTarget !== Platform_1.Platform.Java && baseTarget !== Platform_1.Platform.WPF) {

View File

@ -273,6 +273,7 @@ function checkKorePlatform(platform: string) {
|| platform === 'windowsapp' || platform === 'windowsapp'
|| platform === 'ios' || platform === 'ios'
|| platform === 'osx' || platform === 'osx'
|| platform === 'macos'
|| platform === 'android' || platform === 'android'
|| platform === 'linux' || platform === 'linux'
|| platform === 'emscripten' || platform === 'emscripten'
@ -287,8 +288,12 @@ function checkKorePlatform(platform: string) {
} }
function koreplatform(platform: string) { function koreplatform(platform: string) {
if (platform.endsWith('-hl')) return platform.substr(0, platform.length - '-hl'.length); if (platform.endsWith('-hl'))
else return platform; 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; let kore = false;