Fix ci

axmolengine · Feb 1, 2024 · e278e45 · e278e45
1 parent 5afc17c
commit e278e45
Show file tree

Hide file tree

Showing 26 changed files with 42 additions and 46 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -14,7 +14,7 @@ jobs:
   win32:
     runs-on: windows-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         submodules: 'recursive'
     - uses: ilammy/[email protected]
@@ -27,7 +27,7 @@ jobs:
   win32-dll:
         runs-on: windows-latest
         steps:
-        - uses: actions/checkout@v3
+        - uses: actions/checkout@v4
           with:
             submodules: 'recursive'
         - uses: ilammy/[email protected]
@@ -41,7 +41,7 @@ jobs:
         # build uwp debug avoid github CI fail with memory issue
         runs-on: windows-latest
         steps:
-        - uses: actions/checkout@v3
+        - uses: actions/checkout@v4
           with:
             submodules: 'recursive'
         - uses: ilammy/[email protected]
@@ -63,7 +63,7 @@ jobs:
           # Test winsdk < 10.0.22000.0 (missing C11 standard stdalign.h), axmol will auto fallback to C99 for resolving compiling issue.
           WINSDK_VER: '10.0.19041.0' 
         steps:
-        - uses: actions/checkout@v3
+        - uses: actions/checkout@v4
           with:
             submodules: 'recursive'
 
@@ -78,7 +78,7 @@ jobs:
   linux:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         submodules: 'recursive'
 
@@ -100,7 +100,7 @@ jobs:
     env:
       BUILD_ARCH: ${{ matrix.arch }}
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         submodules: 'recursive'
     - uses: maxim-lobanov/setup-xcode@v1
@@ -121,7 +121,7 @@ jobs:
     env:
       BUILD_ARCH: ${{ matrix.arch }}
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         submodules: 'recursive'
     - uses: actions/setup-java@v3
@@ -149,7 +149,7 @@ jobs:
     env:
       TARGET_OS: ${{ matrix.target_os }}
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         submodules: 'recursive'
     - uses: maxim-lobanov/setup-xcode@v1

diff --git a/.github/workflows/clang-format.yml b/.github/workflows/clang-format.yml
@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Run clang-format lint
       uses: DoozyX/[email protected]

diff --git a/.github/workflows/genbindings.yml b/.github/workflows/genbindings.yml
@@ -15,7 +15,7 @@ jobs:
     runs-on: windows-latest
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         submodules: 'recursive'
 
@@ -30,17 +30,15 @@ jobs:
     - name: Create pull request
       if: ${{ env.BINDING_NO_CHANGES != 'true' }}
       id: cpr
-      uses: peter-evans/create-pull-request@v4
+      uses: peter-evans/create-pull-request@v6
       with:
         token: ${{ secrets.AX_BOT_TOKEN }}
         push-to-fork: axmol-bot/axmol
-        commit-message: Update luabindings for commit ${{ env.LAST_COMMIT_HASH }}
-        committer: 'GitHub Actions <41898282+github-actions[bot]@users.noreply.github.com>'
-        author: 'axmol-bot <[email protected]>'
+        commit-message: Committing luabindings for commit ${{ env.LAST_COMMIT_HASH }}
         signoff: false
         branch: luabindings_for_${{ env.LAST_COMMIT_HASH }}
         delete-branch: true
-        title: 'Update luabindings for commit ${{ env.LAST_COMMIT_HASH }}'
+        title: 'Committing luabindings for commit ${{ env.LAST_COMMIT_HASH }}'
         body: |
           RT
           - Auto-generated by [create-pull-request][1]

diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -17,7 +17,7 @@ jobs:
   build-win32:
     runs-on: windows-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: 'recursive'
       - uses: ilammy/[email protected]
@@ -31,7 +31,7 @@ jobs:
   build-winuwp:
     runs-on: windows-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: 'recursive'
       - uses: ilammy/[email protected]
@@ -46,7 +46,7 @@ jobs:
   build-linux:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: 'recursive'
       - name: Install deps
