RPCS3/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2024-11-22 10:42:36 +01:00
Code Issues Releases Wiki Activity

xaudio2: use system library instead of xaudio2redist

Browse Source
This commit is contained in:
oltolm 2023-08-16 23:33:04 +02:00 committed by Elad.Ash
parent 83256cdacb
commit 3e83729cb2
8 changed files with 176 additions and 1466 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1276
3rdparty/XAudio2Redist/include/xaudio2redist.h vendored
View File

File diff suppressed because it is too large Load Diff

BIN
3rdparty/XAudio2Redist/libs/xaudio2_9redist.lib vendored
View File

Binary file not shown.

BIN
bin/xaudio2_9redist.dll
View File

Binary file not shown.

4
rpcs3/Emu/Audio/XAudio2/XAudio2Backend.cpp
View File

@ -12,10 +12,6 @@
#include <Windows.h> #include <Windows.h>
#include <system_error> #include <system_error>
#ifdef _MSC_VER
#pragma comment(lib, "xaudio2_9redist.lib")
#endif
#ifndef XAUDIO2_USE_DEFAULT_PROCESSOR #ifndef XAUDIO2_USE_DEFAULT_PROCESSOR
#define XAUDIO2_USE_DEFAULT_PROCESSOR XAUDIO2_DEFAULT_PROCESSOR #define XAUDIO2_USE_DEFAULT_PROCESSOR XAUDIO2_DEFAULT_PROCESSOR
#endif #endif

4
rpcs3/Emu/Audio/XAudio2/XAudio2Backend.h
View File

@ -8,12 +8,8 @@
#include "Utilities/mutex.h" #include "Utilities/mutex.h"
#include "Emu/Audio/AudioBackend.h" #include "Emu/Audio/AudioBackend.h"
#ifdef _MSC_VER
#include <xaudio2redist.h>
#else
#include <initguid.h> #include <initguid.h>
#include <xaudio2.h> #include <xaudio2.h>
#endif
#include <wrl/client.h> #include <wrl/client.h>
#include <MMDeviceAPI.h> #include <MMDeviceAPI.h>

8
rpcs3/Emu/CMakeLists.txt
View File

@ -141,12 +141,8 @@ if(USE_FAUDIO)
endif() endif()
if(WIN32) if(WIN32)
target_include_directories(rpcs3_emu PUBLIC "${PROJECT_SOURCE_DIR}/3rdparty/XAudio2Redist/include") if(NOT MSVC)
if(MSVC) target_link_libraries(rpcs3_emu PRIVATE xaudio2_9)
target_link_libraries(rpcs3_emu PRIVATE "${PROJECT_SOURCE_DIR}/3rdparty/XAudio2Redist/libs/xaudio2_9redist.lib")
target_link_options(rpcs3_emu PRIVATE /DELAYLOAD:xaudio2_9redist.dll)
else()
target_link_libraries(rpcs3_emu PRIVATE xaudio2_8)
endif() endif()
target_sources(rpcs3_emu PRIVATE target_sources(rpcs3_emu PRIVATE
Audio/XAudio2/XAudio2Backend.cpp Audio/XAudio2/XAudio2Backend.cpp

2
rpcs3/XAudio.vcxproj
View File

@ -42,7 +42,7 @@
<PropertyGroup Label="UserMacros" /> <PropertyGroup Label="UserMacros" />
<ItemDefinitionGroup> <ItemDefinitionGroup>
<ClCompile> <ClCompile>
<AdditionalIncludeDirectories>..\3rdparty\XAudio2Redist\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization> <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
</ClCompile> </ClCompile>
</ItemDefinitionGroup> </ItemDefinitionGroup>

348
rpcs3/rpcs3.vcxproj
View File

File diff suppressed because it is too large Load Diff