Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update adxetools.gradle

This commit is contained in:
deal 2022-01-28 19:31:42 +08:00 committed by GitHub
parent f0fa7780d7
commit 2bc22e1bd1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
core/platform/android/libcocos2dx/adxetools.gradle
View File

@ -161,6 +161,7 @@ class adxetools {
def verList = ["3.10.2.4988404", "3.18.1"]
for(foundVer in verList){
cmakeBinDir = sdkRoot + File.separator + "cmake" + File.separator + foundVer + File.separator + "bin"
if(new File(cmakeBinDir).isDirectory()) {
cmakeBinDirs.add(cmakeBinDir)
}
@ -182,13 +183,13 @@ class adxetools {
}
if(foundCMakeVer == null) {
println("No suitable cmake found, required $cmakeVer")
println("No suitable cmake found, required $cmakeVer, the gradle will install it")
foundCMakeVer = cmakeVer
}
return foundCMakeVer
}
static boolean isWindows() {
return System.getProperty("os.name").toLowerCase().contains("windows");
}
@ -234,7 +235,7 @@ class adxetools {
static String findCMakeFromBinDir(String cmakeVer, String cmakeBin, boolean allowNewerCMake) {
def foundCMakeVer = null
String ninjaName = isWindows() ? "ninja.exe" : "ninja"
String ninjaPath = cmakeBin + File.separator + ninjaName
if(!new File(ninjaPath).isFile()) {
@ -256,7 +257,7 @@ class adxetools {
try {
def programPath = cmakeBin + File.separator + getCMakeProgramName()
Process proc = Runtime.getRuntime().exec("\"$programPath\" --version")
Process proc = isWindows() ? Runtime.getRuntime().exec("\"$programPath\" --version") : Runtime.getRuntime().exec("$programPath --version")
proc.waitFor()
int exitVal = proc.exitValue()
if (exitVal == 0) {
@ -287,6 +288,7 @@ class adxetools {
}
}
catch(Exception ex) {
println("Execute cmake failed: " + ex.message)
}
return foundCMakeVer