From 8b9b66911f5aa04e1955729189f3b1dda73b9719 Mon Sep 17 00:00:00 2001
From: Soren Jorvang <soren.jorvang@gmail.com>
Date: Sun, 14 Nov 2010 06:02:44 +0000
Subject: [PATCH] Clean up OS X wx library handling a bit.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6403 8ced0084-cf51-0410-be5f-012b33b47a6e
---
 SConstruct                             | 15 ++++++++-------
 Source/Core/AudioCommon/CMakeLists.txt |  1 +
 Source/Core/AudioCommon/Src/SConscript |  1 -
 Source/Core/DolphinWX/Src/SConscript   | 12 +-----------
 4 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/SConstruct b/SConstruct
index c924380e04..baf6013105 100644
--- a/SConstruct
+++ b/SConstruct
@@ -126,9 +126,10 @@ if sys.platform == 'darwin':
     env['CCFLAGS'] += ['-iframework/Developer/SDKs/MacOSX10.6.sdk' + system]
     env['CC'] = "gcc-4.2 -ObjC"
     env['CXX'] = "g++-4.2 -ObjC++"
-    env['FRAMEWORKS'] += ['AppKit', 'CoreFoundation', 'CoreServices']
-    env['FRAMEWORKS'] += ['AudioUnit', 'CoreAudio']
+    env['FRAMEWORKS'] += ['AppKit', 'Carbon', 'CoreFoundation', 'CoreServices']
+    env['FRAMEWORKS'] += ['AudioUnit', 'CoreAudio', 'WebKit']
     env['FRAMEWORKS'] += ['IOBluetooth', 'IOKit', 'OpenGL']
+    env['FRAMEWORKSFLAGS'] = ['-Xarch_i386', '-Wl,-framework,QuickTime']
     env['LIBPATH'] += ['/usr/lib']
     env['LIBS'] = ['iconv', 'SDL']
     env['LINKFLAGS'] += ccld
@@ -137,12 +138,12 @@ if sys.platform == 'darwin':
 
     if platform.mac_ver()[0] >= '10.6.0':
         env['CCFLAGS'] += ['-Wextra-tokens', '-Wnewline-eof']
-        env['FRAMEWORKSFLAGS'] = ['-weak_framework', 'OpenCL']
+        env['FRAMEWORKSFLAGS'] += ['-weak_framework', 'OpenCL']
 
     if env['nowx']:
         env['HAVE_WX'] = 0
     else:
-        wxenv = env.Clone(LIBPATH = '')
+        wxenv = env.Clone(CPPPATH = '', LIBPATH = '', LIBS = '')
         conf = wxenv.Configure(conf_dir = None, log_file = None,
             custom_tests = {'CheckWXConfig' : wxconfig.CheckWXConfig})
         env['HAVE_WX'] = \
@@ -154,9 +155,7 @@ if sys.platform == 'darwin':
             Exit(1)
         wxconfig.ParseWXConfig(wxenv)
         env['CPPDEFINES'] += ['__WXOSX_COCOA__']
-        env['CPPPATH'] = wxenv['CPPPATH']
-        if not wxenv['CPPDEFINES'].count('WXUSINGDLL'):
-            env['FRAMEWORKS'] = wxenv['FRAMEWORKS']
+        env['CPPPATH'] += wxenv['CPPPATH']
         env['LIBPATH'] += wxenv['LIBPATH']
         env['wxconfiglibs'] = wxenv['LIBS']
 
@@ -180,6 +179,8 @@ elif sys.platform == 'win32':
 
 else:
     env['CCFLAGS'] += ['-fPIC', '-msse2', '-pthread']
+    if env['CCVERSION'] >= '4.2.0':
+        env['CXXFLAGS'] += ['-fvisibility-inlines-hidden']
     env['CPPDEFINES'] += ['HAVE_CONFIG_H']
     env['CPPPATH'].insert(0, '#') # Make sure we pick up our own config.h
     env['LINKFLAGS'] += ['-pthread']
diff --git a/Source/Core/AudioCommon/CMakeLists.txt b/Source/Core/AudioCommon/CMakeLists.txt
index 237ebd6f4d..1b639c4c14 100644
--- a/Source/Core/AudioCommon/CMakeLists.txt
+++ b/Source/Core/AudioCommon/CMakeLists.txt
@@ -31,6 +31,7 @@ else()
 
     if(WIN32)
 		set(SRCS ${SRCS} Src/DSoundStream.cpp)
+		set(SRCS ${SRCS} Src/XAudio2Stream.cpp)
 	endif(WIN32)
 endif()
 
diff --git a/Source/Core/AudioCommon/Src/SConscript b/Source/Core/AudioCommon/Src/SConscript
index 8ee144ade1..cd34611843 100644
--- a/Source/Core/AudioCommon/Src/SConscript
+++ b/Source/Core/AudioCommon/Src/SConscript
@@ -24,7 +24,6 @@ else:
 		files += [ 'PulseAudioStream.cpp' ]
 	if sys.platform == 'win32':
 		files += [ 'DSoundStream.cpp' ]
-	if sys.platform == 'win32':
 		files += [ 'XAudio2Stream.cpp' ]
 
 env.StaticLibrary(env['local_libs'] + 'audiocommon', files)
diff --git a/Source/Core/DolphinWX/Src/SConscript b/Source/Core/DolphinWX/Src/SConscript
index 9ff3ebfd54..0a95164e2c 100644
--- a/Source/Core/DolphinWX/Src/SConscript
+++ b/Source/Core/DolphinWX/Src/SConscript
@@ -58,10 +58,8 @@ elif sys.platform == 'darwin' and not env['HAVE_WX']:
 	files += [ 'cocoaApp.m' ]
 	exeNoGUI = '#' + env['prefix'] + '/DolphinNoGUI'
 elif sys.platform == 'darwin' and env['HAVE_WX']:
-	exeGUI = 'Dolphin'
-	exeGUIdist = '#' + env['prefix'] + '/Dolphin.app/Contents/MacOS/Dolphin'
-
 	wxlibs += env['wxconfiglibs']
+	exeGUI = '#' + env['prefix'] + '/Dolphin.app/Contents/MacOS/Dolphin'
 
 	env.Install('#' + env['prefix'] + '/Dolphin.app/Contents/' +
 		'Library/Frameworks/Cg.framework',
@@ -89,14 +87,6 @@ elif sys.platform == 'darwin' and env['HAVE_WX']:
 		LSMinimumSystemVersion = '10.5.0',
 		LSRequiresCarbon = True,
 		)))
-
-	def Fixup(target, source, env):
-		if env['CPPDEFINES'].count('WXUSINGDLL'):
-			pass
-		os.link(str(source[0]), str(target[0]))
-	env.Append(BUILDERS = {'Fixup' : Builder(action = Fixup)})
-	env.Depends(exeGUIdist, env['plugin_dir'])
-	env.Fixup(exeGUIdist, exeGUI)
 else:
 	files += [ 'X11Utils.cpp' ]
 	libs += [ 'SDL' ]