补充漏打包的lib文件夹

添加debug输出
26F-Studio · Jun 24, 2024 · f99b833 · f99b833
1 parent dd889f8
commit f99b833
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -67,7 +67,7 @@ jobs:
       - name: Build core love package
         uses: 26F-Studio/love-actions-core@v1
         with:
-          build-list: ./assets/ ./Zenitha/ ./conf.lua ./main.lua ./version.lua
+          build-list: ./assets/ ./Zenitha/ ./libAndroid/ ./conf.lua ./main.lua ./version.lua
           package-path: ${{ env.CORE_LOVE_PACKAGE_PATH }}
       - name: Upload core love package
         uses: actions/upload-artifact@v3

diff --git a/assets/fmod20221/init.lua b/assets/fmod20221/init.lua
@@ -22,8 +22,12 @@ if SYSTEM=='Android' then
     end
     love.filesystem.write('lib/libfmod.so',love.filesystem.read('data','libAndroid/fmod/'..platform..'/libfmod.so'))
     love.filesystem.write('lib/libfmodstudio.so',love.filesystem.read('data','libAndroid/fmod/'..platform..'/libfmodstudio.so'))
-    M.C=ffi.load(love.filesystem.getSaveDirectory()..'/lib/libfmod.so')
-    M.C2=ffi.load(love.filesystem.getSaveDirectory()..'/lib/libfmodstudio.so')
+    local suc
+    suc,M.C=pcall(ffi.load,love.filesystem.getSaveDirectory()..'/lib/libfmod.so')
+    suc,M.C2=pcall(ffi.load,love.filesystem.getSaveDirectory()..'/lib/libfmodstudio.so')
+    if not suc then
+        MSG.new('error',tostring(M.C) or "?")
+    end
 else
     -- search for fmod shared libraries in package.cpath
     local fmodPath=package.searchpath('fmod',package.cpath)