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

Allow full-length Unix pathnames.

Browse Source 
Move bits of HAVE_OPENCL/HAVE_WX for OS X from SConstruct to header files.

Use /usr/lib/libz on OS X now that we no longer have -L/opt/local/lib in
the library path. It is still possible that we could pick up a libz in
/usr/local/lib that would make the application non-redistributable, but
the danger is much less than previously.

Also bits of minor portability cleanup.


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5868 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Soren Jorvang
2010-07-10 21:17:08 +00:00
parent 379706b25a
commit addb89fecc
8 changed files with 79 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
SConstruct
View File

@ -204,7 +204,6 @@ env['CCFLAGS'] = compileFlags
env['CPPDEFINES'] = cppDefines
if not sys.platform == 'win32':
env['CXXFLAGS'] = ['-fvisibility-inlines-hidden']
cppDefines.append('LUA_USE_LINUX')
# Configuration tests section
tests = {'CheckWXConfig' : wxconfig.CheckWXConfig,
@ -258,21 +257,16 @@ env['HAVE_WX'] = 0
if sys.platform == 'darwin':
compileFlags.append('-mmacosx-version-min=10.5')
if not env['nowx']:
cppDefines.append('HAVE_WX=1')
conf = env.Configure(custom_tests = tests)
# wxWidgets 2.9 has Cocoa support
env['HAVE_WX'] = conf.CheckWXConfig(2.9, wxmods, 0)
wxconfig.ParseWXConfig(env)
# Make sure that the libraries claimed by wx-config are valid
if not conf.CheckLib('wx_baseu-2.9'):
print "WX libraries not found - see config.log"
Exit(1)
conf.Finish()
# wx-config wants us to link with the OS X QuickTime framework
# which is not available for x86_64 and we don't use it anyway.
# Strip it out to silence some harmless linker warnings.
if env['FRAMEWORKS'].count('QuickTime'):
env['FRAMEWORKS'].remove('QuickTime')
if env['CPPDEFINES'].count('WXUSINGDLL'):
if env['FRAMEWORKS'].count('QuickTime'):
env['FRAMEWORKS'].remove('QuickTime')
env['CC'] = "gcc-4.2"
env['CFLAGS'] = ['-x', 'objective-c']
env['CXX'] = "g++-4.2"
@ -287,6 +281,7 @@ if sys.platform == 'darwin':
env['HAVE_OPENCL'] = 1
env['LINKFLAGS'] += ['-weak_framework', 'OpenCL']
env['FRAMEWORKS'] += ['Cg']
shared['zlib'] = 1
if not sys.platform == 'win32' and not sys.platform == 'darwin':
conf = env.Configure(custom_tests = tests,
@ -371,6 +366,7 @@ if not sys.platform == 'win32' and not sys.platform == 'darwin':
if env['opencl']:
env['HAVE_OPENCL'] = conf.CheckPKG('OpenCL')
conf.Define('HAVE_OPENCL', env['HAVE_OPENCL'])
conf.Define('USER_DIR', "\"" + env['userdir'] + "\"")
if (env['install'] == 'global'):
@ -395,8 +391,6 @@ if not sys.platform == 'win32' and not sys.platform == 'darwin':
else:
print "Can't build prof without oprofile, disabling"
conf.Define('HAVE_OPENCL', env['HAVE_OPENCL'])
# After all configuration tests are done
conf.Finish()