From 0d9543030b304438b650482e60926001f821a9e5 Mon Sep 17 00:00:00 2001 From: Sonicadvance1 Date: Fri, 18 Sep 2009 20:04:54 +0000 Subject: [PATCH] Missed some stuff git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4300 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Plugins/Plugin_DSP_LLE/Src/SConscript | 3 ++- Source/Plugins/Plugin_VideoOGL/Src/SConscript | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Source/Plugins/Plugin_DSP_LLE/Src/SConscript b/Source/Plugins/Plugin_DSP_LLE/Src/SConscript index 78043cbb11..9857ebc34b 100644 --- a/Source/Plugins/Plugin_DSP_LLE/Src/SConscript +++ b/Source/Plugins/Plugin_DSP_LLE/Src/SConscript @@ -41,5 +41,6 @@ else: CXXFLAGS = [ '-fPIC' ], LIBS = [ 'dspcore', 'audiocommon', 'common' ], ) -lleenv['FRAMEWORKS'] = ['CoreFoundation', 'System'] +if sys.platform == 'darwin': + lleenv['FRAMEWORKS'] = ['CoreFoundation', 'System'] lleenv.SharedLibrary(env['plugin_dir']+name, files) diff --git a/Source/Plugins/Plugin_VideoOGL/Src/SConscript b/Source/Plugins/Plugin_VideoOGL/Src/SConscript index 7c58c60b92..675584b337 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/SConscript +++ b/Source/Plugins/Plugin_VideoOGL/Src/SConscript @@ -61,11 +61,12 @@ 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'] + conf.CheckPKG('OpenGL') if not conf.CheckPKG('Cg'): print name + " must have Cg framework from nvidia to be build" - #Return() + Return() elif sys.platform == 'win32': print name + " is assuming that you have opengl, glu, cg, and cggl" @@ -107,7 +108,6 @@ conf.Finish() if gfxenv['USE_WX'] and not gfxenv['HAVE_WX']: print "Must have wx to use wxgl" Return() -gfxenv['FRAMEWORKS'] = ['CoreFoundation', 'System', 'OpenGL', 'Cocoa', 'Cg'] gfxenv.Append( CXXFLAGS = compileFlags, LINKFLAGS = linkFlags,