From 0dc50d283d2f0eb3c29cddf759671a8b1fac45c4 Mon Sep 17 00:00:00 2001 From: Soren Jorvang Date: Tue, 26 Oct 2010 13:53:13 +0000 Subject: [PATCH] Only link with libdl on Linux. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6316 8ced0084-cf51-0410-be5f-012b33b47a6e --- SConstruct | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/SConstruct b/SConstruct index 465a11c499..31924f73c0 100644 --- a/SConstruct +++ b/SConstruct @@ -138,10 +138,10 @@ if sys.platform == 'darwin': env['HAVE_OPENCL'] = 0 else: env['CCFLAGS'] += ['-Wextra-tokens', '-Wnewline-eof'] - env['CCFLAGS'] += ['-iframework/Developer/SDKs/MacOSX10.5.sdk' + - '/System/Library/Frameworks'] - env['CCFLAGS'] += ['-iframework/Developer/SDKs/MacOSX10.6.sdk' + - '/System/Library/Frameworks'] + env['CCFLAGS'] += ['-iframework' + + '/Developer/SDKs/MacOSX10.5.sdk/System/Library/Frameworks'] + env['CCFLAGS'] += ['-iframework' + + '/Developer/SDKs/MacOSX10.6.sdk/System/Library/Frameworks'] env['CPPDEFINES'] += [('HAVE_OPENCL', 1)] env['HAVE_OPENCL'] = 1 env['FRAMEWORKSFLAGS'] = ['-weak_framework', 'OpenCL'] @@ -191,8 +191,8 @@ else: if sys.platform == 'linux2': env['CPPDEFINES'] += [('_FILE_OFFSET_BITS', 64), '_LARGEFILE_SOURCE'] env['CXXFLAGS'] += ['-Wno-deprecated'] # XXX - env['LINKFLAGS'] += ['-pthread', '-ldl'] - env['RPATH'] = [] + env['LINKFLAGS'] += ['-pthread', '-ldl'] + env['RPATH'] = [] conf = env.Configure(config_h = "#config.h", custom_tests = { 'CheckPKG' : utils.CheckPKG,