Skip to content

Commit 3bb98ec

Browse files
melanchallmelanchall
committed
Get rid of 32-bit support for Multimedia API on Windows
1 parent c49414a commit 3bb98ec

File tree

10 files changed

+5
-91
lines changed

10 files changed

+5
-91
lines changed

‎DryWetMidi.Tests/Melanchall.DryWetMidi.Tests.csproj‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,6 @@
4141
</ItemGroup>
4242

4343
<ItemGroup>
44-
<None Include="..\DryWetMidi\Melanchall_DryWetMidi_Native32.dll">
45-
<Link>Melanchall_DryWetMidi_Native32.dll</Link>
46-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
47-
</None>
4844
<None Include="..\DryWetMidi\Melanchall_DryWetMidi_Native64.dll">
4945
<Link>Melanchall_DryWetMidi_Native64.dll</Link>
5046
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

‎DryWetMidi/Melanchall.DryWetMidi.csproj‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,10 +63,6 @@
6363
</PropertyGroup>
6464

6565
<ItemGroup Label="Native">
66-
<None Include="Melanchall_DryWetMidi_Native32.dll">
67-
<PackagePath>build\</PackagePath>
68-
<Pack>true</Pack>
69-
</None>
7066
<None Include="Melanchall_DryWetMidi_Native64.dll">
7167
<PackagePath>build\</PackagePath>
7268
<Pack>true</Pack>

‎DryWetMidi/Melanchall.DryWetMidi.targets‎

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,13 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup>
4-
<None Include="$(MSBuildThisFileDirectory)Melanchall_DryWetMidi_Native32.dll">
5-
<Visible>false</Visible>
6-
<Link>Melanchall_DryWetMidi_Native32.dll</Link>
7-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
8-
</None>
9-
<None Include="$(MSBuildThisFileDirectory)Melanchall_DryWetMidi_Native64.dll">
10-
<Visible>false</Visible>
4+
<None Include="$(MSBuildThisFileDirectory)Melanchall_DryWetMidi_Native64.dll">
5+
<Visible>false</Visible>
116
<Link>Melanchall_DryWetMidi_Native64.dll</Link>
127
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
138
</None>
14-
<None Include="$(MSBuildThisFileDirectory)Melanchall_DryWetMidi_Native64.dylib">
15-
<Visible>false</Visible>
9+
<None Include="$(MSBuildThisFileDirectory)Melanchall_DryWetMidi_Native64.dylib">
10+
<Visible>false</Visible>
1611
<Link>Melanchall_DryWetMidi_Native64.dylib</Link>
1712
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
1813
</None>

‎DryWetMidi/Multimedia/NativeApi.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ public enum MidiMessage
5252

5353
#region Constants
5454

55-
protected const string LibraryName32 = "Melanchall_DryWetMidi_Native32";
5655
protected const string LibraryName64 = "Melanchall_DryWetMidi_Native64";
5756

5857
private static readonly Dictionary<NativeErrorType, string> ErrorsDescriptions = new Dictionary<NativeErrorType, string>

‎Resources/CI/Templates/stage-build-native-libs.yaml‎

Lines changed: 1 addition & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ stages:
55
- job: BuildDll64
66
displayName: 'Build 64-bit dll'
77
pool:
8-
vmImage: 'windows-2022'
8+
vmImage: 'windows-latest'
99
steps:
1010
- task: PowerShell@2
1111
displayName: 'Build dll'
@@ -46,38 +46,4 @@ stages:
4646
inputs:
4747
targetPath: 'Resources/Native/Melanchall_DryWetMidi_Native64.dylib'
4848
artifactName: 'Melanchall_DryWetMidi_Native64.dylib'
49-
artifactType: pipeline
50-
- job: BuildDll32
51-
displayName: 'Build 32-bit dll'
52-
pool:
53-
vmImage: 'windows-2022'
54-
steps:
55-
- task: PowerShell@2
56-
displayName: 'Build dll'
57-
inputs:
58-
targetType: 'inline'
59-
script: |
60-
Write-Host "Downloading winlibs..."
61-
$ProgressPreference = 'SilentlyContinue'
62-
Invoke-WebRequest -Uri "https://github.com/brechtsanders/winlibs_mingw/releases/download/11.1.0-12.0.0-9.0.0-r1/winlibs-i686-posix-dwarf-gcc-11.1.0-mingw-w64-9.0.0-r1.zip" -OutFile "winlibs.zip"
63-
Write-Host "Downloaded."
64-
65-
Write-Host "Extracting winlibs..."
66-
Expand-Archive -LiteralPath 'winlibs.zip' -DestinationPath "winlibs"
67-
Write-Host "Extracted."
68-
69-
Write-Host "Building DLL..."
70-
$gccPath = Get-ChildItem -Path "winlibs" -File -Filter "i686-w64-mingw32-gcc.exe" -Recurse
71-
72-
cd Resources\Native
73-
Write-Host "Step 1"
74-
& $gccPath.FullName -c NativeApi-Windows.cpp -m32 -lwinmm -lstdc++
75-
Write-Host "Step 2"
76-
& $gccPath.FullName -shared -o Melanchall_DryWetMidi_Native32.dll NativeApi-Windows.o -m32 -lwinmm -lstdc++
77-
Write-Host "Built."
78-
- task: PublishPipelineArtifact@1
79-
displayName: 'Publish dll artifact'
80-
inputs:
81-
targetPath: 'Resources\Native\Melanchall_DryWetMidi_Native32.dll'
82-
artifactName: 'Melanchall_DryWetMidi_Native32.dll'
8349
artifactType: pipeline

