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
bbbradsmith · Mar 31, 2024 · e641b3b · e641b3b
1 parent 4bb1999
commit e641b3b
Show file tree

Hide file tree

Showing 3 changed files with 51 additions and 136 deletions.
diff --git 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
@@ -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
@@ -9,14 +9,6 @@
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <VCProjectVersion>16.0</VCProjectVersion>
@@ -39,19 +31,6 @@
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
@@ -63,12 +42,6 @@
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
@@ -82,18 +55,6 @@
     <OutDir>$(SolutionDir)output\$(Platform)\$(Configuration)\</OutDir>
     <TargetName>nsfplug</TargetName>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <LinkIncremental>true</LinkIncremental>
-    <IntDir>$(SolutionDir)intermediate\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
-    <OutDir>$(SolutionDir)output\$(Platform)\$(Configuration)\</OutDir>
-    <TargetName>nsfplug</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LinkIncremental>false</LinkIncremental>
-    <IntDir>$(SolutionDir)intermediate\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
-    <OutDir>$(SolutionDir)output\$(Platform)\$(Configuration)\</OutDir>
-    <TargetName>nsfplug</TargetName>
-  </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <WarningLevel>Level4</WarningLevel>
@@ -136,48 +97,6 @@
       <AdditionalDependencies>$(OutDir)nsfplaycore.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <WarningLevel>Level4</WarningLevel>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>_DEBUG;WINAMP_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <AdditionalIncludeDirectories>..\include\</AdditionalIncludeDirectories>
-      <TreatWarningAsError>true</TreatWarningAsError>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableUAC>false</EnableUAC>
-      <AdditionalDependencies>$(OutDir)nsfplaycore.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level4</WarningLevel>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>NDEBUG;WINAMP_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <AdditionalIncludeDirectories>..\include\</AdditionalIncludeDirectories>
-      <TreatWarningAsError>true</TreatWarningAsError>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableUAC>false</EnableUAC>
-      <AdditionalDependencies>$(OutDir)nsfplaycore.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="dllmain.cpp" />
   </ItemGroup>