@@ -62,7 +62,7 @@ jobs:
   build-android:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: 'recursive'
       - name: Build
@@ -80,7 +80,7 @@ jobs:
   build-osx:
     runs-on: macos-12
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: 'recursive'
       - name: Build
@@ -94,7 +94,7 @@ jobs:
       GH_OS_NAME: osx
       BUILD_TARGET: ios
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: 'recursive'
 
@@ -109,7 +109,7 @@ jobs:
       GH_OS_NAME: osx
       BUILD_TARGET: tvos
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: 'recursive'
 

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -16,7 +16,7 @@ jobs:
     runs-on: windows-latest
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         submodules: 'recursive'
 

diff --git a/core/platform/android/CMakeLists.txt b/core/platform/android/CMakeLists.txt
@@ -22,6 +22,7 @@ target_include_directories(${target_name}
   PRIVATE ..
   PRIVATE ../..
   PRIVATE ../../../thirdparty
+  PRIVATE ../../../thirdparty/yasio
   PRIVATE ../../../thirdparty/glad/include
   PRIVATE ../../../thirdparty/robin-map/include
   PRIVATE ../../../thirdparty/jni.hpp/include

diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt
@@ -479,9 +479,6 @@ endif()
 
 # yasio
 ax_add_3rd(yasio)
-if(ANDROID) # stupid, public include not enough android
-    target_include_directories(thirdparty INTERFACE yasio)
-endif()
 
 # simdjson
 ax_add_3rd(simdjson)

diff --git a/tools/bindings-generator/libclang/VERSION.txt b/tools/bindings-generator/libclang/VERSION.txt
@@ -1,4 +1,4 @@
 libclang in LLVM 15.0.7
 
 Please download from: 
-https://github.com/axmolengine/buildware/releases/tag/llvmorg-15.0.7
+https://github.com/simdsoft/1kiss/releases/tag/llvmorg-15.0.7
diff --git a/tools/ci/genbindings.ps1 b/tools/ci/genbindings.ps1
@@ -23,12 +23,12 @@ echo "after setup py_ver: $(python -V), PATH=$env:PATH"
 
 echo "$ndk_root=$ndk_root"
 
-$prefix = Join-Path $AX_ROOT 'tmp'
+$prefix = Join-Path $AX_ROOT 'cache'
 $llvm_out = Join-Path $prefix "llvmorg-$llvm_ver.zip"
 
 ## download win64 libclang.dll 
 $b1k.mkdirs($prefix)
-download_and_expand -url "https://github.com/axmolengine/buildware/releases/download/llvmorg-$llvm_ver/llvmorg-$llvm_ver.zip" -out "$llvm_out" -dest $prefix
+download_and_expand -url "https://github.com/simdsoft/1kiss/releases/download/llvmorg-$llvm_ver/llvmorg-$llvm_ver.zip" -out "$llvm_out" -dest $prefix
 Copy-Item "$prefix/llvmorg-$llvm_ver/llvm/prebuilt/windows/x64/libclang.dll" -Destination "$AX_ROOT/tools/bindings-generator/libclang"
 
 ## ensure $env:AX_ROOT/core/axmolver.h exists

diff --git a/tools/tolua/README.md b/tools/tolua/README.md
@@ -3,7 +3,7 @@ How to Use bindings-generator
 
 Prerequisites
 ------------
-1. Download libclang from https://github.com/axmolengine/buildware/releases/download/llvmorg-15.0.7/llvmorg-15.0.7.zip
+1. Download libclang from https://github.com/simdsoft/1kiss/releases/download/llvmorg-15.0.7/llvmorg-15.0.7.zip
 2. Copy `libclang.dll/libclang.dylib/libclang.so` (match with your OS) to `tools/bindings-generator/libclang/`, refer to `tools/win-ci/genbindings.ps1`
 
 On Windows:

diff --git a/tools/tolua/ax_3d.ini b/tools/tolua/ax_3d.ini
@@ -14,7 +14,7 @@ android_flags = -target armv7-none-linux-androideabi -D_LIBCPP_DISABLE_VISIBILIT
 clang_headers = 
 clang_flags = -nostdinc -x c++ -std=%(cxx_std)s -fsigned-char -U__SSE__
 
-ax_headers = -I%(axdir)s/core -I%(axdir)s/core/platform/android -I%(axdir)s/thirdparty -I%(axdir)s/thirdparty/jni.hpp/include -I%(axdir)s/thirdparty/robin-map/include -I%(axdir)s/thirdparty/glad/include
+ax_headers = -I%(axdir)s/core -I%(axdir)s/core/platform/android -I%(axdir)s/thirdparty -I%(axdir)s/thirdparty/yasio -I%(axdir)s/thirdparty/jni.hpp/include -I%(axdir)s/thirdparty/robin-map/include -I%(axdir)s/thirdparty/glad/include
 ax_flags = -DANDROID
 
 cxxgenerator_headers = 

diff --git a/tools/tolua/ax_audioengine.ini b/tools/tolua/ax_audioengine.ini
@@ -16,7 +16,7 @@ android_flags = -target armv7-none-linux-androideabi -D_LIBCPP_DISABLE_VISIBILIT
 clang_headers = 
 clang_flags = -nostdinc -x c++ -std=%(cxx_std)s -fsigned-char -U__SSE__
 
-ax_headers = -I%(axdir)s -I%(axdir)s/core -I%(axdir)s/core/platform/android -I%(axdir)s/thirdparty -I%(axdir)s/thirdparty/jni.hpp/include -I%(axdir)s/thirdparty/robin-map/include -I%(axdir)s/thirdparty/glad/include
+ax_headers = -I%(axdir)s -I%(axdir)s/core -I%(axdir)s/core/platform/android -I%(axdir)s/thirdparty -I%(axdir)s/thirdparty/yasio -I%(axdir)s/thirdparty/jni.hpp/include -I%(axdir)s/thirdparty/robin-map/include -I%(axdir)s/thirdparty/glad/include
 
 ax_flags = -DANDROID
 

diff --git a/tools/tolua/ax_backend.ini b/tools/tolua/ax_backend.ini
@@ -14,7 +14,7 @@ android_flags = -target armv7-none-linux-androideabi -D_LIBCPP_DISABLE_VISIBILIT
 clang_headers = 
 clang_flags = -nostdinc -x c++ -std=%(cxx_std)s -fsigned-char -U__SSE__
 
-ax_headers = -I%(axdir)s/core -I%(axdir)s/core/platform/android -I%(axdir)s/extensions -I%(axdir)s/thirdparty -I%(axdir)s/thirdparty/jni.hpp/include -I%(axdir)s/thirdparty/robin-map/include -I%(axdir)s/thirdparty/glad/include
+ax_headers = -I%(axdir)s/core -I%(axdir)s/core/platform/android -I%(axdir)s/extensions -I%(axdir)s/thirdparty -I%(axdir)s/thirdparty/yasio -I%(axdir)s/thirdparty/jni.hpp/include -I%(axdir)s/thirdparty/robin-map/include -I%(axdir)s/thirdparty/glad/include
 ax_flags = -DANDROID
 
 cxxgenerator_headers =

diff --git a/tools/tolua/ax_base.ini b/tools/tolua/ax_base.ini
@@ -14,7 +14,7 @@ android_flags = -target armv7-none-linux-androideabi -D_LIBCPP_DISABLE_VISIBILIT
 clang_headers = 
 clang_flags = -nostdinc -x c++ -std=%(cxx_std)s -fsigned-char -U__SSE__
 
-ax_headers = -I%(axdir)s/core -I%(axdir)s/core/platform/android -I%(axdir)s/extensions -I%(axdir)s/thirdparty -I%(axdir)s/thirdparty/robin-map/include -I%(axdir)s/thirdparty/jni.hpp/include -I%(axdir)s/thirdparty/glad/include
+ax_headers = -I%(axdir)s/core -I%(axdir)s/core/platform/android -I%(axdir)s/extensions -I%(axdir)s/thirdparty -I%(axdir)s/thirdparty/yasio -I%(axdir)s/thirdparty/robin-map/include -I%(axdir)s/thirdparty/jni.hpp/include -I%(axdir)s/thirdparty/glad/include
 ax_flags = -DANDROID
 
 cxxgenerator_headers =

diff --git a/tools/tolua/ax_controller.ini b/tools/tolua/ax_controller.ini
@@ -16,7 +16,7 @@ android_flags = -target armv7-none-linux-androideabi -D_LIBCPP_DISABLE_VISIBILIT
 clang_headers = 
 clang_flags = -nostdinc -x c++ -std=%(cxx_std)s -fsigned-char -U__SSE__
 
-ax_headers = -I%(axdir)s/core -I%(axdir)s/core/base -I%(axdir)s/core/platform/android -I%(axdir)s/thirdparty -I%(axdir)s/thirdparty/jni.hpp/include -I%(axdir)s/thirdparty/robin-map/include -I%(axdir)s/thirdparty/glad/include
+ax_headers = -I%(axdir)s/core -I%(axdir)s/core/base -I%(axdir)s/core/platform/android -I%(axdir)s/thirdparty -I%(axdir)s/thirdparty/yasio -I%(axdir)s/thirdparty/jni.hpp/include -I%(axdir)s/thirdparty/robin-map/include -I%(axdir)s/thirdparty/glad/include
 ax_flags = -DANDROID
 
 cxxgenerator_headers = 

diff --git a/tools/tolua/ax_csloader.ini b/tools/tolua/ax_csloader.ini
@@ -14,7 +14,7 @@ android_flags = -target armv7-none-linux-androideabi -D_LIBCPP_DISABLE_VISIBILIT
 clang_headers = 
 clang_flags = -nostdinc -x c++ -std=%(cxx_std)s -fsigned-char -U__SSE__
 
-ax_headers = -I%(axdir)s/core -I%(axdir)s/extensions/cocostudio -I%(axdir)s/core/platform/android -I%(axdir)s/thirdparty -I%(axdir)s/thirdparty/jni.hpp/include -I%(axdir)s/thirdparty/robin-map/include -I%(axdir)s/thirdparty/glad/include
+ax_headers = -I%(axdir)s/core -I%(axdir)s/extensions/cocostudio -I%(axdir)s/core/platform/android -I%(axdir)s/thirdparty -I%(axdir)s/thirdparty/yasio -I%(axdir)s/thirdparty/jni.hpp/include -I%(axdir)s/thirdparty/robin-map/include -I%(axdir)s/thirdparty/glad/include
 
 ax_flags = -DANDROID
 

diff --git a/tools/tolua/ax_extension.ini b/tools/tolua/ax_extension.ini
@@ -14,7 +14,7 @@ android_flags = -target armv7-none-linux-androideabi -D_LIBCPP_DISABLE_VISIBILIT
 clang_headers = 
 clang_flags = -nostdinc -x c++ -std=%(cxx_std)s -fsigned-char -U__SSE__
 
-ax_headers = -I%(axdir)s -I%(axdir)s/extensions -I%(axdir)s/extensions/cocostudio -I%(axdir)s/core -I%(axdir)s/core/platform/android -I%(axdir)s/thirdparty -I%(axdir)s/thirdparty/jni.hpp/include -I%(axdir)s/thirdparty/rapidjson -I%(axdir)s/thirdparty/box2d/include -I%(axdir)s/thirdparty/robin-map/include -I%(axdir)s/thirdparty/glad/include
+ax_headers = -I%(axdir)s -I%(axdir)s/extensions -I%(axdir)s/extensions/cocostudio -I%(axdir)s/core -I%(axdir)s/core/platform/android -I%(axdir)s/thirdparty -I%(axdir)s/thirdparty/yasio -I%(axdir)s/thirdparty/jni.hpp/include -I%(axdir)s/thirdparty/rapidjson -I%(axdir)s/thirdparty/box2d/include -I%(axdir)s/thirdparty/robin-map/include -I%(axdir)s/thirdparty/glad/include
 
 ax_flags = -DANDROID
 

diff --git a/tools/tolua/ax_fairygui.ini b/tools/tolua/ax_fairygui.ini
@@ -13,7 +13,7 @@ android_flags = -target armv7-none-linux-androideabi -D_LIBCPP_DISABLE_VISIBILIT
 clang_headers = 
 clang_flags = -nostdinc -x c++ -std=%(cxx_std)s -fsigned-char -U__SSE__
 
-ax_headers = -I%(axdir)s/thirdparty -I%(axdir)s/core -I%(axdir)s/extensions -I%(axdir)s/extensions/fairygui -I%(axdir)s/core/platform/android  -I%(axdir)s/thirdparty/robin-map/include  -I%(axdir)s/thirdparty/jni.hpp/include -I%(axdir)s/thirdparty/lua/plainlua -I%(axdir)s/thirdparty/lua/tolua -I%(axdir)s/extensions/scripting/lua-bindings/manual -I%(axdir)s/thirdparty/glad/include
+ax_headers = -I%(axdir)s/thirdparty -I%(axdir)s/core -I%(axdir)s/extensions -I%(axdir)s/extensions/fairygui -I%(axdir)s/core/platform/android -I%(axdir)s/thirdparty/yasio -I%(axdir)s/thirdparty/robin-map/include  -I%(axdir)s/thirdparty/jni.hpp/include -I%(axdir)s/thirdparty/lua/plainlua -I%(axdir)s/thirdparty/lua/tolua -I%(axdir)s/extensions/scripting/lua-bindings/manual -I%(axdir)s/thirdparty/glad/include
 
 ax_flags = -DANDROID
 

diff --git a/tools/tolua/ax_navmesh.ini b/tools/tolua/ax_navmesh.ini
@@ -18,7 +18,7 @@ clang_flags = -nostdinc -x c++ -std=%(cxx_std)s -fsigned-char -U__SSE__ -DAX__US
 
 win32_clang_flags = -U __SSE__
 
-ax_headers = -I%(axdir)s/core -I%(axdir)s/core/platform/android -I%(axdir)s/thirdparty -I%(axdir)s/thirdparty/jni.hpp/include -I%(axdir)s/thirdparty/robin-map/include -I%(axdir)s/thirdparty/glad/include -I%(axdir)s/thirdparty/recast/Detour -I%(axdir)s/thirdparty/recast/DetourCrowd -I%(axdir)s/thirdparty/recast/DetourTileCache -I%(axdir)s/thirdparty/recast/DebugUtils -I%(axdir)s/thirdparty/recast/fastlz -I%(axdir)s/thirdparty/recast/Recast -I%(axdir)s/thirdparty/lua/plainlua -I%(axdir)s/thirdparty/lua/tolua -I%(axdir)s/extensions -I%(axdir)s/extensions/scripting/lua-bindings/manual
+ax_headers = -I%(axdir)s/core -I%(axdir)s/core/platform/android -I%(axdir)s/thirdparty -I%(axdir)s/thirdparty/yasio -I%(axdir)s/thirdparty/jni.hpp/include -I%(axdir)s/thirdparty/robin-map/include -I%(axdir)s/thirdparty/glad/include -I%(axdir)s/thirdparty/recast/Detour -I%(axdir)s/thirdparty/recast/DetourCrowd -I%(axdir)s/thirdparty/recast/DetourTileCache -I%(axdir)s/thirdparty/recast/DebugUtils -I%(axdir)s/thirdparty/recast/fastlz -I%(axdir)s/thirdparty/recast/Recast -I%(axdir)s/thirdparty/lua/plainlua -I%(axdir)s/thirdparty/lua/tolua -I%(axdir)s/extensions -I%(axdir)s/extensions/scripting/lua-bindings/manual
 
 ax_flags = -DANDROID
 

diff --git a/tools/tolua/ax_physics.ini b/tools/tolua/ax_physics.ini
@@ -16,7 +16,7 @@ android_flags = -target armv7-none-linux-androideabi -D_LIBCPP_DISABLE_VISIBILIT
 clang_headers = 
 clang_flags = -nostdinc -x c++ -std=%(cxx_std)s -fsigned-char -U__SSE__
 
-ax_headers = -I%(axdir)s/core -I%(axdir)s/core/platform/android -I%(axdir)s/thirdparty -I%(axdir)s/thirdparty/jni.hpp/include -I%(axdir)s/thirdparty/robin-map/include -I%(axdir)s/thirdparty/glad/include
+ax_headers = -I%(axdir)s/core -I%(axdir)s/core/platform/android -I%(axdir)s/thirdparty -I%(axdir)s/thirdparty/yasio -I%(axdir)s/thirdparty/jni.hpp/include -I%(axdir)s/thirdparty/robin-map/include -I%(axdir)s/thirdparty/glad/include
 
 ax_flags = -DANDROID
 

diff --git a/tools/tolua/ax_physics3d.ini b/tools/tolua/ax_physics3d.ini
@@ -18,7 +18,7 @@ clang_flags = -nostdinc -x c++ -std=%(cxx_std)s -fsigned-char -U__SSE__ -DAX__EN
 
 win32_clang_flags = -U __SSE__
 
-ax_headers = -I%(axdir)s/core -I%(axdir)s/core/platform/android -I%(axdir)s/thirdparty -I%(axdir)s/thirdparty/jni.hpp/include -I%(axdir)s/thirdparty/robin-map/include -I%(axdir)s/thirdparty/bullet -I%(axdir)s/thirdparty/glad/include
+ax_headers = -I%(axdir)s/core -I%(axdir)s/core/platform/android -I%(axdir)s/thirdparty -I%(axdir)s/thirdparty/yasio -I%(axdir)s/thirdparty/jni.hpp/include -I%(axdir)s/thirdparty/robin-map/include -I%(axdir)s/thirdparty/bullet -I%(axdir)s/thirdparty/glad/include
 
 ax_flags = -DANDROID
 

diff --git a/tools/tolua/ax_spine.ini b/tools/tolua/ax_spine.ini
@@ -14,7 +14,7 @@ android_flags = -target armv7-none-linux-androideabi -D_LIBCPP_DISABLE_VISIBILIT
 clang_headers = 
 clang_flags = -nostdinc -x c++ -std=%(cxx_std)s -fsigned-char -U__SSE__
 
-ax_headers = -I%(axdir)s/core -I%(axdir)s/extensions -I%(axdir)s/extensions/spine -I%(axdir)s/extensions/spine/runtime/include -I%(axdir)s/core/platform/android -I%(axdir)s/thirdparty  -I%(axdir)s/thirdparty/jni.hpp/include -I%(axdir)s/thirdparty/robin-map/include -I%(axdir)s/thirdparty/glad/include
+ax_headers = -I%(axdir)s/core -I%(axdir)s/extensions -I%(axdir)s/extensions/spine -I%(axdir)s/extensions/spine/runtime/include -I%(axdir)s/core/platform/android -I%(axdir)s/thirdparty -I%(axdir)s/thirdparty/yasio -I%(axdir)s/thirdparty/jni.hpp/include -I%(axdir)s/thirdparty/robin-map/include -I%(axdir)s/thirdparty/glad/include
 
 ax_flags = -DANDROID
 

diff --git a/tools/tolua/ax_studio.ini b/tools/tolua/ax_studio.ini
@@ -17,7 +17,7 @@ android_flags = -target armv7-none-linux-androideabi -D_LIBCPP_DISABLE_VISIBILIT
 clang_headers = 
 clang_flags = -nostdinc -x c++ -std=%(cxx_std)s -fsigned-char -U__SSE__
 
-ax_headers = -I%(axdir)s/thirdparty -I%(axdir)s/core -I%(axdir)s/extensions -I%(axdir)s/extensions/cocostudio -I%(axdir)s/core/platform/android  -I%(axdir)s/thirdparty/robin-map/include  -I%(axdir)s/thirdparty/jni.hpp/include -I%(axdir)s/thirdparty/lua/plainlua -I%(axdir)s/thirdparty/lua/tolua -I%(axdir)s/extensions/scripting/lua-bindings/manual -I%(axdir)s/thirdparty/glad/include
+ax_headers = -I%(axdir)s/thirdparty -I%(axdir)s/thirdparty/yasio -I%(axdir)s/core -I%(axdir)s/extensions -I%(axdir)s/extensions/cocostudio -I%(axdir)s/core/platform/android  -I%(axdir)s/thirdparty/robin-map/include  -I%(axdir)s/thirdparty/jni.hpp/include -I%(axdir)s/thirdparty/lua/plainlua -I%(axdir)s/thirdparty/lua/tolua -I%(axdir)s/extensions/scripting/lua-bindings/manual -I%(axdir)s/thirdparty/glad/include
 
 ax_flags = -DANDROID
 

diff --git a/tools/tolua/ax_ui.ini b/tools/tolua/ax_ui.ini
@@ -17,7 +17,7 @@ android_flags = -target armv7-none-linux-androideabi -D_LIBCPP_DISABLE_VISIBILIT
 clang_headers = 
 clang_flags = -nostdinc -x c++ -std=%(cxx_std)s -fsigned-char -U__SSE__
 
-ax_headers = -I%(axdir)s/core -I%(axdir)s/extensions -I%(axdir)s/core/platform/android -I%(axdir)s/thirdparty  -I%(axdir)s/thirdparty/jni.hpp/include -I%(axdir)s/thirdparty/robin-map/include -I%(axdir)s/thirdparty/glad/include
+ax_headers = -I%(axdir)s/core -I%(axdir)s/extensions -I%(axdir)s/core/platform/android -I%(axdir)s/thirdparty -I%(axdir)s/thirdparty/yasio -I%(axdir)s/thirdparty/jni.hpp/include -I%(axdir)s/thirdparty/robin-map/include -I%(axdir)s/thirdparty/glad/include
 
 ax_flags = -DANDROID
 

diff --git a/tools/tolua/ax_video.ini b/tools/tolua/ax_video.ini
@@ -14,7 +14,7 @@ android_flags = -target armv7-none-linux-androideabi -D_LIBCPP_DISABLE_VISIBILIT
 clang_headers = 
 clang_flags = -nostdinc -x c++ -std=%(cxx_std)s -fsigned-char -U__SSE__
 
-ax_headers = -I%(axdir)s/core -I%(axdir)s/extensions -I%(axdir)s/core/platform/android -I%(axdir)s/thirdparty  -I%(axdir)s/thirdparty/jni.hpp/include -I%(axdir)s/thirdparty/robin-map/include -I%(axdir)s/thirdparty/glad/include
+ax_headers = -I%(axdir)s/core -I%(axdir)s/extensions -I%(axdir)s/core/platform/android -I%(axdir)s/thirdparty -I%(axdir)s/thirdparty/yasio -I%(axdir)s/thirdparty/jni.hpp/include -I%(axdir)s/thirdparty/robin-map/include -I%(axdir)s/thirdparty/glad/include
 
 ax_flags = -DANDROID
 

diff --git a/tools/tolua/ax_webview.ini b/tools/tolua/ax_webview.ini
@@ -13,7 +13,7 @@ android_flags = -target armv7-none-linux-androideabi -D_LIBCPP_DISABLE_VISIBILIT
 clang_headers = 
 clang_flags = -nostdinc -x c++ -std=%(cxx_std)s -fsigned-char -U__SSE__
 
-ax_headers = -I%(axdir)s/core -I%(axdir)s/extensions -I%(axdir)s/core/platform/android -I%(axdir)s/thirdparty  -I%(axdir)s/thirdparty/jni.hpp/include -I%(axdir)s/thirdparty/robin-map/include
+ax_headers = -I%(axdir)s/core -I%(axdir)s/extensions -I%(axdir)s/core/platform/android -I%(axdir)s/thirdparty -I%(axdir)s/thirdparty/yasio -I%(axdir)s/thirdparty/jni.hpp/include -I%(axdir)s/thirdparty/robin-map/include
 
 ax_flags = -DANDROID