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

Revent accidental hci.h change add better portaudio detection 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2506 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
nakeee 2009-03-01 12:56:07 +00:00
parent 2f378cb154
commit 9b00d84c5d
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
SConstruct
View File

@ -206,7 +206,9 @@ env['HAVE_BLUEZ'] = conf.CheckPKG('bluez')
env['HAVE_AO'] = conf.CheckPKG('ao') env['HAVE_AO'] = conf.CheckPKG('ao')
# needed for mic # needed for mic
env['HAVE_PORTAUDIO'] = conf.CheckPKG('portaudio') env['HAVE_PORTAUDIO'] = False
if conf.CheckPKG('portaudio') and conf.CheckCHeader("portaudio.h"):
env['HAVE_PORTAUDIO'] = True;
#osx 64 specifics #osx 64 specifics
if sys.platform == 'darwin': if sys.platform == 'darwin':

11
Source/Core/Core/Src/IPC_HLE/hci.h
View File

@ -1,9 +1,18 @@
#ifndef _NETBT_HCI_H_ #ifndef _NETBT_HCI_H_
#define _NETBT_HCI_H_ #define _NETBT_HCI_H_
#include "CommonTypes.h"
#pragma pack(push, 1) #pragma pack(push, 1)
typedef u8 uint8_t;
#ifdef _WIN32
typedef s8 int8_t;
#endif
typedef u16 uint16_t;
typedef s16 int16_t;
typedef u32 uint32_t;
typedef s32 int32_t;
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif