ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Missed some stuff 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4300 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Sonicadvance1 2009-09-18 20:04:54 +00:00
parent ced92d8544
commit 0d9543030b
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Source/Plugins/Plugin_DSP_LLE/Src/SConscript
View File

@ -41,5 +41,6 @@ else:
CXXFLAGS = [ '-fPIC' ], CXXFLAGS = [ '-fPIC' ],
LIBS = [ 'dspcore', 'audiocommon', 'common' ], LIBS = [ 'dspcore', 'audiocommon', 'common' ],
) )
lleenv['FRAMEWORKS'] = ['CoreFoundation', 'System'] if sys.platform == 'darwin':
lleenv['FRAMEWORKS'] = ['CoreFoundation', 'System']
lleenv.SharedLibrary(env['plugin_dir']+name, files) lleenv.SharedLibrary(env['plugin_dir']+name, files)

6
Source/Plugins/Plugin_VideoOGL/Src/SConscript
View File

@ -61,11 +61,12 @@ conf = gfxenv.Configure(custom_tests = tests,
config_h=env['base_dir']+"Source/Core/Common/Src/Config.h") config_h=env['base_dir']+"Source/Core/Common/Src/Config.h")
if sys.platform == 'darwin': if sys.platform == 'darwin':
gfxenv['FRAMEWORKS'] = ['CoreFoundation', 'System', 'OpenGL', 'Cocoa', 'Cg']
conf.CheckPKG('OpenGL') conf.CheckPKG('OpenGL')
if not conf.CheckPKG('Cg'): if not conf.CheckPKG('Cg'):
print name + " must have Cg framework from nvidia to be build" print name + " must have Cg framework from nvidia to be build"
#Return() Return()
elif sys.platform == 'win32': elif sys.platform == 'win32':
print name + " is assuming that you have opengl, glu, cg, and cggl" 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']: if gfxenv['USE_WX'] and not gfxenv['HAVE_WX']:
print "Must have wx to use wxgl" print "Must have wx to use wxgl"
Return() Return()
gfxenv['FRAMEWORKS'] = ['CoreFoundation', 'System', 'OpenGL', 'Cocoa', 'Cg']
gfxenv.Append( gfxenv.Append(
CXXFLAGS = compileFlags, CXXFLAGS = compileFlags,
LINKFLAGS = linkFlags, LINKFLAGS = linkFlags,