From 4dcb2dbe7fc7d9c5daaa6d6bdb0d193156a90b99 Mon Sep 17 00:00:00 2001 From: MrZ_26 <1046101471@qq.com> Date: Thu, 26 Sep 2024 01:33:19 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=8A=A8=E6=80=81=E5=BA=93?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E7=BB=93=E6=9E=84=20discordRPC=E5=8A=A8?= =?UTF-8?q?=E6=80=81=E5=BA=93=E6=96=87=E4=BB=B6=E5=8A=A0=E5=85=A5=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E6=89=93=E5=8C=85=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Android/arm64-v8a/libfmod.so | Bin .../Android/arm64-v8a/libfmodstudio.so | Bin .../Android/armeabi-v7a/libfmod.so | Bin .../Android/armeabi-v7a/libfmodstudio.so | Bin .../build/{libFMOD => extraLibs}/Linux/libfmod.so | Bin .../{libFMOD => extraLibs}/Linux/libfmodstudio.so | Bin .../build/{libFMOD => extraLibs}/Mac/libfmod.dylib | Bin .../{libFMOD => extraLibs}/Mac/libfmodstudio.dylib | Bin .../Windows_x64/discord-rpc.dll | Bin .../Windows/x64 => extraLibs/Windows_x64}/fmod.dll | Bin .../x64 => extraLibs/Windows_x64}/fmodstudio.dll | Bin .../Windows_x86/discord-rpc.dll | Bin .../Windows/x86 => extraLibs/Windows_x86}/fmod.dll | Bin .../x86 => extraLibs/Windows_x86}/fmodstudio.dll | Bin .github/workflows/main.yml | 8 ++++---- 15 files changed, 4 insertions(+), 4 deletions(-) rename .github/build/{libFMOD => extraLibs}/Android/arm64-v8a/libfmod.so (100%) rename .github/build/{libFMOD => extraLibs}/Android/arm64-v8a/libfmodstudio.so (100%) rename .github/build/{libFMOD => extraLibs}/Android/armeabi-v7a/libfmod.so (100%) rename .github/build/{libFMOD => extraLibs}/Android/armeabi-v7a/libfmodstudio.so (100%) rename .github/build/{libFMOD => extraLibs}/Linux/libfmod.so (100%) rename .github/build/{libFMOD => extraLibs}/Linux/libfmodstudio.so (100%) rename .github/build/{libFMOD => extraLibs}/Mac/libfmod.dylib (100%) rename .github/build/{libFMOD => extraLibs}/Mac/libfmodstudio.dylib (100%) rename .github/build/{libDiscordRPC => extraLibs}/Windows_x64/discord-rpc.dll (100%) rename .github/build/{libFMOD/Windows/x64 => extraLibs/Windows_x64}/fmod.dll (100%) rename .github/build/{libFMOD/Windows/x64 => extraLibs/Windows_x64}/fmodstudio.dll (100%) rename .github/build/{libDiscordRPC => extraLibs}/Windows_x86/discord-rpc.dll (100%) rename .github/build/{libFMOD/Windows/x86 => extraLibs/Windows_x86}/fmod.dll (100%) rename .github/build/{libFMOD/Windows/x86 => extraLibs/Windows_x86}/fmodstudio.dll (100%) diff --git a/.github/build/libFMOD/Android/arm64-v8a/libfmod.so b/.github/build/extraLibs/Android/arm64-v8a/libfmod.so similarity index 100% rename from .github/build/libFMOD/Android/arm64-v8a/libfmod.so rename to .github/build/extraLibs/Android/arm64-v8a/libfmod.so diff --git a/.github/build/libFMOD/Android/arm64-v8a/libfmodstudio.so b/.github/build/extraLibs/Android/arm64-v8a/libfmodstudio.so similarity index 100% rename from .github/build/libFMOD/Android/arm64-v8a/libfmodstudio.so rename to .github/build/extraLibs/Android/arm64-v8a/libfmodstudio.so diff --git a/.github/build/libFMOD/Android/armeabi-v7a/libfmod.so b/.github/build/extraLibs/Android/armeabi-v7a/libfmod.so similarity index 100% rename from .github/build/libFMOD/Android/armeabi-v7a/libfmod.so rename to .github/build/extraLibs/Android/armeabi-v7a/libfmod.so diff --git a/.github/build/libFMOD/Android/armeabi-v7a/libfmodstudio.so b/.github/build/extraLibs/Android/armeabi-v7a/libfmodstudio.so similarity index 100% rename from .github/build/libFMOD/Android/armeabi-v7a/libfmodstudio.so rename to .github/build/extraLibs/Android/armeabi-v7a/libfmodstudio.so diff --git a/.github/build/libFMOD/Linux/libfmod.so b/.github/build/extraLibs/Linux/libfmod.so similarity index 100% rename from .github/build/libFMOD/Linux/libfmod.so rename to .github/build/extraLibs/Linux/libfmod.so diff --git a/.github/build/libFMOD/Linux/libfmodstudio.so b/.github/build/extraLibs/Linux/libfmodstudio.so similarity index 100% rename from .github/build/libFMOD/Linux/libfmodstudio.so rename to .github/build/extraLibs/Linux/libfmodstudio.so diff --git a/.github/build/libFMOD/Mac/libfmod.dylib b/.github/build/extraLibs/Mac/libfmod.dylib similarity index 100% rename from .github/build/libFMOD/Mac/libfmod.dylib rename to .github/build/extraLibs/Mac/libfmod.dylib diff --git a/.github/build/libFMOD/Mac/libfmodstudio.dylib b/.github/build/extraLibs/Mac/libfmodstudio.dylib similarity index 100% rename from .github/build/libFMOD/Mac/libfmodstudio.dylib rename to .github/build/extraLibs/Mac/libfmodstudio.dylib diff --git a/.github/build/libDiscordRPC/Windows_x64/discord-rpc.dll b/.github/build/extraLibs/Windows_x64/discord-rpc.dll similarity index 100% rename from .github/build/libDiscordRPC/Windows_x64/discord-rpc.dll rename to .github/build/extraLibs/Windows_x64/discord-rpc.dll diff --git a/.github/build/libFMOD/Windows/x64/fmod.dll b/.github/build/extraLibs/Windows_x64/fmod.dll similarity index 100% rename from .github/build/libFMOD/Windows/x64/fmod.dll rename to .github/build/extraLibs/Windows_x64/fmod.dll diff --git a/.github/build/libFMOD/Windows/x64/fmodstudio.dll b/.github/build/extraLibs/Windows_x64/fmodstudio.dll similarity index 100% rename from .github/build/libFMOD/Windows/x64/fmodstudio.dll rename to .github/build/extraLibs/Windows_x64/fmodstudio.dll diff --git a/.github/build/libDiscordRPC/Windows_x86/discord-rpc.dll b/.github/build/extraLibs/Windows_x86/discord-rpc.dll similarity index 100% rename from .github/build/libDiscordRPC/Windows_x86/discord-rpc.dll rename to .github/build/extraLibs/Windows_x86/discord-rpc.dll diff --git a/.github/build/libFMOD/Windows/x86/fmod.dll b/.github/build/extraLibs/Windows_x86/fmod.dll similarity index 100% rename from .github/build/libFMOD/Windows/x86/fmod.dll rename to .github/build/extraLibs/Windows_x86/fmod.dll diff --git a/.github/build/libFMOD/Windows/x86/fmodstudio.dll b/.github/build/extraLibs/Windows_x86/fmodstudio.dll similarity index 100% rename from .github/build/libFMOD/Windows/x86/fmodstudio.dll rename to .github/build/extraLibs/Windows_x86/fmodstudio.dll diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 873a16ae..1ea7683f 100644 --- 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