From 1d8db5ce3f44cf637a88a6521680e2a336ff8f7c Mon Sep 17 00:00:00 2001
From: Shawn Hoffman <godisgovernment@gmail.com>
Date: Fri, 23 Apr 2010 19:15:44 +0000
Subject: [PATCH] osx buildfix

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5402 8ced0084-cf51-0410-be5f-012b33b47a6e
---
 SConstruct                                      | 1 +
 Source/Core/DolphinWX/Src/ConfigMain.cpp        | 4 ++++
 Source/Core/InputCommon/Src/SConscript          | 1 +
 Source/Plugins/Plugin_GCPadNew/Src/SConscript   | 2 +-
 Source/Plugins/Plugin_VideoOGL/Src/main.cpp     | 4 ----
 Source/Plugins/Plugin_WiimoteNew/Src/SConscript | 2 +-
 6 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/SConstruct b/SConstruct
index a07425208c..58228075d1 100644
--- a/SConstruct
+++ b/SConstruct
@@ -362,6 +362,7 @@ if not env['SHARED_SFML']:
 
 #osx 64 specifics
 if sys.platform == 'darwin':
+    env['HAVE_XRANDR'] = 0
     if env['osx'] == '64cocoa':
         compileFlags += ['-arch' , 'x86_64', '-m64' ]
         env['LINKFLAGS'] += ['-arch' , 'x86_64', '-m64' ]
diff --git a/Source/Core/DolphinWX/Src/ConfigMain.cpp b/Source/Core/DolphinWX/Src/ConfigMain.cpp
index de2d697044..41dc241b6a 100644
--- a/Source/Core/DolphinWX/Src/ConfigMain.cpp
+++ b/Source/Core/DolphinWX/Src/ConfigMain.cpp
@@ -30,6 +30,10 @@
 #include "Frame.h"
 #include "HotkeyDlg.h"
 
+#if defined(HAVE_COCOA) && HAVE_COCOA
+#include <Cocoa/Cocoa.h>
+#endif
+
 extern CFrame* main_frame;
 
 // Strings for Device Selections
diff --git a/Source/Core/InputCommon/Src/SConscript b/Source/Core/InputCommon/Src/SConscript
index a8f5162449..e04631fccb 100644
--- a/Source/Core/InputCommon/Src/SConscript
+++ b/Source/Core/InputCommon/Src/SConscript
@@ -31,6 +31,7 @@ if sys.platform == 'darwin':
 		'ControllerInterface/OSX/OSX.cpp', 
 		'ControllerInterface/OSX/OSXPrivate.mm'
 		]
+	icenv['FRAMEWORKS'] = ['IOKit']
 		   
 if sys.platform == 'linux2':
 	files += [
diff --git a/Source/Plugins/Plugin_GCPadNew/Src/SConscript b/Source/Plugins/Plugin_GCPadNew/Src/SConscript
index ba5051d5b9..7ce76cdaea 100644
--- a/Source/Plugins/Plugin_GCPadNew/Src/SConscript
+++ b/Source/Plugins/Plugin_GCPadNew/Src/SConscript
@@ -16,6 +16,6 @@ padenv.Append(
 	)
 
 if sys.platform == 'darwin':
-	padenv['FRAMEWORKS'] = ['CoreFoundation', 'System', 'Cocoa' ]
+	padenv['FRAMEWORKS'] = ['CoreFoundation', 'System', 'Cocoa', 'IOKit' ]
 
 padenv.SharedLibrary(env['plugin_dir']+name, files)
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/main.cpp b/Source/Plugins/Plugin_VideoOGL/Src/main.cpp
index 80607bfdfb..89d983512d 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/main.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/main.cpp
@@ -95,10 +95,6 @@ GFXDebuggerOGL *m_DebuggerFrame = NULL;
 
 #include "VideoState.h"
 
-#if defined(HAVE_COCOA) && HAVE_COCOA
-#include <Cocoa/Cocoa.h>
-#endif
-
 SVideoInitialize g_VideoInitialize;
 PLUGIN_GLOBALS* globals = NULL;
 
diff --git a/Source/Plugins/Plugin_WiimoteNew/Src/SConscript b/Source/Plugins/Plugin_WiimoteNew/Src/SConscript
index 31ac23de05..f01649aefb 100644
--- a/Source/Plugins/Plugin_WiimoteNew/Src/SConscript
+++ b/Source/Plugins/Plugin_WiimoteNew/Src/SConscript
@@ -21,6 +21,6 @@ wiinewenv.Append(
 	)
 
 if sys.platform == 'darwin':
-	wiinewenv['FRAMEWORKS'] = ['CoreFoundation', 'System', 'Cocoa' ]
+	wiinewenv['FRAMEWORKS'] = ['CoreFoundation', 'System', 'Cocoa', 'IOKit' ]
 
 wiinewenv.SharedLibrary(env['plugin_dir']+name, files)