From 3c537ec13705a7f6b46a5bc898c0c4a5f844f970 Mon Sep 17 00:00:00 2001
From: Sonicadvance1 <sonicadvance1@gmail.com>
Date: Sun, 8 Nov 2009 23:36:14 +0000
Subject: [PATCH] Fix Compiling in OSX

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4523 8ced0084-cf51-0410-be5f-012b33b47a6e
---
 Source/Plugins/Plugin_DSP_HLE/Src/SConscript  | 2 +-
 Source/Plugins/Plugin_DSP_LLE/Src/SConscript  | 2 +-
 Source/Plugins/Plugin_VideoOGL/Src/SConscript | 7 +++++--
 Source/Plugins/Plugin_nJoy_SDL/Src/Rumble.cpp | 6 +++---
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/Source/Plugins/Plugin_DSP_HLE/Src/SConscript b/Source/Plugins/Plugin_DSP_HLE/Src/SConscript
index 29bb11adbd..0763866e82 100644
--- a/Source/Plugins/Plugin_DSP_HLE/Src/SConscript
+++ b/Source/Plugins/Plugin_DSP_HLE/Src/SConscript
@@ -43,6 +43,6 @@ dspenv.Append(
 	LIBS = [ 'common', 'audiocommon' ],
 	)
 if sys.platform == 'darwin':
-    dspenv['FRAMEWORKS'] = [ 'CoreAudio' ]
+    dspenv['FRAMEWORKS'] = [ 'CoreAudio', 'CoreServices' ]
 
 dspenv.SharedLibrary(env['plugin_dir']+name, files)
diff --git a/Source/Plugins/Plugin_DSP_LLE/Src/SConscript b/Source/Plugins/Plugin_DSP_LLE/Src/SConscript
index aecae20ba0..570853f696 100644
--- a/Source/Plugins/Plugin_DSP_LLE/Src/SConscript
+++ b/Source/Plugins/Plugin_DSP_LLE/Src/SConscript
@@ -42,5 +42,5 @@ else:
 		LIBS = [ 'dspcore', 'audiocommon', 'common' ],
 		)
 if sys.platform == 'darwin':
-   lleenv['FRAMEWORKS'] = ['CoreFoundation', 'System', 'CoreAudio']
+   lleenv['FRAMEWORKS'] = ['CoreFoundation', 'System', 'CoreAudio', 'CoreServices' ]
 lleenv.SharedLibrary(env['plugin_dir']+name, files)
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/SConscript b/Source/Plugins/Plugin_VideoOGL/Src/SConscript
index 7157862c2a..31c64132dd 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/SConscript
+++ b/Source/Plugins/Plugin_VideoOGL/Src/SConscript
@@ -40,8 +40,9 @@ files += [
 	'main.cpp',
 	'GLUtil.cpp',
 	]
-if gfxenv['HAVE_OPENCL']:
-	libs += [ 'OpenCL']
+if sys.platform != 'darwin':
+	if gfxenv['HAVE_OPENCL']:
+		libs += [ 'OpenCL']
 if gfxenv['HAVE_WX']:
 	files += [
                 'GUI/ConfigDlg.cpp',
@@ -63,6 +64,8 @@ conf = gfxenv.Configure(custom_tests = tests,
 
 if sys.platform == 'darwin':
 	gfxenv['FRAMEWORKS'] = ['CoreFoundation', 'System', 'OpenGL', 'Cocoa', 'Cg']
+	if gfxenv['HAVE_OPENCL']:
+		gfxenv['FRAMEWORKS'] += ['OpenCL']
 
 	conf.CheckPKG('OpenGL')
 	if not conf.CheckPKG('Cg'):
diff --git a/Source/Plugins/Plugin_nJoy_SDL/Src/Rumble.cpp b/Source/Plugins/Plugin_nJoy_SDL/Src/Rumble.cpp
index cb74cf9f46..afd539ad28 100644
--- a/Source/Plugins/Plugin_nJoy_SDL/Src/Rumble.cpp
+++ b/Source/Plugins/Plugin_nJoy_SDL/Src/Rumble.cpp
@@ -366,9 +366,9 @@ void PAD_RumbleClose()
 #ifdef SDL_RUMBLE
 	for (int i=0; i<4; i++)		// Free all pads
 	{
-		if (pRumble[_numPAD].g_pDevice) {
-			SDL_HapticClose( pRumble[_numPAD].g_pDevice );
-			pRumble[_numPAD].g_pDevice = NULL;
+		if (pRumble[i].g_pDevice) {
+			SDL_HapticClose( pRumble[i].g_pDevice );
+			pRumble[i].g_pDevice = NULL;
 		}
 	}
 #endif