‎Resources/CI/test-netframework-package-integration.yaml‎

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,6 @@ stages:
4141
jobs:
4242
- job: TestPackageIntegration
4343
displayName: Test package integration
44-
strategy:
45-
matrix:
46-
32Bit:
47-
prefer32Bit: 'true'
48-
64Bit:
49-
prefer32Bit: 'false'
5044
steps:
5145
- task: DownloadPipelineArtifact@2
5246
displayName: Download NuGet package
@@ -78,26 +72,6 @@ stages:
7872
7973
$path = Resolve-Path 'Resources\PackageIntegrationTestUtilities\DwmNetFrameworkConsoleApp\DwmNetFrameworkConsoleApp\packages.config'
8074
$xml.Save($path)
81-
82-
- task: PowerShell@2
83-
displayName: Set csproj elements
84-
inputs:
85-
targetType: 'inline'
86-
script: |
87-
Write-Host "Parsing csproj..."
88-
[xml]$xml = Get-Content -Path 'Resources\PackageIntegrationTestUtilities\DwmNetFrameworkConsoleApp\DwmNetFrameworkConsoleApp\DwmNetFrameworkConsoleApp.csproj'
89-
90-
Write-Host "Setting 'Prefer 32-bit to' $(prefer32Bit)..."
91-
$xml.Project.PropertyGroup[1].Prefer32Bit = '$(prefer32Bit)'
92-
$xml.Project.PropertyGroup[2].Prefer32Bit = '$(prefer32Bit)'
93-
94-
Write-Host "Saving csproj..."
95-
$path = Resolve-Path 'Resources\PackageIntegrationTestUtilities\DwmNetFrameworkConsoleApp\DwmNetFrameworkConsoleApp\DwmNetFrameworkConsoleApp.csproj'
96-
$xml.Save($path)
97-
98-
Write-Host "Displaying csproj content..."
99-
$content = Get-Content -Path 'Resources\PackageIntegrationTestUtilities\DwmNetFrameworkConsoleApp\DwmNetFrameworkConsoleApp\DwmNetFrameworkConsoleApp.csproj'
100-
Write-Host $content
10175
10276
- task: PowerShell@2
10377
displayName: Restore packages

‎Resources/Nativeless/delete-files-list.txt‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ DryWetMidi\Multimedia\MidiDevice.cs
99

1010
DryWetMidi\Multimedia\InputDevice\InputDevice.cs
1111
DryWetMidi\Multimedia\InputDevice\InputDeviceApi.cs
12-
DryWetMidi\Multimedia\InputDevice\InputDeviceApi32.cs
1312
DryWetMidi\Multimedia\InputDevice\InputDeviceApi64.cs
1413
DryWetMidi\Multimedia\InputDevice\InputDeviceApiProvider.cs
1514
DryWetMidi\Multimedia\InputDevice\InputDeviceCheckpointsNames.cs
@@ -18,7 +17,6 @@ DryWetMidi\Multimedia\InputDevice\MidiTimeCodeReceivedEventArgs.cs
1817

1918
DryWetMidi\Multimedia\OutputDevice\OutputDevice.cs
2019
DryWetMidi\Multimedia\OutputDevice\OutputDeviceApi.cs
21-
DryWetMidi\Multimedia\OutputDevice\OutputDeviceApi32.cs
2220
DryWetMidi\Multimedia\OutputDevice\OutputDeviceApi64.cs
2321
DryWetMidi\Multimedia\OutputDevice\OutputDeviceApiProvider.cs
2422
DryWetMidi\Multimedia\OutputDevice\OutputDeviceCheckpointsNames.cs
@@ -28,7 +26,6 @@ DryWetMidi\Multimedia\OutputDevice\OutputDeviceTechnology.cs
2826

2927
DryWetMidi\Multimedia\Clock\TickGenerator\Session
3028
DryWetMidi\Multimedia\Clock\TickGenerator\TickGeneratorApi.cs
31-
DryWetMidi\Multimedia\Clock\TickGenerator\TickGeneratorApi32.cs
3229
DryWetMidi\Multimedia\Clock\TickGenerator\TickGeneratorApi64.cs
3330
DryWetMidi\Multimedia\Clock\TickGenerator\TickGeneratorApiProvider.cs
3431
DryWetMidi\Multimedia\Clock\TickGenerator\TickGeneratorException.cs

‎Utilities/CheckDwmApi/Melanchall.CheckDwmApi.csproj‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,6 @@
1616
</ItemGroup>
1717

1818
<ItemGroup Label="Native">
19-
<None Include="..\..\DryWetMidi\Melanchall_DryWetMidi_Native32.dll">
20-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
21-
</None>
2219
<None Include="..\..\DryWetMidi\Melanchall_DryWetMidi_Native64.dll">
2320
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
2421
</None>

‎Utilities/ReceiveMidiData/Melanchall.ReceiveMidiData.csproj‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,6 @@
1414
</ItemGroup>
1515

1616
<ItemGroup Label="Native">
17-
<None Include="..\..\DryWetMidi\Melanchall_DryWetMidi_Native32.dll">
18-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
19-
</None>
2017
<None Include="..\..\DryWetMidi\Melanchall_DryWetMidi_Native64.dll">
2118
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
2219
</None>

‎Utilities/SendMidiData/Melanchall.SendMidiData.csproj‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,6 @@
1414
</ItemGroup>
1515

1616
<ItemGroup Label="Native">
17-
<None Include="..\..\DryWetMidi\Melanchall_DryWetMidi_Native32.dll">
18-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
19-
</None>
2017
<None Include="..\..\DryWetMidi\Melanchall_DryWetMidi_Native64.dll">
2118
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
2219
</None>

0 commit comments

Comments
 (0)