Skip to content

Commit 2febd1f

Browse files
eizeiz
committed
Remove the build for 32-bit OSes. 32-bit SarAsio still supported.
1 parent 9c32715 commit 2febd1f

File tree

2 files changed

+8
-123
lines changed

2 files changed

+8
-123
lines changed

‎SarInstaller/Product.wxs

+6-119
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<?if $(var.Platform) = x64 ?>
3-
<?define bitness = "(64 bit)" ?>
4-
<?else ?>
5-
<?define bitness = "(32 bit)" ?>
6-
<?endif ?>
2+
<?define bitness = "(64 bit)" ?>
73

84
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
95
xmlns:difx="http://schemas.microsoft.com/wix/DifxAppExtension">
@@ -26,32 +22,16 @@
2622
<UIRef Id="WixUI_ErrorProgressText"/>
2723
<UIRef Id="SarUi"/>
2824

29-
<Feature Id="Main" Title="Synchronous Audio Router" Level="1">
30-
<?if $(var.Platform) = x64 ?>
25+
<Feature Id="Main" Title="Synchronous Audio Router" Level="1">
3126
<ComponentRef Id="KsDriver64"/>
32-
<?else ?>
33-
<ComponentRef Id="KsDriver32"/>
34-
<?endif ?>
35-
36-
<?if $(var.Platform) = x64 ?>
3727
<ComponentRef Id="AsioDriver64"/>
3828
<ComponentRef Id="AsioDriver64_32"/>
3929
<ComponentRef Id="SarConfigure64"/>
40-
<?else ?>
41-
<ComponentRef Id="AsioDriver32"/>
42-
<ComponentRef Id="SarConfigure32"/>
43-
<?endif ?>
44-
45-
<ComponentRef Id="ApplicationShortcut"/>
46-
</Feature>
30+
<ComponentRef Id="ApplicationShortcut"/>
31+
</Feature>
4732

48-
<?if $(var.Platform) = x64 ?>
49-
<Binary Id="SarInstallerActions"
50-
SourceFile="..\x64\Release\SarInstallerActions.dll"/>
51-
<?else ?>
52-
<Binary Id="SarInstallerActions"
53-
SourceFile="..\Release\SarInstallerActions.dll"/>
54-
<?endif ?>
33+
<Binary Id="SarInstallerActions"
34+
SourceFile="..\x64\Release\SarInstallerActions.dll"/>
5535

5636
<CustomAction Id="CreateDeviceNode.SetProperty"
5737
Return="check"
@@ -94,7 +74,6 @@
9474
</Directory>
9575
</Directory>
9676

97-
<?if $(var.Platform) = x64 ?>
9877
<DirectoryRef Id="INSTALLDIR64">
9978
<Component Id="KsDriver64"
10079
Guid="{48C7E358-9797-42F7-B86D-5AA1DD3E0E44}"
@@ -247,98 +226,6 @@
247226
KeyPath="yes"/>
248227
</Component>
249228
</DirectoryRef>
250-
<?else ?>
251-
<DirectoryRef Id="INSTALLDIR">
252-
<Component Id="KsDriver32"
253-
Guid="{865DF004-18BD-448C-A63B-BF3B758CAE99}"
254-
Win64="no">
255-
<File Id="SynchronousAudioRouter.sys"
256-
Name="SynchronousAudioRouter.sys"
257-
Source="..\Release\SynchronousAudioRouter.sys"
258-
KeyPath="yes"/>
259-
<File Id="SynchronousAudioRouter.cat"
260-
Name="SynchronousAudioRouter.cat"
261-
Source="..\Release\SynchronousAudioRouter\SynchronousAudioRouter.cat"
262-
KeyPath="no"/>
263-
<File Id="SynchronousAudioRouter.inf"
264-
Name="SynchronousAudioRouter.inf"
265-
Source="..\Release\SynchronousAudioRouter\SynchronousAudioRouter.inf"
266-
KeyPath="no"/>
267-
<difx:Driver PlugAndPlayPrompt="no"/>
268-
</Component>
269-
270-
<Component Id="AsioDriver32"
271-
Guid="{FFBEFDDB-FBC6-4CE5-9187-267DE9BB93D9}"
272-
Win64="no">
273-
<File Id="SarAsio.dll"
274-
Name="SarAsio.dll"
275-
Source="..\Release\SarAsio.dll"
276-
KeyPath="yes"/>
277-
<!--<File Id="SarCtl.exe" Source="..\x64\Release\SarCtl.exe" KeyPath="no"/>-->
278-
<RegistryValue Root="HKCR"
279-
Key="CLSID\{0569D852-1F6A-44A7-B7B5-EFB78B66BE21}\InProcServer32"
280-
Value="[#SarAsio.dll]"
281-
Type="string"
282-
Action="write" />
283-
<RegistryValue Root="HKCR"
284-
Key="CLSID\{0569D852-1F6A-44A7-B7B5-EFB78B66BE21}\InProcServer32"
285-
Name="ThreadingModel"
286-
Value="Apartment"
287-
Type="string"
288-
Action="write" />
289-
<RegistryValue Root="HKCR"
290-
Key="CLSID\{9FB96668-9EDD-4574-AD77-76BD89659D5D}\InProcServer32"
291-
Value="[#SarAsio.dll]"
292-
Type="string"
293-
Action="write" />
294-
<RegistryValue Root="HKCR"
295-
Key="CLSID\{9FB96668-9EDD-4574-AD77-76BD89659D5D}\InProcServer32"
296-
Name="ThreadingModel"
297-
Value="both"
298-
Type="string"
299-
Action="write" />
300-
<RegistryValue Root="HKCR"
301-
Key="CLSID\{739191CC-CCBE-45D8-8D24-828D8E989E8E}\InProcServer32"
302-
Value="[#SarAsio.dll]"
303-
Type="string"
304-
Action="write" />
305-
<RegistryValue Root="HKCR"
306-
Key="CLSID\{739191CC-CCBE-45D8-8D24-828D8E989E8E}\InProcServer32"
307-
Name="ThreadingModel"
308-
Value="free"
309-
Type="string"
310-
Action="write" />
311-
<RegistryValue Root="HKCR"
312-
Key="CLSID\{0569D852-1F6A-44A7-B7B5-EFB78B66BE21}\ProgID"
313-
Value="SynchronousAudioRouter.1"
314-
Type="string"
315-
Action="write" />
316-
<RegistryValue Root="HKCR"
317-
Key="CLSID\{0569D852-1F6A-44A7-B7B5-EFB78B66BE21}"
318-
Value="Synchronous Audio Router ASIO"
319-
Type="string"
320-
Action="write" />
321-
<RegistryValue Root="HKLM" Key="SOFTWARE\ASIO\Synchronous Audio Router"
322-
Name="CLSID" Value="{0569D852-1F6A-44A7-B7B5-EFB78B66BE21}"
323-
Type="string"
324-
Action="write" />
325-
<RegistryValue Root="HKLM"
326-
Key="SOFTWARE\ASIO\Synchronous Audio Router"
327-
Name="Description"
328-
Value="Synchronous Audio Router"
329-
Type="string"
330-
Action="write" />
331-
</Component>
332-
<Component Id="SarConfigure32"
333-
Guid="{768F46C3-E17B-41C0-88BA-BCA4C6526A78}"
334-
Win64="no">
335-
<File Id="SarConfigure.exe"
336-
Name="SarConfigure.exe"
337-
Source="..\Release\SarConfigure.exe"
338-
KeyPath="yes"/>
339-
</Component>
340-
</DirectoryRef>
341-
<?endif ?>
342229

