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_VideoSoftware/Src/SConscript

@@ -53,6 +53,9 @@ conf = gfxenv.Configure(custom_tests = tests,
 
 if sys.platform == 'darwin':
 	gfxenv['FRAMEWORKS'] = ['CoreFoundation', 'System', 'OpenGL', 'Cocoa', 'Cg']
+	compileFlags = ['-x','objective-c++',]
+	files += [ 'cocoaGL.m', ]
+
 	conf.CheckPKG('OpenGL')
 	if gfxenv['HAVE_OPENCL']:
 		gfxenv['FRAMEWORKS'] += ['OpenCL']