Missed some stuff
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4300 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
parent
ced92d8544
commit
0d9543030b
|
@ -41,5 +41,6 @@ else:
|
||||||
CXXFLAGS = [ '-fPIC' ],
|
CXXFLAGS = [ '-fPIC' ],
|
||||||
LIBS = [ 'dspcore', 'audiocommon', 'common' ],
|
LIBS = [ 'dspcore', 'audiocommon', 'common' ],
|
||||||
)
|
)
|
||||||
|
if sys.platform == 'darwin':
|
||||||
lleenv['FRAMEWORKS'] = ['CoreFoundation', 'System']
|
lleenv['FRAMEWORKS'] = ['CoreFoundation', 'System']
|
||||||
lleenv.SharedLibrary(env['plugin_dir']+name, files)
|
lleenv.SharedLibrary(env['plugin_dir']+name, files)
|
||||||
|
|
|
@ -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,
|
||||||
|
|
Loading…
Reference in New Issue