调整动态库文件结构

discordRPC动态库文件加入自动打包流程
26F-Studio · Sep 25, 2024 · 4dcb2db · 4dcb2db
1 parent 8c7b68d
commit 4dcb2db
Show file tree

Hide file tree

Showing 15 changed files with 4 additions and 4 deletions.
diff --git a/...uild/libFMOD/Android/arm64-v8a/libfmod.so → ...ld/extraLibs/Android/arm64-v8a/libfmod.so b/...uild/libFMOD/Android/arm64-v8a/libfmod.so → ...ld/extraLibs/Android/arm64-v8a/libfmod.so
diff --git a/...ibFMOD/Android/arm64-v8a/libfmodstudio.so → ...raLibs/Android/arm64-v8a/libfmodstudio.so b/...ibFMOD/Android/arm64-v8a/libfmodstudio.so → ...raLibs/Android/arm64-v8a/libfmodstudio.so
diff --git a/...ld/libFMOD/Android/armeabi-v7a/libfmod.so → .../extraLibs/Android/armeabi-v7a/libfmod.so b/...ld/libFMOD/Android/armeabi-v7a/libfmod.so → .../extraLibs/Android/armeabi-v7a/libfmod.so
diff --git a/...FMOD/Android/armeabi-v7a/libfmodstudio.so → ...Libs/Android/armeabi-v7a/libfmodstudio.so b/...FMOD/Android/armeabi-v7a/libfmodstudio.so → ...Libs/Android/armeabi-v7a/libfmodstudio.so
diff --git a/.github/build/libFMOD/Linux/libfmod.so → .github/build/extraLibs/Linux/libfmod.so b/.github/build/libFMOD/Linux/libfmod.so → .github/build/extraLibs/Linux/libfmod.so
diff --git a/.github/build/libFMOD/Linux/libfmodstudio.so → ...ub/build/extraLibs/Linux/libfmodstudio.so b/.github/build/libFMOD/Linux/libfmodstudio.so → ...ub/build/extraLibs/Linux/libfmodstudio.so
diff --git a/.github/build/libFMOD/Mac/libfmod.dylib → .github/build/extraLibs/Mac/libfmod.dylib b/.github/build/libFMOD/Mac/libfmod.dylib → .github/build/extraLibs/Mac/libfmod.dylib
diff --git a/...hub/build/libFMOD/Mac/libfmodstudio.dylib → ...b/build/extraLibs/Mac/libfmodstudio.dylib b/...hub/build/libFMOD/Mac/libfmodstudio.dylib → ...b/build/extraLibs/Mac/libfmodstudio.dylib
diff --git a/...libDiscordRPC/Windows_x64/discord-rpc.dll → ...ild/extraLibs/Windows_x64/discord-rpc.dll b/...libDiscordRPC/Windows_x64/discord-rpc.dll → ...ild/extraLibs/Windows_x64/discord-rpc.dll
diff --git a/.github/build/libFMOD/Windows/x64/fmod.dll → .github/build/extraLibs/Windows_x64/fmod.dll b/.github/build/libFMOD/Windows/x64/fmod.dll → .github/build/extraLibs/Windows_x64/fmod.dll
diff --git a/.../build/libFMOD/Windows/x64/fmodstudio.dll → ...uild/extraLibs/Windows_x64/fmodstudio.dll b/.../build/libFMOD/Windows/x64/fmodstudio.dll → ...uild/extraLibs/Windows_x64/fmodstudio.dll
diff --git a/...libDiscordRPC/Windows_x86/discord-rpc.dll → ...ild/extraLibs/Windows_x86/discord-rpc.dll b/...libDiscordRPC/Windows_x86/discord-rpc.dll → ...ild/extraLibs/Windows_x86/discord-rpc.dll
diff --git a/.github/build/libFMOD/Windows/x86/fmod.dll → .github/build/extraLibs/Windows_x86/fmod.dll b/.github/build/libFMOD/Windows/x86/fmod.dll → .github/build/extraLibs/Windows_x86/fmod.dll
diff --git a/.../build/libFMOD/Windows/x86/fmodstudio.dll → ...uild/extraLibs/Windows_x86/fmodstudio.dll b/.../build/libFMOD/Windows/x86/fmodstudio.dll → ...uild/extraLibs/Windows_x86/fmodstudio.dll
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -164,8 +164,8 @@ jobs:
         with:
           icon-path: ./.github/build/windows/${{ env.BUILD_TYPE }}/icon.ico
           rc-path: ./.github/build/windows/${{ env.BUILD_TYPE }}/template.rc
-          extra-assets-x64: ./.github/build/libFMOD/Windows/x64/fmod.dll ./.github/build/libFMOD/Windows/x64/fmodstudio.dll
-          extra-assets-x86: ./.github/build/libFMOD/Windows/x86/fmod.dll ./.github/build/libFMOD/Windows/x86/fmodstudio.dll
+          extra-assets-x64: ./.github/build/extraLibs/Windows_x64/fmod.dll ./.github/build/extraLibs/Windows_x64/fmodstudio.dll ./.github/build/extraLibs/Windows_x64/discord-rpc.dll
+          extra-assets-x86: ./.github/build/extraLibs/Windows_x86/fmod.dll ./.github/build/extraLibs/Windows_x86/fmodstudio.dll ./.github/build/extraLibs/Windows_x86/discord-rpc.dll
           love-package: ${{ env.CORE_LOVE_PACKAGE_PATH }}
           product-name: ${{ steps.process-app-name.outputs.product-name }}
           app-id: ${{ secrets.WINDOWS_APP_ID }}
@@ -232,7 +232,7 @@ jobs:
         with:
           name: ${{ env.CORE_LOVE_ARTIFACT_NAME }}
       # - name: Download fmod lib
-      # Two .so files are in .github/build/libFMOD/Android/
+      # Two .so files are in .github/build/extraLibs/Android/
       # Need to put them into the love package, besides the liblove.so (for each architecture)
       # TODO: ??????????????????????????
       # TODO: ??????????????????????????
@@ -313,7 +313,7 @@ jobs:
           version-string: ${{ needs.get-info.outputs.version-string }}
           icon-path: ./.github/build/linux/${{ env.BUILD_TYPE }}/icon.png
           love-package: ${{ env.CORE_LOVE_PACKAGE_PATH }}
-          lib-path: ./.github/build/libFMOD/Linux
+          lib-path: ./.github/build/extraLibs/Linux
           product-name: ${{ steps.process-app-name.outputs.product-name }}
           output-folder: ${{ env.OUTPUT_FOLDER }}
       - name: Upload AppImage artifact