同步官方库自动编译的修改

chexiongsheng · Dec 5, 2020 · fdc8094 · fdc8094
1 parent bf8c1fa
commit fdc8094
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -132,7 +132,10 @@ jobs:
           .\make_win_lua54.bat
           .\make_win32_lua53.bat
           .\make_win64_lua53.bat
-          .\make_win32_luajit.bat
+      - uses: ilammy/msvc-dev-cmd@v1
+      - name: Build Luajit
+        run: |
+          cd build
           .\make_win64_luajit.bat
       - name: Upload
         uses: actions/upload-artifact@v2

diff --git a/build/make_android_luajit_arm64.sh b/build/make_android_luajit_arm64.sh
@@ -63,6 +63,6 @@ mkdir -p build_lj_x86 && cd build_lj_x86
 cmake -DUSING_LUAJIT=ON -DANDROID_ABI=x86 -DCMAKE_TOOLCHAIN_FILE=$ANDROID_NDK/build/cmake/android.toolchain.cmake -DANDROID_TOOLCHAIN_NAME=x86-clang -DANDROID_NATIVE_API_LEVEL=android-21 ../
 cd "$DIR"
 cmake --build build_lj_x86 --config Release
-mkdir -p plugin_luajit/Plugins/Android/libs/arm64-v8a/
-cp build_lj_x86/libxlua.so plugin_luajit/Plugins/Android/libs/arm64-v8a/libxlua.so
+mkdir -p plugin_luajit/Plugins/Android/libs/x86/
+cp build_lj_x86/libxlua.so plugin_luajit/Plugins/Android/libs/x86/libxlua.so