Revert parts of r5576 and r5598 for Sonicadvance1's sake.

This reenables the option for building without wx on OS X,
but still leaves wxgl as the default.


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

Source/Plugins/Plugin_VideoOGL/Src/SConscript

@@ -25,6 +25,8 @@ files = [
 	'PostProcessing.cpp',
 	'FramebufferManager.cpp',
 	]
+compileFlags =	[
+	]
 linkFlags = [
 	]
 libs = [
@@ -46,6 +48,12 @@ if gfxenv['HAVE_WX']:
 		'Debugger/Debugger.cpp',
                 ]
 
+if sys.platform == 'darwin':
+        files += [ 'cocoaGL.m' ]
+        compileFlags +=	[
+                '-x',
+                'objective-c++',
+                ]
 if sys.platform == 'win32':
         files += [ 'OS/Win32.cpp' ]
 
@@ -97,6 +105,7 @@ if gfxenv['USE_WX'] and not gfxenv['HAVE_WX']:
     print "Must have wx to use wxgl"
     Return()
 gfxenv.Append(
+	CXXFLAGS = compileFlags,
 	LINKFLAGS = linkFlags,
 	)