From d7b0fa5e2932e1bb8727103f05897c6163aadc0a Mon Sep 17 00:00:00 2001 From: Kr328 <39107975+Kr328@users.noreply.github.com> Date: Sat, 13 Jun 2020 00:25:18 +0800 Subject: [PATCH] add windows build compat --- core/clash.gradle.kts | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/core/clash.gradle.kts b/core/clash.gradle.kts index e90573c..c168397 100644 --- a/core/clash.gradle.kts +++ b/core/clash.gradle.kts @@ -13,6 +13,14 @@ val golangSource = file("src/main/golang") val golangOutput = buildDir.resolve("outputs/golang") val nativeAbis = listOf("armeabi-v7a", "arm64-v8a", "x86", "x86_64") +val String.exe: String + get() { + return if ( Os.isFamily(Os.FAMILY_WINDOWS) ) + "$this.exe" + else + this + } + fun generateGolangBuildEnvironment(abi: String): Map { val properties = Properties().apply { load(FileInputStream(rootProject.file("local.properties"))) @@ -88,9 +96,9 @@ fun generateGolangBuildEnvironment(abi: String): Map { } return mapOf( - "CC" to compilerBase.resolve(cCompiler).absolutePath, - "CXX" to compilerBase.resolve(cppCompiler).absolutePath, - "LD" to compilerBase.resolve(linker).absolutePath, + "CC" to compilerBase.resolve(cCompiler.exe).absolutePath, + "CXX" to compilerBase.resolve(cppCompiler.exe).absolutePath, + "LD" to compilerBase.resolve(linker.exe).absolutePath, "GOOS" to "android", "GOARCH" to golangArch, "CGO_ENABLED" to "1",