Some more attempts at cleaning up the scons build and more clearly

identifying which options and parameters go with which platforms etc.

OS X, like Windows, now no longer uses Config.h. Configure() is still
used for the wx-config parameters, but that is a temporary measure.

Globals.cpp has never been used.


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

Source/Core/DolphinWX/Src/Globals.cpp

@@ -1,18 +0,0 @@
-// Copyright (C) 2003 Dolphin Project.
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, version 2.0.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License 2.0 for more details.
-
-// A copy of the GPL 2.0 should have been included with the program.
-// If not, see http://www.gnu.org/licenses/
-
-// Official SVN repository and contact information can be found at
-// http://code.google.com/p/dolphin-emu/
-
-#include "Globals.h"

Source/Core/DolphinWX/Src/SConscript

@@ -34,7 +34,6 @@ if wxenv['HAVE_WX']:
 		'LuaWindow.cpp',
 		'LogWindow.cpp',
 		'GameListCtrl.cpp',
-		'Globals.cpp',
 		'HotkeyDlg.cpp',
 		'ISOFile.cpp',
 		'ISOProperties.cpp',
@@ -65,10 +64,13 @@ elif sys.platform == 'darwin':
 	exeGUI = env['binary_dir'] + 'Dolphin.app/Contents/MacOS/Dolphin'
 	exeNoGUI = env['binary_dir'] + 'DolphinNoGUI'
 
-	env.Install(env['binary_dir'] + 'Dolphin.app/Contents/' +
+	wxenv.Install(env['binary_dir'] + 'Dolphin.app/Contents/' +
 		'Library/Frameworks/Cg.framework',
 		'/Library/Frameworks/Cg.framework/Cg')
 
+	wxenv.Install(env['binary_dir'] + 'Dolphin.app/Contents/Resources/',
+		'#/Source/Core/DolphinWX/resources/Dolphin.icns')
+
 	wxenv.Plist(
 		env['binary_dir'] + 'Dolphin.app/Contents/Info.plist',
 		Value(dict(