WallyHackenslacker/Aerofoil
1
0
Fork 0
mirror of https://github.com/elasota/Aerofoil.git synced 2025-12-14 20:19:38 +00:00
Code Issues Projects Releases Wiki Activity

Use XAudio 2.9 redistributable instead of 2.9 SDK. Should fix Win7 compatibility.

Browse Source
This commit is contained in:
elasota
2020-05-31 21:19:51 -04:00
parent c856607f46
commit a4abb0d95f
6 changed files with 25 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@@ -28,6 +28,8 @@ InstallerPackages/*
*.msi *.msi
*.wixpdb *.wixpdb
*.wixobj *.wixobj
*.CopyComplete
ReleasePackageInstaller/obj/* ReleasePackageInstaller/obj/*
ReleasePackageInstaller/bin/* ReleasePackageInstaller/bin/*
ReleasePackageInstaller/AerofoilPackageDefs.wxi ReleasePackageInstaller/AerofoilPackageDefs.wxi
packages/*

10
GpAudioDriver_XAudio2/GpAudioDriver_XAudio2.vcxproj
View File

@@ -132,7 +132,17 @@
<ClCompile Include="GpAudioDriverFactoryXAudio2.cpp" /> <ClCompile Include="GpAudioDriverFactoryXAudio2.cpp" />
<ClCompile Include="GpAudioDriverXAudio2.cpp" /> <ClCompile Include="GpAudioDriverXAudio2.cpp" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets"> <ImportGroup Label="ExtensionTargets">
<Import Project="..\packages\Microsoft.XAudio2.Redist.1.2.1\build\native\Microsoft.XAudio2.Redist.targets" Condition="Exists('..\packages\Microsoft.XAudio2.Redist.1.2.1\build\native\Microsoft.XAudio2.Redist.targets')" />
</ImportGroup> </ImportGroup>
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\packages\Microsoft.XAudio2.Redist.1.2.1\build\native\Microsoft.XAudio2.Redist.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.XAudio2.Redist.1.2.1\build\native\Microsoft.XAudio2.Redist.targets'))" />
</Target>
</Project> </Project>

3
GpAudioDriver_XAudio2/GpAudioDriver_XAudio2.vcxproj.filters
View File

@@ -42,4 +42,7 @@
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
</Project> </Project>

4
GpAudioDriver_XAudio2/packages.config Normal file
View File

@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Microsoft.XAudio2.Redist" version="1.2.1" targetFramework="native" />
</packages>

1
MakeRelease.bat
View File

@@ -9,6 +9,7 @@ mkdir ReleasePkg\Aerofoil\Tools
copy /Y x64\Release\Aerofoil.exe ReleasePkg\Aerofoil copy /Y x64\Release\Aerofoil.exe ReleasePkg\Aerofoil
copy /Y x64\Release\GpAudioDriver_XAudio2.dll ReleasePkg\Aerofoil copy /Y x64\Release\GpAudioDriver_XAudio2.dll ReleasePkg\Aerofoil
copy /Y x64\Release\xaudio2_9redist.dll ReleasePkg\Aerofoil
copy /Y x64\Release\GpDisplayDriver_D3D11.dll ReleasePkg\Aerofoil copy /Y x64\Release\GpDisplayDriver_D3D11.dll ReleasePkg\Aerofoil
copy /Y x64\Release\GpInputDriver_XInput.dll ReleasePkg\Aerofoil copy /Y x64\Release\GpInputDriver_XInput.dll ReleasePkg\Aerofoil
copy /Y x64\Release\FreeType.dll ReleasePkg\Aerofoil copy /Y x64\Release\FreeType.dll ReleasePkg\Aerofoil

4
ReleasePackageInstaller/Product.wxs
View File

@@ -63,6 +63,9 @@
<Component Id="GpAudioDriver_XAudio2.dll" Guid="*"> <Component Id="GpAudioDriver_XAudio2.dll" Guid="*">
<File Id="GpAudioDriver_XAudio2.dll" Source="$(var.GpAudioDriver_XAudio2.TargetPath)" KeyPath="yes" Checksum="yes"/> <File Id="GpAudioDriver_XAudio2.dll" Source="$(var.GpAudioDriver_XAudio2.TargetPath)" KeyPath="yes" Checksum="yes"/>
</Component> </Component>
<Component Id="xaudio2_9redist.dll" Guid="*">
<File Id="xaudio2_9redist.dll" Source="$(var.GpAudioDriver_XAudio2.TargetDir)xaudio2_9redist.dll" KeyPath="yes" Checksum="yes"/>
</Component>
<Component Id="GpDisplayDriver_D3D11.dll" Guid="*"> <Component Id="GpDisplayDriver_D3D11.dll" Guid="*">
<File Id="GpDisplayDriver_D3D11.dll" Source="$(var.GpDisplayDriver_D3D11.TargetPath)" KeyPath="yes" Checksum="yes"/> <File Id="GpDisplayDriver_D3D11.dll" Source="$(var.GpDisplayDriver_D3D11.TargetPath)" KeyPath="yes" Checksum="yes"/>
</Component> </Component>
@@ -132,6 +135,7 @@
<ComponentRef Id="FreeType.dll" /> <ComponentRef Id="FreeType.dll" />
<ComponentRef Id="GpApp.dll" /> <ComponentRef Id="GpApp.dll" />
<ComponentRef Id="GpAudioDriver_XAudio2.dll" /> <ComponentRef Id="GpAudioDriver_XAudio2.dll" />
<ComponentRef Id="xaudio2_9redist.dll" />
<ComponentRef Id="GpDisplayDriver_D3D11.dll" /> <ComponentRef Id="GpDisplayDriver_D3D11.dll" />
<ComponentRef Id="GpInputDriver_XInput.dll" /> <ComponentRef Id="GpInputDriver_XInput.dll" />