download_libs [2.8.3 ~ 2.8.4] VS arm64 also pulls 64

Author: danoli3

scripts/dev/download_libs.sh

@@ -14,7 +14,7 @@ LEGACY=0
 SILENT_ARGS=""
 NO_SSL=""
 BLEEDING_EDGE=0
-DL_VERSION=2.8.3
+DL_VERSION=2.8.4
 GCC_VERSION=0
 TAG=""
 REPO="latest"
@@ -33,7 +33,8 @@ cat << EOF
     -p, --platform PLATFORM     Platorm among: android, emscritpen, ios, linux, linux64, linuxarmv6l, linuxarmv7l, msys2, osx, tvos, vs
                                 If not specified tries to autodetect the platform.
     -a, --arch ARCH             Architecture:
-                                    vs: 64
+                                    vs: 64, arm64, arm64ec, all
+                                      arm64 also pulls 64 (and arm64ec) for now
                                     msys2: 64
                                     android: armv7, arm64, and x86 (if not specified will download all)
                                     linux: 64, arm64, aarch64, armv6l or armv7l
@@ -582,9 +583,11 @@ elif [ "$PLATFORM" == "vs" ]; then
                   openFrameworksLibs_${VER}_${VS_PLATFORM}_arm64ec_1.zip \
                   openFrameworksLibs_${VER}_${VS_PLATFORM}_arm64ec_2.zip"
         elif [[ "$ARCH" == "arm64" ]]; then
-            # Windows on ARM: native arm64 + arm64ec (x64-compat) for Win11 ARM
-            echo " VS packages: arm64 + arm64ec (Windows on ARM host)"
-            PKGS="openFrameworksLibs_${VER}_${VS_PLATFORM}_arm64_1.zip \
+            # Windows on ARM: native arm64 + arm64ec + x64 (x64-compat / VS x64 tools)
+            echo " VS packages: 64 + arm64 + arm64ec (arm64 also downloads 64 for now)"
+            PKGS="openFrameworksLibs_${VER}_${VS_PLATFORM}_64_1.zip \
+                  openFrameworksLibs_${VER}_${VS_PLATFORM}_64_2.zip \
+                  openFrameworksLibs_${VER}_${VS_PLATFORM}_arm64_1.zip \
                   openFrameworksLibs_${VER}_${VS_PLATFORM}_arm64_2.zip \
                   openFrameworksLibs_${VER}_${VS_PLATFORM}_arm64ec_1.zip \
                   openFrameworksLibs_${VER}_${VS_PLATFORM}_arm64ec_2.zip"
@@ -602,6 +605,16 @@ elif [ "$PLATFORM" == "vs" ]; then
                   openFrameworksLibs_${VER}_${PLATFORM}_64_2.zip \
                   openFrameworksLibs_${VER}_${PLATFORM}_64_3.zip \
                   openFrameworksLibs_${VER}_${PLATFORM}_64_4.zip"
+        elif [[ "$ARCH" == "arm64" ]]; then
+            echo " VS packages: 64 + arm64 (arm64 also downloads 64 for now)"
+            PKGS="openFrameworksLibs_${VER}_${PLATFORM}_64_1.zip \
+                  openFrameworksLibs_${VER}_${PLATFORM}_64_2.zip \
+                  openFrameworksLibs_${VER}_${PLATFORM}_64_3.zip \
+                  openFrameworksLibs_${VER}_${PLATFORM}_64_4.zip \
+                  openFrameworksLibs_${VER}_${PLATFORM}_arm64_1.zip \
+                  openFrameworksLibs_${VER}_${PLATFORM}_arm64_2.zip \
+                  openFrameworksLibs_${VER}_${PLATFORM}_arm64_3.zip \
+                  openFrameworksLibs_${VER}_${PLATFORM}_arm64_4.zip"
         else
             PKGS="openFrameworksLibs_${VER}_${PLATFORM}_${ARCH}_1.zip \
                   openFrameworksLibs_${VER}_${PLATFORM}_${ARCH}_2.zip \

scripts/dev/lib_sources.sh

