Simplify the SCons build:

On OS X, build all code as Objective-C(++).

Centralize framework handling.

Cleanup.


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

Source/Core/AudioCommon/Src/SConscript

@@ -1,4 +1,3 @@
-
 # -*- python -*-
 
 Import('env')
@@ -11,22 +10,19 @@ files = [
     'AudioCommon.cpp',
     ]
 
-acenv = env.Clone()
-
-if acenv['HAVE_OPENAL']:
+if env['HAVE_OPENAL']:
     files += [ 'OpenALStream.cpp', 'aldlist.cpp' ]
     
-if acenv['HAVE_AO']:
+if env['HAVE_AO']:
     files += [ 'AOSoundStream.cpp' ]
 
-if acenv['HAVE_ALSA']:
+if env['HAVE_ALSA']:
     files += [ 'AlsaSoundStream.cpp' ]
 
-if acenv['HAVE_PULSEAUDIO']:
+if env['HAVE_PULSEAUDIO']:
     files += [ 'PulseAudioStream.cpp' ]
 
 if sys.platform == 'darwin':
     files += [ 'CoreAudioSoundStream.cpp' ]
-    acenv['FRAMEWORKS'] = [ 'CoreAudio', 'AudioUnit' ]
     
-acenv.StaticLibrary(env['local_libs'] + 'audiocommon', files)
+env.StaticLibrary(env['local_libs'] + 'audiocommon', files)

Source/Core/Common/Src/SConscript

@@ -47,5 +47,4 @@ if sys.platform == 'win32':
 	files += [ "ExtendedTrace.cpp" ]
 	files += [ "stdafx.cpp" ]
 
-env_common = env.Clone()
-env_common.StaticLibrary(env['local_libs'] + "common", files)
+env.StaticLibrary(env['local_libs'] + "common", files)

Source/Core/DSPCore/Src/SConscript

@@ -25,9 +25,7 @@ files = [
     "DSPTables.cpp",
     "Jit/DSPJitExtOps.cpp",
     "Jit/DSPJitUtil.cpp",
-	"Jit/DSPJitMisc.cpp",
+    "Jit/DSPJitMisc.cpp",
     ]
 
-acenv = env.Clone()
-
-acenv.StaticLibrary(env['local_libs'] + 'dspcore', files, LIBS = [ 'common'] )
+env.StaticLibrary(env['local_libs'] + 'dspcore', files)

Source/Core/DebuggerUICommon/Src/SConscript

@@ -12,6 +12,4 @@ files = [
 	'MemoryView.cpp',
 	]
 
-acenv = env.Clone()
-
-acenv.StaticLibrary(env['local_libs'] + 'debugger_ui_util', files)
+env.StaticLibrary(env['local_libs'] + 'debugger_ui_util', files)

Source/Core/DebuggerWX/Src/CodeWindow.h

@@ -23,7 +23,6 @@
 #include <wx/textctrl.h>
 #include <wx/listbox.h>
 #include <wx/artprov.h>
-#include <wx/aui/aui.h>
 
 #include "Thread.h"
 #include "CoreParameter.h"

Source/Core/DebuggerWX/Src/SConscript

@@ -17,15 +17,14 @@ files = [
     "RegisterView.cpp",
     "JitWindow.cpp",
     ]
+
 wxenv = env.Clone()
 wxenv.Append(
 	CPPDEFINES = [
 		'wxNEEDS_CHARPP'
-		],
-	LINKFLAGS = [
-		'-pthread',
 		]
 	)
+
 libs = [
     'common',
     'debugger_ui_util'

Source/Core/DiscIO/Src/SConscript

@@ -26,7 +26,4 @@ files = [
 	'AES/aes_cbc.c',
 	'AES/aes_core.c',
 	]
-libs = [
-	'common'
-	]
-env.StaticLibrary(env['local_libs'] + 'discio', files, LIBS = libs)
+

Source/Core/DolphinWX/Src/SConscript

@@ -43,9 +43,9 @@ if wxenv['HAVE_WX']:
 		'NetWindow.cpp',
 		]
 
-        CPPDEFINES = [
-                'wxNEEDS_CHARPP',
-                ],
+	CPPDEFINES = [
+		'wxNEEDS_CHARPP',
+		],
 
 	libs = [ 'debwx', 'debugger_ui_util'] + libs
 else:
@@ -54,34 +54,11 @@ else:
 		]
 
 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
-       	)
+	files += [ 'cocoaApp.m', ]
 
-
-
-
-if sys.platform == 'darwin':
 	exeGUI = env['binary_dir'] + 'Dolphin.app/Contents/MacOS/Dolphin'
 	exeNoGUI = env['binary_dir'] + 'DolphinNoGUI'
 
