ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Clean up shared_foo handling. 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7183 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Soren Jorvang 2011-02-16 13:36:41 +00:00
parent e9f3d50eca
commit 38950e421b
8 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Externals/GLew/SConscript vendored
View File

@ -4,7 +4,6 @@ Import('env')
import sys import sys
if env.has_key('shared_glew') and env['shared_glew']: if env.has_key('shared_glew') and env['shared_glew']:
env['LIBS'] += ['GLEW']
Return() Return()
if sys.platform == 'darwin': if sys.platform == 'darwin':

1
Externals/LZO/SConscript vendored
View File

@ -3,7 +3,6 @@
Import('env') Import('env')
if env.has_key('shared_lzo') and env['shared_lzo']: if env.has_key('shared_lzo') and env['shared_lzo']:
env['LIBS'] += ['lzo2']
Return() Return()
env['CPPPATH'] += ['#Externals/LZO'] env['CPPPATH'] += ['#Externals/LZO']

5
Externals/SDL/SConscript vendored
View File

@ -3,11 +3,10 @@
Import('env') Import('env')
import sys import sys
if sys.platform == 'darwin': if env.has_key('shared_sdl') and env['shared_sdl']:
Return() Return()
if env.has_key('shared_sdl') and env['shared_sdl']: if sys.platform == 'darwin':
env['LIBS'] += ['SDL']
Return() Return()
files = [ files = [

1
Externals/SOIL/SConscript vendored
View File

@ -3,7 +3,6 @@
Import('env') Import('env')
if env.has_key('shared_soil') and env['shared_soil']: if env.has_key('shared_soil') and env['shared_soil']:
env['LIBS'] += ['SOIL']
Return() Return()
files = [ files = [

2
Externals/libpng/SConscript vendored
View File

@ -4,8 +4,6 @@ Import('env')
import sys import sys
if env.has_key('shared_png') and env['shared_png']: if env.has_key('shared_png') and env['shared_png']:
# Currently using libwxpng in the shared case
#env['LIBS'] += ['png']
Return() Return()
files = [ files = [

4
Externals/zlib/SConscript vendored
View File

@ -4,7 +4,9 @@ Import('env')
import sys import sys
if env.has_key('shared_zlib') and env['shared_zlib']: if env.has_key('shared_zlib') and env['shared_zlib']:
env['LIBS'] += ['z'] Return()
if sys.platform == 'darwin':
Return() Return()
files = [ files = [

4
SConstruct
View File

@ -131,6 +131,7 @@ if sys.platform == 'darwin':
env['LINKFLAGS'] += ccld env['LINKFLAGS'] += ccld
env['LINKFLAGS'] += ['-Wl,-dead_strip,-dead_strip_dylibs'] env['LINKFLAGS'] += ['-Wl,-dead_strip,-dead_strip_dylibs']
env['LINKFLAGS'] += ['-Wl,-pagezero_size,0x1000'] env['LINKFLAGS'] += ['-Wl,-pagezero_size,0x1000']
#env['LINKFLAGS'] += ['-Wl,-read_only_relocs,suppress']
#if float(os.popen('xcode-select -version').read()[21:]) < 2000: #if float(os.popen('xcode-select -version').read()[21:]) < 2000:
# print 'Xcode 4 running on Snow Leopard is required to build Dolphin' # print 'Xcode 4 running on Snow Leopard is required to build Dolphin'
@ -164,10 +165,8 @@ if sys.platform == 'darwin':
wxconfig.ParseWXConfig(wxenv) wxconfig.ParseWXConfig(wxenv)
env['CPPPATH'] += wxenv['CPPPATH'] env['CPPPATH'] += wxenv['CPPPATH']
env['wxconfiglibs'] = wxenv['LIBS'] env['wxconfiglibs'] = wxenv['LIBS']
env['shared_png'] = True
env['data_dir'] = '#' + env['prefix'] + '/Dolphin.app/Contents/Resources' env['data_dir'] = '#' + env['prefix'] + '/Dolphin.app/Contents/Resources'
env['shared_zlib'] = True
if env['bundle']: if env['bundle']:
app = env['prefix'] + '/Dolphin.app' app = env['prefix'] + '/Dolphin.app'
@ -240,7 +239,6 @@ else:
env['flavor'] == 'debug') env['flavor'] == 'debug')
if env['HAVE_WX']: if env['HAVE_WX']:
wxconfig.ParseWXConfig(env) wxconfig.ParseWXConfig(env)
env['shared_png'] = True
else: else:
print "wxWidgets not found - see config.log" print "wxWidgets not found - see config.log"

2
Source/Core/DolphinWX/Src/SConscript
View File

@ -62,7 +62,7 @@ if sys.platform == 'win32':
elif sys.platform == 'darwin': elif sys.platform == 'darwin':
env['CPPPATH'] += ['#Externals'] env['CPPPATH'] += ['#Externals']
env['FRAMEWORKPATH'] += ['Externals/Cg'] env['FRAMEWORKPATH'] += ['Externals/Cg']
env['LIBS'] += ['iconv'] env['LIBS'] += ['iconv', 'z']
frameworksflags += ['-Wl,-weak_framework,Cg'] frameworksflags += ['-Wl,-weak_framework,Cg']
frameworksflags += ['-Wl,-weak_framework,OpenCL'] frameworksflags += ['-Wl,-weak_framework,OpenCL']