@@ -126,12 +126,13 @@ downloadApothecaryLibs(){
 	local platformDir="$1"
 	local scriptsRoot="${OF_CORE_SCRIPT_DIR:-$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)}"
 	local script="${scriptsRoot}/${platformDir}/download_libs.sh"
+	local arch="${LIB_ARCH:-}"
 	if [[ ! -f "$script" ]]; then
 		echo "download script missing: $script" >&2
 		return 1
 	fi
 	[[ -x "$script" ]] || chmod +x "$script" 2>/dev/null || true
-	local -a args=()
+	local -a args=() extra=()
 	# -b bleeding-edge → "latest" packages; -t TAG for a specific release tag
 	if [[ -n "$LIB_TAG" && "$LIB_TAG" != "latest" && "$LIB_TAG" != "nightly" ]]; then
 		args+=( -t "$LIB_TAG" )
@@ -144,6 +145,23 @@ downloadApothecaryLibs(){
 		full|full-clean)      args+=( --full-clean ) ;;
 		platform|*)           ;; # default platform-scoped clean in download_libs.sh
 	esac
+	# Arch: LIB_ARCH, else OF_ARCH for vs (linux/msys2 wrappers pick host arch).
+	# Extra flags via DOWNLOAD_LIBS_ARGS.
+	if [[ -z "$arch" && -n "${OF_ARCH:-}" && "$platformDir" == "vs" ]]; then
+		arch="$OF_ARCH"
+	fi
+	if [[ -n "$arch" ]]; then
+		args+=( -a "$arch" )
+	fi
+	if [[ "$platformDir" == "vs" && "${OF_VS_2026:-}" == "1" ]]; then
+		args+=( -vs )
+	fi
+	if [[ -n "${DOWNLOAD_LIBS_ARGS:-}" ]]; then
+		# shellcheck disable=SC2206
+		extra=( $DOWNLOAD_LIBS_ARGS )
+		args+=( "${extra[@]}" )
+	fi
+	echo " download_libs ${platformDir}${arch:+ -a ${arch}} ${args[*]}"
 	"$script" "${args[@]}"
 }
 

scripts/of.sh

@@ -963,7 +963,10 @@ printHelp(){
     LIB_SOURCE=apothecary|oflibs|archive
     LIB_TAG=latest|v12.1.0|v0.11.2
     LIB_LIBS=core|all|"glfw glm"
+    LIB_ARCH=64|arm64|arm64ec|all   passed as -a to download_libs (vs/linux/msys2)
     LIB_CLEAN_MODE=platform|merge|full   # default platform: only lib/<plat>
+    DOWNLOAD_LIBS_ARGS="-vs --full-clean"  extra flags to download_libs.sh
+    OF_VS_2026=1              VS 2026 package names (_vs_2026_)
     OF_LINUX_DISTRO=ubuntu    Force linux distro scripts
     OF_APO_VS_VER=18          apothecary VS toolchain (18=VS2026, 17=VS2022, 16=VS2019)
     OF_JOBS=8                 Parallel build jobs
@@ -973,6 +976,8 @@ printHelp(){
     ${prog}
     ${prog} status
     ${prog} update libs
+    ${prog} update libs vs arm64
+    LIB_ARCH=arm64 ${prog} update libs vs
     LIB_SOURCE=oflibs LIB_LIBS=core ${prog} update libs
     ${prog} build core Debug
     ${prog} build project apps/myApps/mySketch
@@ -1367,6 +1372,11 @@ cmdUpdatePG(){
 cmdUpdate(){
 	local subcmd="$1"
 	local platformDir="${2:-$OF_PLATFORM}"
+	local arch="${3:-}"
+	if [[ -n "$arch" ]]; then
+		export LIB_ARCH="$arch"
+		export OF_ARCH="$arch"
+	fi
 	case "$subcmd" in
 		""|libs)
 			# interactive: always prompt source; then state-aware download
@@ -2622,7 +2632,7 @@ runCommand(){
 		menu) cmdMenu ;;
 		status|check|doctor|installed|libs-status) cmdStatus ;;
 		setup|install) cmdSetup "${subcmd:-$OF_PLATFORM}" ;;
-		update) cmdUpdate "$subcmd" "$subcmd2" ;;
+		update) cmdUpdate "$subcmd" "$subcmd2" "$subcmd3" ;;
 		build)
 			shift
 			cmdBuild "$@"