From 13f31f23b39133c5b3dfe585f11891be704dc96f Mon Sep 17 00:00:00 2001 From: Elie Zananiri Date: Mon, 28 Apr 2025 08:06:41 -0400 Subject: [PATCH 1/3] Use $NINJA_PATH executable for Windows support --- libs/openFrameworksCompiled/project/android/cmake.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/openFrameworksCompiled/project/android/cmake.sh b/libs/openFrameworksCompiled/project/android/cmake.sh index d5db289b62e..0ee30380e0c 100755 --- a/libs/openFrameworksCompiled/project/android/cmake.sh +++ b/libs/openFrameworksCompiled/project/android/cmake.sh @@ -116,7 +116,7 @@ for ARCHE in $ARCH; do -DCONFIGURATION_BUILD_DIR="$OUTPUT_DIR" \ "$CMAKELISTS_DIR" - ninja -j "$NUM_CORES" + $NINJA_PATH -j "$NUM_CORES" cd "$SCRIPT_DIR" done From 6d4beccb066e431077e959753772826e079632d7 Mon Sep 17 00:00:00 2001 From: Elie Zananiri Date: Mon, 28 Apr 2025 08:11:02 -0400 Subject: [PATCH 2/3] Fix typo calling ofRoot() function --- scripts/templates/android/ofApp/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/templates/android/ofApp/build.gradle b/scripts/templates/android/ofApp/build.gradle index 49249d61b92..80c096622e2 100644 --- a/scripts/templates/android/ofApp/build.gradle +++ b/scripts/templates/android/ofApp/build.gradle @@ -29,7 +29,7 @@ def addonFile = new File(projectRoot, "addons.make") def addonPaths = [] if (addonFile.exists()) { addonFile.eachLine { line -> - def addonPath = ofRoot + "addons/" + line + def addonPath = ofRoot() + "addons/" + line if (new File(addonPath).exists()) { addonPaths.add(addonPath) } From 6afdf4bece89d6e3a0db4255a6fcf0a9008cefb9 Mon Sep 17 00:00:00 2001 From: Elie Zananiri Date: Mon, 28 Apr 2025 08:16:15 -0400 Subject: [PATCH 3/3] Use gitBashPath executable for Windows support --- scripts/templates/android/ofApp/build.gradle | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/scripts/templates/android/ofApp/build.gradle b/scripts/templates/android/ofApp/build.gradle index 80c096622e2..46386ce67e1 100644 --- a/scripts/templates/android/ofApp/build.gradle +++ b/scripts/templates/android/ofApp/build.gradle @@ -237,15 +237,9 @@ task checkAndBuildOF { knownABIs.each { arch -> if (!doesOFSoFileExist(arch)) { println "openFrameworks library missing for $arch! Running CMake build..." - if(isWindows) { - exec { - commandLine '"C:\\Program Files\\Git\\bin\\bash.exe"' - args cmakeScriptPath - } - } else { - exec { - commandLine 'bash', cmakeScriptPath - } + exec { + commandLine gitBashPath + args cmakeScriptPath } } else { println "openFrameworks library exists for $arch"