Skip to content

Commit

Permalink
Update llvm setup
Browse files Browse the repository at this point in the history
- remove llvm setup from gh action yml config, since 1kiss will setup it
- update 1kiss.ps1 llvm min requirement to 17.0.6 for msvc14.40 support
- Remove llvm version config from 1k/manifest.ps1 since 1kiss.ps1 already set properly for msvc14.40 support
  • Loading branch information
halx99 committed Jun 9, 2024
1 parent e56d14c commit fc710d6
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 9 deletions.
6 changes: 0 additions & 6 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,12 +56,6 @@ jobs:
- uses: actions/checkout@v4
with:
submodules: 'recursive'

- name: Install LLVM and Clang
uses: KyleMayes/install-llvm-action@v1
with:
version: "16.0"

- name: Build
shell: pwsh
run: .\tools\cmdline\axmol -p win32 -a 'x64' -cc clang -sdk $env:WINSDK_VER
Expand Down
6 changes: 4 additions & 2 deletions 1k/1kiss.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -197,8 +197,10 @@ $manifest = @{
msvc = '14.39+'; # cl.exe @link.exe 14.39 VS2022 17.9.x
ndk = 'r23c';
xcode = '13.0.0+'; # range
# _EMIT_STL_ERROR(STL1000, "Unexpected compiler version, expected Clang 16.0.0 or newer.");
llvm = '16.0.6+'; # clang-cl msvc14.37 require 16.0.0+
# _EMIT_STL_ERROR(STL1000, "Unexpected compiler version, expected Clang xx.x.x or newer.");
# clang-cl msvc14.37 require 16.0.0+
# clang-cl msvc14.40 require 17.0.0+
llvm = '17.0.6+';
gcc = '9.0.0+';
cmake = '3.23.0+';
ninja = '1.10.0+';
Expand Down
1 change: 0 additions & 1 deletion 1k/manifest.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ if ($Global:is_axmol_app -or $Global:is_axmol_engine) {
$manifest['glslcc'] = '1.9.5+'
$manifest['cmake'] = '3.29.3+'
$manifest['emsdk'] = '3.1.60+'
$manifest['llvm'] = '17.0.6+'
$manifest['jdk'] = '17.0.10+'
}

Expand Down

0 comments on commit fc710d6

Please sign in to comment.