-	wxenv['FRAMEWORKS'] = ['Cocoa', 'CoreFoundation', 'System']
 	wxenv.Plist(
 		env['binary_dir'] + 'Dolphin.app/Contents/Info.plist',
 		Value(dict(
@@ -100,11 +77,13 @@ else:
 	exeGUI = env['binary_dir'] + 'dolphin-emu'
 	exeNoGUI = env['binary_dir'] + 'dolphin-emu-nogui'
 
+wxenv.Append(
+	LIBS = libs
+	)
+
 if wxenv['HAVE_X11']:
 	files += [ 'X11Utils.cpp' ]
 
-#objects = [ wxenv.Object(srcFile) for srcFile in files ]
-
 if wxenv['HAVE_WX']:
 	wxenv.Program(exeGUI, files + [ 'Main.cpp' ])
 else:

Source/Core/InputCommon/Src/EventHandler.cpp

@@ -102,11 +102,11 @@ bool EventHandler::TestEvent (Keys k, sf::Event e)
 
 #if defined HAVE_WX && HAVE_WX 
 // Taken from wxw source code
-sf::Key::Code EventHandler::wxCharCodeToSF(int id)
+sf::Key::Code EventHandler::wxCharCodeToSF(int charcode)
 {
     sf::Key::Code sfKey;
 
-    switch (id) {
+    switch (charcode) {
 //  case WXK_CANCEL:          sfKey = sf::Key::Cancel; break;
 //  case WXK_BACK:            sfKey = sf::Key::BackSpace; break;
     case WXK_TAB:             sfKey = sf::Key::Tab; break;
@@ -181,12 +181,12 @@ sf::Key::Code EventHandler::wxCharCodeToSF(int id)
     default:
 
         // To lower (will tolower work on windows?)
-        if (id >= 'A' && id <= 'Z') 
-            id = id - 'A' + 'a';
+        if (charcode >= 'A' && charcode <= 'Z') 
+            charcode = charcode - 'A' + 'a';
         
-	if ((id >= 'a' && id <= 'z') || 
-	    (id  >= '0' && id <= '9')) 
-	    sfKey = (sf::Key::Code)id;   
+	if ((charcode >= 'a' && charcode <= 'z') || 
+	    (charcode  >= '0' && charcode <= '9')) 
+	    sfKey = (sf::Key::Code)charcode;   
 	else 
 	    sfKey = sf::Key::Count; // Invalid key
         

Source/Core/InputCommon/Src/SConscript

@@ -1,7 +1,6 @@
 # -*- python -*-
 import sys
 Import('env')
-icenv = env.Clone()
 
 files = [
 	'Configuration.cpp',
@@ -21,7 +20,7 @@ if env['HAVE_WX']:
 		"WXInputBase.cpp",
 		]
 
-if icenv['HAVE_SDL']:
+if env['HAVE_SDL']:
 	files += [
 		'ControllerInterface/SDL/SDL.cpp'
 		]
@@ -32,11 +31,10 @@ if sys.platform == 'darwin':
 		'ControllerInterface/OSX/OSXKeyboard.mm',
 		'ControllerInterface/OSX/OSXMouse.mm'
 		]
-	icenv['FRAMEWORKS'] = ['IOKit']
 		   
 if sys.platform == 'linux2':
 	files += [
 		'ControllerInterface/Xlib/Xlib.cpp'
 		]
 
-icenv.StaticLibrary(env['local_libs'] + "inputcommon", files)
+env.StaticLibrary(env['local_libs'] + "inputcommon", files)

Source/Core/VideoCommon/Src/SConscript

@@ -37,12 +37,9 @@ files = [
 	'HiresTextures.cpp',
 	]
 
-
-env_vcommon = env.Clone()
-
-if env_vcommon['HAVE_OPENCL']:
+if env['HAVE_OPENCL']:
     files += [
         'OpenCL/OCLTextureDecoder.cpp',
         ]
 
-env_vcommon.StaticLibrary(env['local_libs'] + "videocommon", files)
+env.StaticLibrary(env['local_libs'] + "videocommon", files)

Source/DSPTool/Src/SConscript

@@ -14,9 +14,6 @@ libs = [
     'common',
 ]
 
-
 dtenv.Append(LIBS = libs)
-if sys.platform == 'darwin':
-    dtenv['FRAMEWORKS'] = ['CoreFoundation', 'Cocoa', 'System']
 
 dtenv.Program(dtenv['binary_dir'] + 'dsptool', files)

Source/Plugins/Plugin_DSP_HLE/Src/SConscript

@@ -33,7 +33,5 @@ if dspenv['HAVE_WX']:
 dspenv.Append(
 	LIBS = [ 'common', 'audiocommon' ],
 	)
-if sys.platform == 'darwin':
-    dspenv['FRAMEWORKS'] = [ 'CoreAudio', 'CoreServices', 'AudioUnit' ]
 
 dspenv.SharedLibrary(env['plugin_dir']+name, files)

Source/Plugins/Plugin_DSP_LLE/Src/Debugger/DSPDebugWindow.h

@@ -33,6 +33,10 @@
 #include <wx/sizer.h>
 #include <wx/listctrl.h>
 #include <wx/statline.h>
+#if defined(__APPLE__)
+//id is an objective-c++ type, wx team need to change this
+#define id toolid
+#endif
 #include <wx/aui/aui.h>
 
 #include "disassemble.h"

Source/Plugins/Plugin_DSP_LLE/Src/SConscript

@@ -24,14 +24,14 @@ if env['HAVE_WX']:
 	]
 
 lleenv = env.Clone()
+
 if env['HAVE_WX']:
 	lleenv.Append(
-		LIBS = [ 'dspcore', 'audiocommon', 'common', 'debugger_ui_util'  ],
+		LIBS = [ 'dspcore', 'audiocommon', 'common', 'debugger_ui_util' ],
 		)
 else:
 	lleenv.Append(
 		LIBS = [ 'dspcore', 'audiocommon', 'common' ],
 		)
-if sys.platform == 'darwin':
-    lleenv['FRAMEWORKS'] = [ 'CoreAudio', 'CoreServices', 'AudioUnit' ]
+
 lleenv.SharedLibrary(env['plugin_dir']+name, files)

Source/Plugins/Plugin_GCPad/Src/SConscript

@@ -15,6 +15,7 @@ files = [
 	'GCPad.cpp',
 	'Rumble.cpp',
 	]
+
 if padenv['HAVE_WX']:
     files += [
         'ConfigJoypad.cpp',
@@ -25,7 +26,4 @@ padenv.Append(
 	LIBS = [ 'inputcommon', 'common', ],
 	)
 
-if sys.platform == 'darwin':
-	padenv['FRAMEWORKS'] = ['CoreFoundation', 'System' ]
-
 padenv.SharedLibrary(env['plugin_dir']+name, files)

Source/Plugins/Plugin_GCPadNew/Src/SConscript

@@ -15,7 +15,4 @@ padenv.Append(
 	LIBS = [ 'inputplugincommon', 'inputcommon', 'common' ],
 	)
 
-if sys.platform == 'darwin':
-	padenv['FRAMEWORKS'] = ['CoreFoundation', 'System', 'Cocoa', 'IOKit' ]
-
 padenv.SharedLibrary(env['plugin_dir']+name, files)

Source/Plugins/Plugin_VideoOGL/Src/SConscript

@@ -25,8 +25,6 @@ files = [
 	'PostProcessing.cpp',
 	'FramebufferManager.cpp',
 	]
-compileFlags =	[
-	]
 linkFlags = [
 	]
 libs = [
@@ -50,45 +48,10 @@ if gfxenv['HAVE_WX']:
 
 if sys.platform == 'darwin':
         files += [ 'cocoaGL.m' ]
-        compileFlags +=	[
-                '-x',
-                'objective-c++',
-                ]
+
 if sys.platform == 'win32':
         files += [ 'OS/Win32.cpp' ]
 
-tests = {'CheckPKG' : utils.CheckPKG}
-conf = gfxenv.Configure(custom_tests = tests,
-                        config_h=env['base_dir']+"Source/Core/Common/Src/Config.h")
-
-if sys.platform == 'darwin':
-	gfxenv['FRAMEWORKS'] = ['CoreFoundation', 'System', 'OpenGL', 'Cocoa', 'Cg']
-	if gfxenv['HAVE_OPENCL']:
-		gfxenv['FRAMEWORKS'] += ['OpenCL']
-
-	conf.CheckPKG('OpenGL')
-	if not conf.CheckPKG('Cg'):
-		print name + " must have Cg framework from nvidia to be build"
-		Return()
-
-elif sys.platform == 'win32':
-        print name + " is assuming that you have opengl, glu, cg, and cggl"
-else:
-        if not (conf.CheckPKG('GL') and conf.CheckPKG('GLU')):
-                print name + " must have opengl and glu to be build"
-                Return()
-	
-	if not conf.CheckPKG('Cg') or not conf.CheckPKG('CgGL'):
-                print name + " must have cg and cggl to be build"
-                Return()
-if sys.platform == 'win32':
-	print name + " is assuming that you have glew"
-else:
-	if not conf.CheckPKG('GLEW'):
-		print name + " must have glew to be build"
-		Return()
-
-
 if sys.platform == 'win32':
 	files += [
 		'OS/Win32.cpp'
@@ -98,16 +61,10 @@ if sys.platform == 'win32':
 		]	
 	gfxenv['CPPPATH'] += libs
 
-conf.Finish()
-
 # Sanity check
 if gfxenv['USE_WX'] and not gfxenv['HAVE_WX']:
     print "Must have wx to use wxgl"
     Return()
-gfxenv.Append(
-	CXXFLAGS = compileFlags,
-	LINKFLAGS = linkFlags,
-	)
 
 gfxenv.SharedLibrary(
 	env['plugin_dir']+name,

Source/Plugins/Plugin_VideoSoftware/Src/SConscript

@@ -47,34 +47,9 @@ gfxenv = env.Clone()
 if sys.platform == 'win32':
         files += [ 'Win32.cpp' ]
 
-tests = {'CheckPKG' : utils.CheckPKG}
-conf = gfxenv.Configure(custom_tests = tests,
-                        config_h=env['base_dir']+"Source/Core/Common/Src/Config.h")
-
 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']
-
-elif sys.platform == 'win32':
-        print name + " is assuming that you have opengl, glu, cg, and cggl"
-else:
-        if not (conf.CheckPKG('GL') and conf.CheckPKG('GLU')):
-                print name + " must have opengl and glu to be build"
-                Return()
-	
-if sys.platform == 'win32':
-	print name + " is assuming that you have glew"
-else:
-	if not conf.CheckPKG('GLEW'):
-		print name + " must have glew to be build"
-		Return()
-
-
 if sys.platform == 'win32':
 	files += [
 		'Win32.cpp'
@@ -84,15 +59,10 @@ if sys.platform == 'win32':
 		]	
 	gfxenv['CPPPATH'] += libs
 	
-conf.Finish()
-
 # Sanity check
 if gfxenv['USE_WX'] and not gfxenv['HAVE_WX']:
     print "Must have wx to use wxgl"
     Return()
-gfxenv.Append(
-	LINKFLAGS = linkFlags,
-	)
 
 gfxenv.SharedLibrary(
 	env['plugin_dir']+name,

Source/Plugins/Plugin_Wiimote/Src/SConscript

@@ -19,6 +19,7 @@ files = [
         "Rumble.cpp",
 	"UDPWiimote.cpp"
 	]
+
 if wmenv['HAVE_WX']:
     files += [
         "ConfigBasicDlg.cpp",
@@ -28,27 +29,20 @@ if wmenv['HAVE_WX']:
         "ConfigRecording.cpp",
         "FillReport.cpp",
         ]
+
 libs = [ 'common', 'inputcommon' ]
 
 cxxflags = [ ]
 
 if wmenv['HAVE_WIIUSE']:
-    libs  += [ 'wiiuse' ]
-    files += [ "wiimote_real.cpp" ]
-    files += [ "ReadWiimote.cpp" ]
-    cxxflags += ['-DHAVE_WIIUSE']
+	libs  += [ 'wiiuse' ]
+	files += [ "wiimote_real.cpp" ]
+	files += [ "ReadWiimote.cpp" ]
+	cxxflags += ['-DHAVE_WIIUSE']
 
-if sys.platform == 'darwin':
-    wmenv.Append(
-    	CXXFLAGS = cxxflags,
-    	LINKFLAGS = ['-framework', 'IOBluetooth'],
-    	LIBS = libs,
-    	)
-    wmenv['FRAMEWORKS'] = ['Cocoa', 'System']
-else:
-    wmenv.Append(
-    	CXXFLAGS = cxxflags,
-   	LIBS = libs,
-    	)
+wmenv.Append(
+	CXXFLAGS = cxxflags,
+	LIBS = libs,
+	)
 
 wmenv.SharedLibrary(env['plugin_dir']+name, files)

Source/Plugins/Plugin_WiimoteNew/Src/SConscript

@@ -23,7 +23,4 @@ wiinewenv.Append(
 	LIBS = [ 'inputplugincommon', 'inputcommon', 'common' ],
 	)
 
-if sys.platform == 'darwin':
-	wiinewenv['FRAMEWORKS'] = ['CoreFoundation', 'System', 'Cocoa', 'IOKit' ]
-
 wiinewenv.SharedLibrary(env['plugin_dir']+name, files)

Source/UnitTests/SConscript

@@ -11,9 +11,9 @@ files = [
 	"UnitTests.cpp",
 	]
 
-libs = [ 
-	'dspcore', 'common', 
+libs = [
+	'dspcore', 'common',
 ]
 
-unitenv.Append( LIBS = libs)
+unitenv.Append(LIBS = libs)
 unitenv.Program(env['binary_dir'] + 'tester', files)