ShuriZma
/
rpcs3
mirror of https://github.com/RPCS3/rpcs3.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make ALSA optional

This commit is contained in:
Jan Beich 2017-08-03 22:43:27 +00:00 committed by Ani
parent 2d7e91ba8a
commit 40d305b35d
6 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
rpcs3/CMakeLists.txt
View File

@ -127,7 +127,7 @@ endif()
if(${CMAKE_SYSTEM_NAME} MATCHES "Linux") if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
#on some Linux distros shm_unlink and similar functions are in librt only #on some Linux distros shm_unlink and similar functions are in librt only
set(ADDITIONAL_LIBS "rt" "X11" "asound") set(ADDITIONAL_LIBS "rt" "X11")
elseif(NOT MSVC AND NOT CMAKE_CXX_FLAGS MATCHES "LIBICONV_PLUG") elseif(NOT MSVC AND NOT CMAKE_CXX_FLAGS MATCHES "LIBICONV_PLUG")
#it seems like glibc includes the iconv functions we use but other libc #it seems like glibc includes the iconv functions we use but other libc
#implementations like the one on OSX don't seem implement them #implementations like the one on OSX don't seem implement them
@ -158,9 +158,19 @@ elseif(WIN32)
set(PLATFORM_ARCH "Windows/x86_64") set(PLATFORM_ARCH "Windows/x86_64")
else() else()
set(PLATFORM_ARCH "linux/x86_64") set(PLATFORM_ARCH "linux/x86_64")
option(USE_ALSA "ALSA audio backend" ON)
option(USE_LIBEVDEV "libevdev-based joystick support" ON) option(USE_LIBEVDEV "libevdev-based joystick support" ON)
endif() endif()
if(USE_ALSA)
find_package(PkgConfig)
pkg_check_modules(ALSA alsa)
if(ALSA_FOUND)
add_definitions(-DHAVE_ALSA)
include_directories(SYSTEM ${ALSA_INCLUDE_DIRS})
list(APPEND ADDITIONAL_LIBS ${ALSA_LDFLAGS})
endif()
endif()
if(USE_LIBEVDEV) if(USE_LIBEVDEV)
find_package(PkgConfig) find_package(PkgConfig)
pkg_check_modules(LIBEVDEV libevdev) pkg_check_modules(LIBEVDEV libevdev)

2
rpcs3/Emu/Audio/ALSA/ALSAThread.cpp
View File

@ -4,7 +4,7 @@
#include "ALSAThread.h" #include "ALSAThread.h"
#ifdef __linux__ #ifdef HAVE_ALSA
#include <alsa/asoundlib.h> #include <alsa/asoundlib.h>

2
rpcs3/Emu/Audio/ALSA/ALSAThread.h
View File

@ -1,6 +1,6 @@
#pragma once #pragma once
#ifdef __linux__ #ifdef HAVE_ALSA
#include "Emu/Audio/AudioThread.h" #include "Emu/Audio/AudioThread.h"

2
rpcs3/Emu/System.cpp
View File

@ -166,7 +166,7 @@ void fmt_class_string<audio_renderer>::format(std::string& out, u64 arg)
case audio_renderer::null: return "Null"; case audio_renderer::null: return "Null";
#ifdef _WIN32 #ifdef _WIN32
case audio_renderer::xaudio: return "XAudio2"; case audio_renderer::xaudio: return "XAudio2";
#elif __linux__ #elif defined(HAVE_ALSA)
case audio_renderer::alsa: return "ALSA"; case audio_renderer::alsa: return "ALSA";
#endif #endif
case audio_renderer::openal: return "OpenAL"; case audio_renderer::openal: return "OpenAL";

2
rpcs3/Emu/System.h
View File

@ -88,7 +88,7 @@ enum class audio_renderer
null, null,
#ifdef _WIN32 #ifdef _WIN32
xaudio, xaudio,
#elif __linux__ #elif defined(HAVE_ALSA)
alsa, alsa,
#endif #endif
openal, openal,

4
rpcs3/rpcs3_app.cpp
View File

@ -45,7 +45,7 @@
#ifdef _WIN32 #ifdef _WIN32
#include "Emu/Audio/XAudio2/XAudio2Thread.h" #include "Emu/Audio/XAudio2/XAudio2Thread.h"
#endif #endif
#ifdef __linux__ #ifdef HAVE_ALSA
#include "Emu/Audio/ALSA/ALSAThread.h" #include "Emu/Audio/ALSA/ALSAThread.h"
#endif #endif
@ -199,7 +199,7 @@ void rpcs3_app::InitializeCallbacks()
case audio_renderer::null: return std::make_shared<NullAudioThread>(); case audio_renderer::null: return std::make_shared<NullAudioThread>();
#ifdef _WIN32 #ifdef _WIN32
case audio_renderer::xaudio: return std::make_shared<XAudio2Thread>(); case audio_renderer::xaudio: return std::make_shared<XAudio2Thread>();
#elif __linux__ #elif defined(HAVE_ALSA)
case audio_renderer::alsa: return std::make_shared<ALSAThread>(); case audio_renderer::alsa: return std::make_shared<ALSAThread>();
#endif #endif
case audio_renderer::openal: return std::make_shared<OpenALThread>(); case audio_renderer::openal: return std::make_shared<OpenALThread>();