piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-24 14:49:42 -06:00
Code Issues Packages Projects Releases Wiki Activity

scons fixes

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1464 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
nakeee
2008-12-09 21:46:32 +00:00
parent 61f6c097f4
commit 8fdfe2583c
3 changed files with 69 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,6 +5,7 @@ Import('env')
import sys
sys.path.append(env['base_dir']+'SconsTests')
import utils
import platform
name = "Plugin_VideoOGL"
@ -41,7 +42,7 @@ compileFlags = [
linkFlags = [
]
libs = [
'videocommon', 'common', 'GLEW',
'videocommon', 'common',
]
gfxenv = env.Clone()
@ -59,59 +60,39 @@ if gfxenv['osx64']:
'-x',
'objective-c++',
]
linkFlags += [
'-framework',
'cocoa',
'-arch',
'x86_64'
]
tests = {'CheckPKG' : utils.CheckPKG}
conf = gfxenv.Configure(custom_tests = tests)
if not conf.CheckPKG('gl'):
if not conf.CheckLibWithHeader('gl', 'gl.h', 'c', 1):
print name + " must have opengl to be build"
else:
gfxenv.ParseConfig("pkg-config gl --cflags --libs")
#if not conf.CheckPKG('glu')):
# Return()
# check for xxf86vm
gfxenv['HAVE_XXF86VM'] = conf.CheckPKG('xxf86vm')
conf.Finish()
if gfxenv['HAVE_XXF86VM']:
gfxenv.ParseConfig("pkg-config xxf86vm --cflags --libs")
#gfxenv.ParseConfig("pkg-config glu --cflags --libs")
conf = gfxenv.Configure(custom_tests = tests,
config_h="Source/Core/Common/Src/Config.h")
if sys.platform == 'darwin':
# Use libraries from MacPorts.
compileFlags.append('-I/opt/local/include')
linkFlags.append('-L/opt/local/lib')
# Use frameworks instead of plain libs, when possible.
linkFlags += [
'-Wl,-framework,%s' % framework
for framework in [ 'Cg', 'OpenGL' ]
]
conf.CheckPKG('cocoa')
conf.CheckPKG('OpenGL')
else:
# Libraries without pkg-config support.
libs += [ 'Cg', 'CgGL', 'GLU' ]
if not (conf.CheckPKG('GL') and conf.CheckPKG('GLU')):
print name + " must have opengl and glu to be build"
Return()
if not conf.CheckPKG('Cg') or not conf.CheckPKG('CgGL'):
print name + " must have cg and cggl to be build"
Return()
if not conf.CheckPKG('GLEW'):
print name + " must have glew to be build"
Return()
# check for xxf86vm
gfxenv['HAVE_XXF86VM'] = conf.CheckPKG('xxf86vm')
conf.Define('HAVE_XXF86VM', gfxenv['HAVE_XXF86VM'])
conf.Finish()
# change to True if you want to compile with SDL
useSDL = not (gfxenv['HAVE_X11'] and gfxenv['HAVE_XXF86VM'])