Archive/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-05-02 06:48:03 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Don't bother using autoconfiguration to find the OpenCL and Cg

Browse source 
frameworks on OS X.

Try to be a little clearer about which configuration options apply    
to which platform(s). Should pave the way slightly for win32 scons. 
 
We have accidentally been using LUA_USE_LINUX on OS X all along.
Turns out that LUA_USE_MACOSX is for an ancient version of OS X and
LUA_USE_LINUX is a reasonable set of defaults for modern Unices, so
just keep using that.


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5804 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Soren Jorvang 2010-06-26 19:17:43 +00:00
parent 9de9ec1fb6
commit d18085c3ad
7 changed files with 102 additions and 135 deletions
Download patch file Download diff file Expand all files Collapse all files

21
SconsTests/utils.py
View file

@ -8,22 +8,6 @@ def CheckPKGConfig(context, version):
context.Result( ret )
return ret
def CheckFramework(context, name):
ret = 0
if (platform.system().lower() == 'darwin'):
context.Message( '\nLooking for framework %s... ' % name )
lastFRAMEWORKS = context.env['FRAMEWORKS']
context.env.Append(FRAMEWORKS = [name])
ret = context.TryLink("""
int main(int argc, char **argv) {
return 0;
}
""", '.c')
if not ret:
context.env.Replace(FRAMEWORKS = lastFRAMEWORKS)
return ret
# TODO: We should use the scons one instead
def CheckLib(context, name):
context.Message( 'Looking for lib %s... ' % name )
@ -52,9 +36,8 @@ def CheckPKG(context, name):
if platform.system().lower() == 'windows':
return 0
ret = 1
if not CheckFramework(context, name):
if not ConfigPKG(context, name.lower()):
ret = CheckLib(context, name)
if not ConfigPKG(context, name.lower()):
ret = CheckLib(context, name)
context.Result(ret)
return int(ret)