From b75f22b7bda11eeece74aeab74020af4b599b97a Mon Sep 17 00:00:00 2001 From: Sung Ho Yoon <55358516+syoon2@users.noreply.github.com> Date: Fri, 4 Aug 2023 19:19:06 +0900 Subject: [PATCH] Add windows-aarch64 build configuration --- flatlaf-natives/flatlaf-natives-windows/build.gradle.kts | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/flatlaf-natives/flatlaf-natives-windows/build.gradle.kts b/flatlaf-natives/flatlaf-natives-windows/build.gradle.kts index 41942b9d..262ee477 100644 --- a/flatlaf-natives/flatlaf-natives-windows/build.gradle.kts +++ b/flatlaf-natives/flatlaf-natives-windows/build.gradle.kts @@ -29,7 +29,7 @@ flatlafJniHeaders { } library { - targetMachines.set( listOf( machines.windows.x86, machines.windows.x86_64 ) ) + targetMachines.set( listOf( machines.windows.x86, machines.windows.x86_64, machines.windows.architecture("aarch64") ) ) } var javaHome = System.getProperty( "java.home" ) @@ -42,7 +42,7 @@ tasks { description = "Builds natives" if( org.gradle.internal.os.OperatingSystem.current().isWindows() ) - dependsOn( "linkReleaseX86", "linkReleaseX86-64" ) + dependsOn( "linkReleaseX86", "linkReleaseX86-64", "linkReleaseAarch64" ) } withType().configureEach { @@ -69,8 +69,9 @@ tasks { onlyIf { name.contains( "Release" ) } val nativesDir = project( ":flatlaf-core" ).projectDir.resolve( "src/main/resources/com/formdev/flatlaf/natives" ) + val isX86 = name.contains("X86") val is64Bit = name.contains( "64" ) - val libraryName = if( is64Bit ) "flatlaf-windows-x86_64.dll" else "flatlaf-windows-x86.dll" + val libraryName = if( is64Bit && isX86 ) "flatlaf-windows-x86_64.dll" else if( isX86 ) "flatlaf-windows-x86.dll" else "flatlaf-windows-aarch64.dll" linkerArgs.addAll( toolChain.map { when( it ) {