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/Core/DolphinWX/Src/SConscript

@@ -44,27 +44,37 @@ if wxenv['HAVE_WX']:
 		'NetWindow.cpp',
 		]
 
-        CPPDEFINE = [
+        CPPDEFINES = [
                 'wxNEEDS_CHARPP',
                 ],
 
-	compileFlags = [
-		],
-
-
 	libs = [ 'debwx', 'debugger_ui_util'] + libs
 
+if sys.platform == 'darwin':
+    files += [ 'cocoaApp.m', ]
+    compileFlags = [
+            '-x',
+            'objective-c++',
+            ]
+    wxenv.Append(
+	CXXFLAGS = compileFlags,
+       	LINKFLAGS = [
+               	'-pthread', '-framework', 'IOKit'
+               	],
+       	LIBS = libs
+       	)
+else:
+    wxenv.Append(
+       	LINKFLAGS = [
+               	'-pthread',
+               	],
+       	LIBS = libs
+       	)
+
+
+
 
 if sys.platform == 'darwin':
-	compileFlags = [
-		'-x',
-		'objective-c++',
-		]
-
-	linkflags = [
-		'-pthread', '-framework', 'IOKit'
-		]
-
 	exeGUI = env['binary_dir'] + 'Dolphin.app/Contents/MacOS/Dolphin'
 	exeNoGUI = env['binary_dir'] + 'DolphinNoGUI'
 
@@ -86,17 +96,11 @@ if sys.platform == 'darwin':
 else:
 	exeGUI = env['binary_dir'] + 'dolphin-emu'
 	exeNoGUI = env['binary_dir'] + 'dolphin-emu-nogui'
-	linkflags = [ '-pthread' ]
 
 if wxenv['HAVE_X11']:
 	files += [ 'X11Utils.cpp' ]
 
-
-wxenv.Append(
-	CXXFLAGS = compileFlags,
-	LINKFLAGS = linkflags,
-	LIBS = libs,
-)
+#objects = [ wxenv.Object(srcFile) for srcFile in files ]
 
 if wxenv['HAVE_WX']:
 	wxenv.Program(exeGUI, files + [ 'Main.cpp' ])