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

Fix Compiling in OSX 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4523 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Sonicadvance1 2009-11-08 23:36:14 +00:00
parent 07408d7625
commit 3c537ec137
4 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Plugins/Plugin_DSP_HLE/Src/SConscript
View File

@ -43,6 +43,6 @@ dspenv.Append(
LIBS = [ 'common', 'audiocommon' ], LIBS = [ 'common', 'audiocommon' ],
) )
if sys.platform == 'darwin': if sys.platform == 'darwin':
dspenv['FRAMEWORKS'] = [ 'CoreAudio' ] dspenv['FRAMEWORKS'] = [ 'CoreAudio', 'CoreServices' ]
dspenv.SharedLibrary(env['plugin_dir']+name, files) dspenv.SharedLibrary(env['plugin_dir']+name, files)

2
Source/Plugins/Plugin_DSP_LLE/Src/SConscript
View File

@ -42,5 +42,5 @@ else:
LIBS = [ 'dspcore', 'audiocommon', 'common' ], LIBS = [ 'dspcore', 'audiocommon', 'common' ],
) )
if sys.platform == 'darwin': if sys.platform == 'darwin':
lleenv['FRAMEWORKS'] = ['CoreFoundation', 'System', 'CoreAudio'] lleenv['FRAMEWORKS'] = ['CoreFoundation', 'System', 'CoreAudio', 'CoreServices' ]
lleenv.SharedLibrary(env['plugin_dir']+name, files) lleenv.SharedLibrary(env['plugin_dir']+name, files)

7
Source/Plugins/Plugin_VideoOGL/Src/SConscript
View File

@ -40,8 +40,9 @@ files += [
'main.cpp', 'main.cpp',
'GLUtil.cpp', 'GLUtil.cpp',
] ]
if gfxenv['HAVE_OPENCL']: if sys.platform != 'darwin':
libs += [ 'OpenCL'] if gfxenv['HAVE_OPENCL']:
libs += [ 'OpenCL']
if gfxenv['HAVE_WX']: if gfxenv['HAVE_WX']:
files += [ files += [
'GUI/ConfigDlg.cpp', 'GUI/ConfigDlg.cpp',
@ -63,6 +64,8 @@ conf = gfxenv.Configure(custom_tests = tests,
if sys.platform == 'darwin': if sys.platform == 'darwin':
gfxenv['FRAMEWORKS'] = ['CoreFoundation', 'System', 'OpenGL', 'Cocoa', 'Cg'] gfxenv['FRAMEWORKS'] = ['CoreFoundation', 'System', 'OpenGL', 'Cocoa', 'Cg']
if gfxenv['HAVE_OPENCL']:
gfxenv['FRAMEWORKS'] += ['OpenCL']
conf.CheckPKG('OpenGL') conf.CheckPKG('OpenGL')
if not conf.CheckPKG('Cg'): if not conf.CheckPKG('Cg'):

6
Source/Plugins/Plugin_nJoy_SDL/Src/Rumble.cpp
View File

@ -366,9 +366,9 @@ void PAD_RumbleClose()
#ifdef SDL_RUMBLE #ifdef SDL_RUMBLE
for (int i=0; i<4; i++) // Free all pads for (int i=0; i<4; i++) // Free all pads
{ {
if (pRumble[_numPAD].g_pDevice) { if (pRumble[i].g_pDevice) {
SDL_HapticClose( pRumble[_numPAD].g_pDevice ); SDL_HapticClose( pRumble[i].g_pDevice );
pRumble[_numPAD].g_pDevice = NULL; pRumble[i].g_pDevice = NULL;
} }
} }
#endif #endif