diff --git a/Externals/GLew/SConscript b/Externals/GLew/SConscript index 79fe2be486..2c22609b1f 100644 --- a/Externals/GLew/SConscript +++ b/Externals/GLew/SConscript @@ -4,7 +4,6 @@ Import('env') import sys if env.has_key('shared_glew') and env['shared_glew']: - env['LIBS'] += ['GLEW'] Return() if sys.platform == 'darwin': diff --git a/Externals/LZO/SConscript b/Externals/LZO/SConscript index 2d1f67f237..80a47c0ca7 100644 --- a/Externals/LZO/SConscript +++ b/Externals/LZO/SConscript @@ -3,7 +3,6 @@ Import('env') if env.has_key('shared_lzo') and env['shared_lzo']: - env['LIBS'] += ['lzo2'] Return() env['CPPPATH'] += ['#Externals/LZO'] diff --git a/Externals/SDL/SConscript b/Externals/SDL/SConscript index 745e9582db..93a1df3c72 100644 --- a/Externals/SDL/SConscript +++ b/Externals/SDL/SConscript @@ -3,11 +3,10 @@ Import('env') import sys -if sys.platform == 'darwin': +if env.has_key('shared_sdl') and env['shared_sdl']: Return() -if env.has_key('shared_sdl') and env['shared_sdl']: - env['LIBS'] += ['SDL'] +if sys.platform == 'darwin': Return() files = [ diff --git a/Externals/SOIL/SConscript b/Externals/SOIL/SConscript index de12b4d3a2..f6cd9fc4e6 100644 --- a/Externals/SOIL/SConscript +++ b/Externals/SOIL/SConscript @@ -3,7 +3,6 @@ Import('env') if env.has_key('shared_soil') and env['shared_soil']: - env['LIBS'] += ['SOIL'] Return() files = [ diff --git a/Externals/libpng/SConscript b/Externals/libpng/SConscript index 77e9dfd842..1d5ca4c5c6 100644 --- a/Externals/libpng/SConscript +++ b/Externals/libpng/SConscript @@ -4,8 +4,6 @@ Import('env') import sys if env.has_key('shared_png') and env['shared_png']: - # Currently using libwxpng in the shared case - #env['LIBS'] += ['png'] Return() files = [ diff --git a/Externals/zlib/SConscript b/Externals/zlib/SConscript index c442d634e8..a9bd6e8340 100644 --- a/Externals/zlib/SConscript +++ b/Externals/zlib/SConscript @@ -4,7 +4,9 @@ Import('env') import sys if env.has_key('shared_zlib') and env['shared_zlib']: - env['LIBS'] += ['z'] + Return() + +if sys.platform == 'darwin': Return() files = [ diff --git a/SConstruct b/SConstruct index 7de79a26b1..10c4c043a3 100644 --- a/SConstruct +++ b/SConstruct @@ -131,6 +131,7 @@ if sys.platform == 'darwin': env['LINKFLAGS'] += ccld env['LINKFLAGS'] += ['-Wl,-dead_strip,-dead_strip_dylibs'] env['LINKFLAGS'] += ['-Wl,-pagezero_size,0x1000'] + #env['LINKFLAGS'] += ['-Wl,-read_only_relocs,suppress'] #if float(os.popen('xcode-select -version').read()[21:]) < 2000: # print 'Xcode 4 running on Snow Leopard is required to build Dolphin' @@ -164,10 +165,8 @@ if sys.platform == 'darwin': wxconfig.ParseWXConfig(wxenv) env['CPPPATH'] += wxenv['CPPPATH'] env['wxconfiglibs'] = wxenv['LIBS'] - env['shared_png'] = True env['data_dir'] = '#' + env['prefix'] + '/Dolphin.app/Contents/Resources' - env['shared_zlib'] = True if env['bundle']: app = env['prefix'] + '/Dolphin.app' @@ -240,7 +239,6 @@ else: env['flavor'] == 'debug') if env['HAVE_WX']: wxconfig.ParseWXConfig(env) - env['shared_png'] = True else: print "wxWidgets not found - see config.log" diff --git a/Source/Core/DolphinWX/Src/SConscript b/Source/Core/DolphinWX/Src/SConscript index 998826144f..ee0350b96c 100644 --- a/Source/Core/DolphinWX/Src/SConscript +++ b/Source/Core/DolphinWX/Src/SConscript @@ -62,7 +62,7 @@ if sys.platform == 'win32': elif sys.platform == 'darwin': env['CPPPATH'] += ['#Externals'] env['FRAMEWORKPATH'] += ['Externals/Cg'] - env['LIBS'] += ['iconv'] + env['LIBS'] += ['iconv', 'z'] frameworksflags += ['-Wl,-weak_framework,Cg'] frameworksflags += ['-Wl,-weak_framework,OpenCL']