Make Cg conditional on those platforms for which it is available.

Of course, this doesn't do much good without another shader compiler..

WIP of OS X application bundle building.


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

3 files changed, 29 insertions, 16 deletions

diff --git a/Source/Core/Core/Src/MemTools.cpp b/Source/Core/Core/Src/MemTools.cpp
index 8e09680902..dbbf69abf4 100644
--- a/Source/Core/Core/Src/MemTools.cpp
+++ b/Source/Core/Core/Src/MemTools.cpp
@@ -40,7 +40,6 @@
 #define CREG_EAX(ctx) (ctx)->gregs[REG_EAX]
 #define CREG_EIP(ctx) (ctx)->gregs[REG_EIP]
 #elif defined __NetBSD__
-#include <sys/siginfo.h>
 #define CREG_RAX(ctx) (ctx)->__gregs[_REG_RAX]
 #define CREG_RIP(ctx) (ctx)->__gregs[_REG_RIP]
 #define CREG_EAX(ctx) (ctx)->__gregs[_REG_EAX]
diff --git a/Source/Core/DolphinWX/Src/GameListCtrl.cpp b/Source/Core/DolphinWX/Src/GameListCtrl.cpp
index 5c1a3b8871..decc3d17b0 100644
--- a/Source/Core/DolphinWX/Src/GameListCtrl.cpp
+++ b/Source/Core/DolphinWX/Src/GameListCtrl.cpp
@@ -554,12 +554,15 @@ void CGameListCtrl::ScanForISOs()
 			sprintf(tempstring,"Scanning %s", FileName.c_str());
 			msg = wxString(tempstring, *wxConvCurrent);
 
+// With wxWidgets 2.9.1, each Update() sleeps for several seconds
+#ifndef __APPLE__
 			// Update with the progress (i) and the message (msg)
 			bool Cont = dialog.Update(i, msg);
 			if (!Cont)
 			{
 				break;
 			}
+#endif
 			GameListItem ISOFile(rFilenames[i]);
 			if (ISOFile.IsValid())
 			{
diff --git a/Source/Core/DolphinWX/Src/SConscript b/Source/Core/DolphinWX/Src/SConscript
index 12f0f5a856..1ca8d253bc 100644
--- a/Source/Core/DolphinWX/Src/SConscript
+++ b/Source/Core/DolphinWX/Src/SConscript
@@ -57,29 +57,40 @@ elif sys.platform == 'darwin' and not env['HAVE_WX']:
 	files += [ 'cocoaApp.m' ]
 	exeNoGUI = env['binary_dir'] + 'DolphinNoGUI'
 elif sys.platform == 'darwin' and env['HAVE_WX']:
-	exeGUI = env['binary_dir'] + 'Dolphin.app/Contents/MacOS/Dolphin'
+	exeGUI = 'Dolphin'
+	exeGUIdist = env['binary_dir'] + 'Dolphin.app/Contents/MacOS/Dolphin'
 
 	env.Install(env['binary_dir'] + 'Dolphin.app/Contents/' +
 		'Library/Frameworks/Cg.framework',
 		'#Externals/Cg/Cg.framework/Cg')
 
-	env.Install(env['binary_dir'] + 'Dolphin.app/Contents/Resources/',
+	env.Install(env['data_dir'],
 		'#Source/Core/DolphinWX/resources/Dolphin.icns')
 
-	env.Plist(
-		env['binary_dir'] + 'Dolphin.app/Contents/Info.plist',
-		Value(dict(
-			CFBundleExecutable = 'Dolphin',
-			CFBundleIconFile = 'Dolphin.icns',
-			CFBundleIdentifier = 'com.dolphin-emu.dolphin',
-			CFBundlePackageType = 'APPL',
-			CFBundleShortVersionString =
+	from plistlib import writePlist
+	def createPlist(target, source, env):
+		for srcNode in source:
+			writePlist(srcNode.value, str(target[0]))
+	env.Append(BUILDERS = {'Plist' : Builder(action = createPlist)})
+	env.Plist(env['binary_dir'] + 'Dolphin.app/Contents/Info.plist', Value(
+		dict(
+		CFBundleExecutable = 'Dolphin',
+		CFBundleIconFile = 'Dolphin.icns',
+		CFBundleIdentifier = 'com.dolphin-emu.dolphin',
+		CFBundlePackageType = 'APPL',
+		CFBundleShortVersionString =
 			os.popen('svnversion -n ' + Dir('#').abspath).read(),
-			CFBundleVersion = '2.0',
-			LSMinimumSystemVersion = '10.5.0',
-			LSRequiresCarbon = True,
-			))
-		)
+		CFBundleVersion = '2.0',
+		LSMinimumSystemVersion = '10.5.0',
+		LSRequiresCarbon = True,
+		)))
+
+	def Fixup(target, source, env):
+		os.link(str(source[0]), str(target[0]))
+	env.Append(BUILDERS = {'Fixup' : Builder(action = Fixup)})
+	env.Depends(exeGUIdist, env['plugin_dir'])
+	if env['CPPDEFINES'].count('WXUSINGDLL'):
+		env.Fixup(exeGUIdist, exeGUI)
 else:
 	files += [ 'X11Utils.cpp' ]
 	libs += [ 'SDL' ]