archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-05 14:31:24 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

Audio: don’t build XAudio2 backend on Linux

Browse source 
The files already had a #ifdef _WIN32, but this avoid even trying to
compile their translation unit.

I was surprised to see XAudio2 being mentioned on Linux, this makes sure
no one else will get this surprise.
This commit is contained in:
Emmanuel Gil Peyrot 2019-10-22 23:59:09 +02:00 • committed by Ivan
parent a360836fef
commit 9253f7d645
5 changed files with 17 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

6
rpcs3/Emu/Audio/XAudio2/XAudio27Backend.cpp
View file

@ -1,4 +1,6 @@
#ifdef _WIN32 #ifndef _WIN32
#error "XAudio27 can only be built on Windows."
#endif
#include "Utilities/Log.h" #include "Utilities/Log.h"
#include "Utilities/StrFmt.h" #include "Utilities/StrFmt.h"
@ -199,5 +201,3 @@ XAudio2Backend::XAudio2Library* XAudio2Backend::xa27_init(void* lib2_7)
{ {
return new XAudio27Library(lib2_7); return new XAudio27Library(lib2_7);
} }
#endif

6
rpcs3/Emu/Audio/XAudio2/XAudio28Backend.cpp
View file

@ -1,4 +1,6 @@
#ifdef _WIN32 #ifndef _WIN32
#error "XAudio28 can only be built on Windows."
#endif
#include "Utilities/Log.h" #include "Utilities/Log.h"
#include "Utilities/StrFmt.h" #include "Utilities/StrFmt.h"
@ -211,5 +213,3 @@ XAudio2Backend::XAudio2Library* XAudio2Backend::xa28_init(void* lib2_8)
{ {
return new XAudio28Library(lib2_8); return new XAudio28Library(lib2_8);
} }
#endif

6
rpcs3/Emu/Audio/XAudio2/XAudio2Backend.cpp
View file

@ -1,4 +1,6 @@
#ifdef _WIN32 #ifndef _WIN32
#error "XAudio2 can only be built on Windows."
#endif
#include "Utilities/Log.h" #include "Utilities/Log.h"
#include "Utilities/StrFmt.h" #include "Utilities/StrFmt.h"
@ -88,5 +90,3 @@ f32 XAudio2Backend::SetFrequencyRatio(f32 new_ratio)
{ {
return lib->set_freq_ratio(new_ratio); return lib->set_freq_ratio(new_ratio);
} }
#endif

6
rpcs3/Emu/Audio/XAudio2/XAudio2Backend.h
View file

@ -1,6 +1,8 @@
#pragma once #pragma once
#ifdef _WIN32 #ifndef _WIN32
#error "XAudio2 can only be built on Windows."
#endif
#include "Emu/Audio/AudioBackend.h" #include "Emu/Audio/AudioBackend.h"
@ -49,5 +51,3 @@ public:
virtual u64 GetNumEnqueuedSamples() override; virtual u64 GetNumEnqueuedSamples() override;
virtual f32 SetFrequencyRatio(f32 new_ratio) override; virtual f32 SetFrequencyRatio(f32 new_ratio) override;
}; };
#endif

8
rpcs3/Emu/CMakeLists.txt
View file

@ -90,12 +90,14 @@ target_sources(rpcs3_emu PRIVATE
Audio/AL/OpenALBackend.cpp Audio/AL/OpenALBackend.cpp
Audio/ALSA/ALSABackend.cpp Audio/ALSA/ALSABackend.cpp
Audio/Pulse/PulseBackend.cpp Audio/Pulse/PulseBackend.cpp
Audio/XAudio2/XAudio27Backend.cpp
Audio/XAudio2/XAudio28Backend.cpp
Audio/XAudio2/XAudio2Backend.cpp
) )
if(WIN32) if(WIN32)
target_sources(rpcs3_emu PRIVATE
Audio/XAudio2/XAudio27Backend.cpp
Audio/XAudio2/XAudio28Backend.cpp
Audio/XAudio2/XAudio2Backend.cpp
)
# Slimmed down version of minidx9 for XAudio2_7 only # Slimmed down version of minidx9 for XAudio2_7 only
include_directories(BEFORE "${RPCS3_SRC_DIR}/../3rdparty/XAudio2_7") include_directories(BEFORE "${RPCS3_SRC_DIR}/../3rdparty/XAudio2_7")
endif() endif()