osx buildfix

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5402 8ced0084-cf51-0410-be5f-012b33b47a6e

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' ]

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

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 += [

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)

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;
 

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)