343230
<DirectoryRef Id="ApplicationProgramsFolder">
344231
<Component Id="ApplicationShortcut" Guid="{BB519534-E09F-4424-BE20-48116DF6B8E8}">

‎SynchronousAudioRouter.sln

+2-4
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ Global
4646
{E918EA5F-86DD-4175-A879-D0C143290750}.Release|ARM64.Build.0 = Release|ARM64
4747
{E918EA5F-86DD-4175-A879-D0C143290750}.Release|x64.ActiveCfg = Release|x64
4848
{E918EA5F-86DD-4175-A879-D0C143290750}.Release|x64.Build.0 = Release|x64
49-
{E918EA5F-86DD-4175-A879-D0C143290750}.Release|x86.ActiveCfg = Release|Win32
50-
{E918EA5F-86DD-4175-A879-D0C143290750}.Release|x86.Build.0 = Release|Win32
49+
{E918EA5F-86DD-4175-A879-D0C143290750}.Release|x86.ActiveCfg = Release|x64
50+
{E918EA5F-86DD-4175-A879-D0C143290750}.Release|x86.Build.0 = Release|x64
5151
{69A577D3-A856-45E6-88D5-9DDE7342A50E}.Debug|ARM.ActiveCfg = Debug|Win32
5252
{69A577D3-A856-45E6-88D5-9DDE7342A50E}.Debug|ARM64.ActiveCfg = Debug|Win32
5353
{69A577D3-A856-45E6-88D5-9DDE7342A50E}.Debug|x64.ActiveCfg = Debug|x64
@@ -82,7 +82,6 @@ Global
8282
{C13B0688-9AE1-412F-83C7-1745C303C4B3}.Release|x64.ActiveCfg = Release|x64
8383
{C13B0688-9AE1-412F-83C7-1745C303C4B3}.Release|x64.Build.0 = Release|x64
8484
{C13B0688-9AE1-412F-83C7-1745C303C4B3}.Release|x86.ActiveCfg = Release|x86
85-
{C13B0688-9AE1-412F-83C7-1745C303C4B3}.Release|x86.Build.0 = Release|x86
8685
{D7CBDD84-368E-4E50-8196-8BF372DF648E}.Debug|ARM.ActiveCfg = Debug|Win32
8786
{D7CBDD84-368E-4E50-8196-8BF372DF648E}.Debug|ARM64.ActiveCfg = Debug|Win32
8887
{D7CBDD84-368E-4E50-8196-8BF372DF648E}.Debug|x64.ActiveCfg = Debug|Win32
@@ -95,7 +94,6 @@ Global
9594
{D7CBDD84-368E-4E50-8196-8BF372DF648E}.Release|x64.ActiveCfg = Release|x64
9695
{D7CBDD84-368E-4E50-8196-8BF372DF648E}.Release|x64.Build.0 = Release|x64
9796
{D7CBDD84-368E-4E50-8196-8BF372DF648E}.Release|x86.ActiveCfg = Release|Win32
98-
{D7CBDD84-368E-4E50-8196-8BF372DF648E}.Release|x86.Build.0 = Release|Win32
9997
{D7CBDD84-368E-4E50-8196-8BF372DF648E}.Release|x86.Deploy.0 = Release|Win32
10098
{E298CAAC-9EBF-4DF9-9161-9DD48199E31D}.Debug|ARM.ActiveCfg = Debug|Win32
10199
{E298CAAC-9EBF-4DF9-9161-9DD48199E31D}.Debug|ARM64.ActiveCfg = Debug|Win32

0 commit comments

Comments
 (0)