From 660bdaac19c699540f75e0aa323023940fb829b4 Mon Sep 17 00:00:00 2001 From: nakeee Date: Sun, 1 Mar 2009 00:07:17 +0000 Subject: [PATCH] enable experimental mic support on linux if port audio is found git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2491 8ced0084-cf51-0410-be5f-012b33b47a6e --- SConstruct | 4 ++++ Source/Core/Core/Src/HW/EXI_DeviceMic.cpp | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/SConstruct b/SConstruct index dd6795c153..ef2bd473b5 100644 --- a/SConstruct +++ b/SConstruct @@ -205,6 +205,9 @@ env['HAVE_BLUEZ'] = conf.CheckPKG('bluez') # needed for sound env['HAVE_AO'] = conf.CheckPKG('ao') +# needed for mic +env['HAVE_PORTAUDIO'] = conf.CheckPKG('portaudio') + #osx 64 specifics if sys.platform == 'darwin': if env['osx'] == '64cocoa': @@ -264,6 +267,7 @@ conf.Define('HAVE_WX', env['HAVE_WX']) conf.Define('USE_WX', env['USE_WX']) conf.Define('HAVE_X11', env['HAVE_X11']) conf.Define('HAVE_COCOA', env['HAVE_COCOA']) +conf.Define('HAVE_PORTAUDIO', env['HAVE_PORTAUDIO']) # profile env['USE_OPROFILE'] = 0 diff --git a/Source/Core/Core/Src/HW/EXI_DeviceMic.cpp b/Source/Core/Core/Src/HW/EXI_DeviceMic.cpp index ef8895bf9d..6113e78a5a 100644 --- a/Source/Core/Core/Src/HW/EXI_DeviceMic.cpp +++ b/Source/Core/Core/Src/HW/EXI_DeviceMic.cpp @@ -27,8 +27,8 @@ bool MicButton = false; bool IsOpen; -//#define USE_PORTAUDIO -#ifndef USE_PORTAUDIO +//#define HAVE_PORTAUDIO +#ifndef HAVE_PORTAUDIO || ! HAVE_PORTAUDIO void SetMic(bool Value){}