diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml index 911613de..69b1d269 100644 --- a/.github/workflows/ccpp.yml +++ b/.github/workflows/ccpp.yml @@ -1611,6 +1611,7 @@ jobs: /usr/src/strawberry-mxe/usr/x86_64-w64-mingw32.shared/bin/gstreamer-1.0/libgstwavpack.dll /usr/src/strawberry-mxe/usr/x86_64-w64-mingw32.shared/bin/gstreamer-1.0/libgstwavparse.dll /usr/src/strawberry-mxe/usr/x86_64-w64-mingw32.shared/bin/gstreamer-1.0/libgstxingmux.dll + /usr/src/strawberry-mxe/usr/x86_64-w64-mingw32.shared/bin/gstreamer-1.0/libgsttwolame.dll ${GITHUB_WORKSPACE}/build/gstreamer-plugins/ - name: Copy extra binaries @@ -1859,6 +1860,7 @@ jobs: copy c:\msvc_x86_64\lib\gstreamer-1.0\gstwavparse.dll .\gstreamer-plugins\ copy c:\msvc_x86_64\lib\gstreamer-1.0\gstxingmux.dll .\gstreamer-plugins\ copy c:\msvc_x86_64\lib\gstreamer-1.0\gstlibav.dll .\gstreamer-plugins\ + copy c:\msvc_x86_64\lib\gstreamer-1.0\gsttwolame.dll .\gstreamer-plugins\ - name: Download copydlldeps.sh shell: bash @@ -2118,6 +2120,7 @@ jobs: copy c:\msvc_x86_64\lib\gstreamer-1.0\gstwavparse.dll .\gstreamer-plugins\ copy c:\msvc_x86_64\lib\gstreamer-1.0\gstxingmux.dll .\gstreamer-plugins\ copy c:\msvc_x86_64\lib\gstreamer-1.0\gstlibav.dll .\gstreamer-plugins\ + copy c:\msvc_x86_64\lib\gstreamer-1.0\gsttwolame.dll .\gstreamer-plugins\ - name: Download copydlldeps.sh shell: bash diff --git a/dist/windows/strawberry.nsi.in b/dist/windows/strawberry.nsi.in index f6e9f30f..023b389c 100644 --- a/dist/windows/strawberry.nsi.in +++ b/dist/windows/strawberry.nsi.in @@ -288,6 +288,7 @@ Section "Strawberry" Strawberry File "libstdc++-6.dll" File "libtag.dll" File "libtasn1-6.dll" + File "libtwolame-0.dll" File "libunistring-2.dll" File "libvorbis-0.dll" File "libvorbisenc-2.dll" @@ -396,6 +397,7 @@ Section "Strawberry" Strawberry File "libxml2.dll" File "pcre2-8.dll" File "pcre2-16.dll" + File "twolame.dll" File "zlib.dll" !endif !ifdef debug @@ -404,6 +406,7 @@ Section "Strawberry" Strawberry File "libxml2d.dll" File "pcre2-8d.dll" File "pcre2-16d.dll" + File "twolamed.dll" File "zlibd.dll" !endif @@ -574,6 +577,7 @@ Section "Gstreamer plugins" gstreamer-plugins File "/oname=libgstspeex.dll" "gstreamer-plugins\libgstspeex.dll" File "/oname=libgsttaglib.dll" "gstreamer-plugins\libgsttaglib.dll" File "/oname=libgsttcp.dll" "gstreamer-plugins\libgsttcp.dll" + File "/oname=libgsttwolame.dll" "gstreamer-plugins\libgsttwolame.dll" File "/oname=libgsttypefindfunctions.dll" "gstreamer-plugins\libgsttypefindfunctions.dll" File "/oname=libgstudp.dll" "gstreamer-plugins\libgstudp.dll" File "/oname=libgstvolume.dll" "gstreamer-plugins\libgstvolume.dll" @@ -628,6 +632,7 @@ Section "Gstreamer plugins" gstreamer-plugins File "/oname=gstsoup.dll" "gstreamer-plugins\gstsoup.dll" File "/oname=gstspectrum.dll" "gstreamer-plugins\gstspectrum.dll" File "/oname=gsttcp.dll" "gstreamer-plugins\gsttcp.dll" + File "/oname=gsttwolame.dll" "gstreamer-plugins\gsttwolame.dll" File "/oname=gsttypefindfunctions.dll" "gstreamer-plugins\gsttypefindfunctions.dll" File "/oname=gstudp.dll" "gstreamer-plugins\gstudp.dll" File "/oname=gstvolume.dll" "gstreamer-plugins\gstvolume.dll" @@ -767,6 +772,7 @@ Section "Uninstall" Delete "$INSTDIR\libstdc++-6.dll" Delete "$INSTDIR\libtag.dll" Delete "$INSTDIR\libtasn1-6.dll" + Delete "$INSTDIR\libtwolame-0.dll" Delete "$INSTDIR\libunistring-2.dll" Delete "$INSTDIR\libvorbis-0.dll" Delete "$INSTDIR\libvorbisenc-2.dll" @@ -875,6 +881,7 @@ Section "Uninstall" Delete "$INSTDIR\libxml2.dll" Delete "$INSTDIR\pcre2-8.dll" Delete "$INSTDIR\pcre2-16.dll" + Delete "$INSTDIR\twolame.dll" Delete "$INSTDIR\zlib.dll" !endif !ifdef debug @@ -883,6 +890,7 @@ Section "Uninstall" Delete "$INSTDIR\libxml2d.dll" Delete "$INSTDIR\pcre2-8d.dll" Delete "$INSTDIR\pcre2-16d.dll" + Delete "$INSTDIR\twolamed.dll" Delete "$INSTDIR\zlibd.dll" !endif @@ -986,6 +994,7 @@ Section "Uninstall" Delete "$INSTDIR\gstreamer-plugins\libgstspeex.dll" Delete "$INSTDIR\gstreamer-plugins\libgsttaglib.dll" Delete "$INSTDIR\gstreamer-plugins\libgsttcp.dll" + Delete "$INSTDIR\gstreamer-plugins\libgsttwolame.dll" Delete "$INSTDIR\gstreamer-plugins\libgsttypefindfunctions.dll" Delete "$INSTDIR\gstreamer-plugins\libgstudp.dll" Delete "$INSTDIR\gstreamer-plugins\libgstvolume.dll" @@ -1042,6 +1051,7 @@ Section "Uninstall" Delete "$INSTDIR\gstreamer-plugins\gstsoup.dll" Delete "$INSTDIR\gstreamer-plugins\gstspectrum.dll" Delete "$INSTDIR\gstreamer-plugins\gsttcp.dll" + Delete "$INSTDIR\gstreamer-plugins\gsttwolame.dll" Delete "$INSTDIR\gstreamer-plugins\gsttypefindfunctions.dll" Delete "$INSTDIR\gstreamer-plugins\gstudp.dll" Delete "$INSTDIR\gstreamer-plugins\gstvolume.dll"