Update prebuilt tool glslcc to 1.9.5

- macos-arm64 support and built for macos-10.15+

Author: halx99

.github/workflows/publish.yml

@@ -66,7 +66,7 @@ jobs:
 
     - name: Publish to github release page
       if: ${{ steps.make_pkg.outputs.release_tag != '' }}
-      uses: softprops/action-gh-release@v1
+      uses: softprops/action-gh-release@v2
       with:
         tag_name: ${{ steps.make_pkg.outputs.release_tag }}
         name: ${{ steps.make_pkg.outputs.release_tag }}

1k/1kiss.ps1

@@ -26,7 +26,7 @@
 # SOFTWARE.
 #
 #
-# The 1k/build.ps1, the core script of project 1kiss(1k)
+# The 1k/1kiss.ps1, the core script of project 1kiss(1k)
 # options
 #  -p: build target platform: win32,winrt(winuwp),linux,android,osx(mac),ios,tvos,watchos,wasm
 #      for android: will search ndk in sdk_root which is specified by env:ANDROID_HOME first,
@@ -86,7 +86,7 @@ else {
         $HOST_OS = $HOST_MAC
     }
     else {
-        throw "Unsupported host OS to run 1k/build.ps1"
+        throw "Unsupported host OS to run 1k/1kiss.ps1"
     }
 }
 
@@ -441,12 +441,14 @@ if ($1k.isfile($manifest_file)) {
 # choose mirror for 1kiss/devtools
 $sentry_file = Join-Path $myRoot '.gitee'
 $mirror = if ($1k.isfile($sentry_file)) { 'gitee' } else { 'github' }
-$devtools_url_base = @{'github' = 'https://github.com/'; 'gitee' = 'https://gitee.com/' }[$mirror]
+$mirror_url_base = @{'github' = 'https://github.com/'; 'gitee' = 'https://gitee.com/' }[$mirror]
+$devtools_url_base = $mirror_url_base
 $mirror_conf_file = $1k.realpath("$myRoot/../manifest.json")
-$mirror_conf = $null
+$mirror_current = $null
 if ($1k.isfile($mirror_conf_file)) {
     $mirror_conf = ConvertFrom-Json (Get-Content $mirror_conf_file -raw)
-    $devtools_url_base += $mirror_conf.mirrors.$mirror.'1kdist'
+    $mirror_current = $mirror_conf.mirrors.$mirror
+    $devtools_url_base += $mirror_current.'1kdist'
     $devtools_url_base += '/devtools'
 }
 
@@ -723,12 +725,21 @@ function setup_glslcc() {
         return $glslcc_prog
     }
 
-    $suffix = $('win64.zip', 'linux.tar.gz', 'osx.tar.gz').Get($HOST_OS)
+    $suffix = $('win64.zip', 'linux.tar.gz', 'osx{0}.tar.gz').Get($HOST_OS)
+    if($IsMacOS) {
+        if([System.VersionEx]$glslcc_ver -ge [System.VersionEx]'1.9.4.1') {
+            $suffix = $suffix -f "-$HOST_CPU"
+        } else {
+            $suffix = $suffix -f ''
+        }
+    }
+
     $1k.rmdirs($glslcc_bin)
     $glslcc_pkg = Join-Path $external_prefix "glslcc-$suffix"
     $1k.del($glslcc_pkg)
 
-    $glscc_url = devtool_url glslcc-$glslcc_ver-$suffix
+    $glscc_base_url = $mirror_current.glslcc
+    $glscc_url = "$mirror_url_base$glscc_base_url/v$glslcc_ver/glslcc-$glslcc_ver-$suffix"
 
     download_and_expand $glscc_url "$glslcc_pkg" $glslcc_bin
 

1k/manifest.ps1

@@ -10,7 +10,7 @@
 # add or overwrite tool version like follow
 if ($Global:is_axmol_app -or $Global:is_axmol_engine) {
     $manifest['nuget'] = '5.5.1' # since 5.6.0, require .net 4.0
-    $manifest['glslcc'] = '1.9.4+'
+    $manifest['glslcc'] = '1.9.5+'
     if ($Global:is_darwin_family) {
         # 3.29.0: Fix linking duplicated libraries warnings
         $manifest['cmake'] = '3.29.0+'

CHANGELOG.md

@@ -68,6 +68,7 @@
 
 ### Improvements
 
+- Update prebuilt tool `glslcc` to 1.9.5, macos-arm64 support and built for macos-10.15+
 - Improve MediaPlayer: handle video rotation properly
 - Disable c++20 char8_t
 - Improve build system, set rpath properly for platforms: linux, apple

manifest.json

@@ -16,7 +16,8 @@
       "lz4": "lz4/lz4.git",
       "yaml-cpp": "jbeder/yaml-cpp.git",
       "box2d-optimized": "mtsamis/box2d-optimized.git",
-      "sample-assets": "axmolengine/axmol-sample-assets.git"
+      "sample-assets": "axmolengine/axmol-sample-assets.git",
+      "glslcc": "axmolengine/glslcc/releases/download"
     },
     "gitee":
     {
@@ -26,7 +27,8 @@
       "lz4": "simdsoft/lz4.git",
       "yaml-cpp": "mirrors/yaml-cpp.git",
       "box2d-optimized": "simdsoft/box2d-optimized.git",
-      "sample-assets": "simdsoft/axmol-sample-assets.git"
-    }    
+      "sample-assets": "simdsoft/axmol-sample-assets.git",
+      "glslcc": "simdsoft/glslcc/releases/download"
+    }
   }
 }