From e641b3b60940c99c95d77a322e162613820991c7 Mon Sep 17 00:00:00 2001 From: bbbradsmith Date: Sat, 30 Mar 2024 23:41:15 -0400 Subject: [PATCH] winamp DLL can only be 32-bit remove winamp from 64-bit MSVC build build machines will do both 64 and 32, and include the 32-bit DLL with both artifacts --- .github/workflows/build.yml | 100 ++++++++++++++++++------------------ nsfplay.sln | 6 +-- winamp/winamp.vcxproj | 81 ----------------------------- 3 files changed, 51 insertions(+), 136 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6d8bbe6..d1f9c5f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -11,59 +11,45 @@ concurrency: jobs: - build-win64-msvc: - name: Windows 64-bit MSVC + build-msvc: + name: Windows MSVC runs-on: windows-latest steps: - name: Checkout Files uses: actions/checkout@v4 - name: Setup MSVC uses: microsoft/setup-msbuild@v2 - - name: Build MSVC + - name: Build 64-bit run: msbuild nsfplay.sln -t:rebuild -property:Configuration=Release -property:Platform=x64 - - name: Prepare Artifact + - name: Build 32-bit + run: msbuild nsfplay.sln -t:rebuild -property:Configuration=Release -property:Platform=x86 + - name: Prepare Artifacts shell: pwsh run: | - mkdir artifact - cp nsfplay.txt artifact - cp output/x64/Release/nsfplay.exe artifact - cp output/x64/Release/nsfplaycmd.exe artifact - cp output/x64/Release/nsfplug.dll artifact + mkdir artifact64 + cp nsfplay.txt artifact64 + cp output/x64/Release/nsfplay.exe artifact64 + cp output/x64/Release/nsfplaycmd.exe artifact64 + cp output/Win32/Release/nsfplug.dll artifact64 + mkdir artifact32 + cp nsfplay.txt artifact32 + cp output/Win32/Release/nsfplay.exe artifact32 + cp output/Win32/Release/nsfplaycmd.exe artifact32 + cp output/Win32/Release/nsfplug.dll artifact32 echo "BUILD_TAG=$(git log -1 --format="%ad--%h" --date=format-local:"%Y-%m-%d-%H%M%S")" >> $env:GITHUB_ENV - - name: Upload Artifact + - name: Upload 64-bit Artifact uses: actions/upload-artifact@v4 with: - name: nsfplay3-win64-msvc--${{ env.BUILD_TAG }} - path: artifact/ - - - build-win32-msvc: - name: Windows 32-bit MSVC - runs-on: windows-latest - steps: - - name: Checkout Files - uses: actions/checkout@v4 - - name: Setup MSVC - uses: microsoft/setup-msbuild@v2 - - name: Build MSVC - run: msbuild nsfplay.sln -t:rebuild -property:Configuration=Release -property:Platform=x86 - - name: Prepare Artifact - shell: pwsh - run: | - mkdir artifact - cp nsfplay.txt artifact - cp output/Win32/Release/nsfplay.exe artifact - cp output/Win32/Release/nsfplaycmd.exe artifact - cp output/Win32/Release/nsfplug.dll artifact - echo "BUILD_TAG=$(git log -1 --format="%ad--%h" --date=format-local:"%Y-%m-%d-%H%M%S")" >> $env:GITHUB_ENV - - name: Upload Artifact + name: nsfplay3-win64--${{ env.BUILD_TAG }} + path: artifact64/ + - name: Upload 32-bit Artifact uses: actions/upload-artifact@v4 with: - name: nsfplay3-win32-msvc--${{ env.BUILD_TAG }} - path: artifact/ + name: nsfplay3-win32--${{ env.BUILD_TAG }} + path: artifact32/ - build-win64-msys2: - name: Windows 64-bit MSYS2 + build-msys2: + name: Windows MSYS2 runs-on: windows-latest steps: - name: Checkout Files @@ -72,22 +58,34 @@ jobs: uses: msys2/setup-msys2@v2 with: msystem: UCRT64 - install: make mingw-w64-ucrt-x86_64-gcc - - name: Build Make + install: make mingw-w64-ucrt-x86_64-gcc mingw-w64-i686-toolchain + - name: Make 64-bit shell: msys2 {0} - run: | - make - - name: Prepare Artifact + run: export OUTDIR=output/make64 INTDIR=intermediate/make64 ; make cmd gui + - name: Make 32-bit + shell: msys2 {0} + run: export PATH="/mingw32/bin:$PATH" OUTDIR=output/make32 INTDIR=intermediate/make32 ; make + - name: Prepare Artifacts shell: pwsh run: | - mkdir artifact - cp nsfplay.txt artifact - cp output/make/nsfplay.exe artifact - cp output/make/nsfplaycmd.exe artifact - cp output/make/nsfplug.dll artifact + mkdir artifact64 + cp nsfplay.txt artifact64 + cp output/make64/nsfplay.exe artifact64 + cp output/make64/nsfplaycmd.exe artifact64 + cp output/make32/nsfplug.dll artifact64 + mkdir artifact32 + cp nsfplay.txt artifact32 + cp output/make32/nsfplay.exe artifact32 + cp output/make32/nsfplaycmd.exe artifact32 + cp output/make32/nsfplug.dll artifact32 echo "BUILD_TAG=$(git log -1 --format="%ad--%h" --date=format-local:"%Y-%m-%d-%H%M%S")" >> $env:GITHUB_ENV - - name: Upload Artifact + - name: Upload 64-bit Artifact + uses: actions/upload-artifact@v4 + with: + name: nsfplay3-win64-ucrt--${{ env.BUILD_TAG }} + path: artifact64/ + - name: Upload 32-bit Artifact uses: actions/upload-artifact@v4 with: - name: nsfplay3-win64-msys2--${{ env.BUILD_TAG }} - path: artifact/ + name: nsfplay3-win32-mingw--${{ env.BUILD_TAG }} + path: artifact32/ diff --git a/nsfplay.sln b/nsfplay.sln index 4e3a36b..6a2fd95 100644 --- a/nsfplay.sln +++ b/nsfplay.sln @@ -44,12 +44,10 @@ Global {E492BA81-E2F5-439C-B42E-A3E26C82DDFB}.Release|x64.Build.0 = Release|x64 {E492BA81-E2F5-439C-B42E-A3E26C82DDFB}.Release|x86.ActiveCfg = Release|Win32 {E492BA81-E2F5-439C-B42E-A3E26C82DDFB}.Release|x86.Build.0 = Release|Win32 - {4564B30C-656E-4897-8036-42E4A3E88FBE}.Debug|x64.ActiveCfg = Debug|x64 - {4564B30C-656E-4897-8036-42E4A3E88FBE}.Debug|x64.Build.0 = Debug|x64 + {4564B30C-656E-4897-8036-42E4A3E88FBE}.Debug|x64.ActiveCfg = Debug|Win32 {4564B30C-656E-4897-8036-42E4A3E88FBE}.Debug|x86.ActiveCfg = Debug|Win32 {4564B30C-656E-4897-8036-42E4A3E88FBE}.Debug|x86.Build.0 = Debug|Win32 - {4564B30C-656E-4897-8036-42E4A3E88FBE}.Release|x64.ActiveCfg = Release|x64 - {4564B30C-656E-4897-8036-42E4A3E88FBE}.Release|x64.Build.0 = Release|x64 + {4564B30C-656E-4897-8036-42E4A3E88FBE}.Release|x64.ActiveCfg = Release|Win32 {4564B30C-656E-4897-8036-42E4A3E88FBE}.Release|x86.ActiveCfg = Release|Win32 {4564B30C-656E-4897-8036-42E4A3E88FBE}.Release|x86.Build.0 = Release|Win32 {D3EC4B41-9124-4C7E-B2B8-01E85EEC750D}.Debug|x64.ActiveCfg = Debug|x64 diff --git a/winamp/winamp.vcxproj b/winamp/winamp.vcxproj index 046736a..eeb5540 100644 --- a/winamp/winamp.vcxproj +++ b/winamp/winamp.vcxproj @@ -9,14 +9,6 @@ Release Win32 - - Debug - x64 - - - Release - x64 - 16.0 @@ -39,19 +31,6 @@ true Unicode - - DynamicLibrary - true - v142 - Unicode - - - DynamicLibrary - false - v142 - true - Unicode - @@ -63,12 +42,6 @@ - - - - - - true @@ -82,18 +55,6 @@ $(SolutionDir)output\$(Platform)\$(Configuration)\ nsfplug - - true - $(SolutionDir)intermediate\$(Platform)\$(Configuration)\$(ProjectName)\ - $(SolutionDir)output\$(Platform)\$(Configuration)\ - nsfplug - - - false - $(SolutionDir)intermediate\$(Platform)\$(Configuration)\$(ProjectName)\ - $(SolutionDir)output\$(Platform)\$(Configuration)\ - nsfplug - Level4 @@ -136,48 +97,6 @@ $(OutDir)nsfplaycore.lib;%(AdditionalDependencies) - - - Level4 - true - _DEBUG;WINAMP_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - true - NotUsing - pch.h - MultiThreadedDebug - ..\include\ - true - - - Windows - true - false - $(OutDir)nsfplaycore.lib;%(AdditionalDependencies) - - - - - Level4 - true - true - true - NDEBUG;WINAMP_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - true - NotUsing - pch.h - MultiThreaded - ..\include\ - true - - - Windows - true - true - true - false - $(OutDir)nsfplaycore.lib;%(AdditionalDependencies) - -