Build with -msse3 on OS X. The first Intel Macs were Core Duo/Solo, which

had SSE3. Keep -msse2 on other platforms. Not sure if there are actually
any Dolphin-capable machines out there without SSE3, but..

Use -search_paths_first to give our statically linked libraries precedence
over /usr/local/lib. 

Some work-in-progress changes to facilitate a more easily redistributable
application bundle on OS X.

Group compiler/preprocessor/linker flags together to make the full set
more intuitively apparent.

The various libraries in Externals have rather inconsistent conventions
for include paths. Best to encapsulate that knowledge in foo/SConscript.

Re-use utils.GenerateRevFile for all three places in the build system 
where we need the SVN revision number.


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6030 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Soren Jorvang
2010-08-01 16:30:22 +00:00
parent fad075351c
commit 52d3137598
14 changed files with 209 additions and 209 deletions

View File

@ -15,3 +15,4 @@ if sys.platform == 'win32':
files += [ "stdafx.cpp" ]
env.StaticLibrary(env['local_libs'] + "bdisasm", files)
env['CPPPATH'] += ['#Externals/Bochs_disasm']

View File

@ -2,6 +2,9 @@
Import('env')
if env.has_key('shared_glew') and env['shared_glew']:
Return()
files = [
'src/glew.c',
'src/glewinfo.c',
@ -9,3 +12,4 @@ files = [
]
env.StaticLibrary(env['local_libs'] + "GLEW", files)
env['CPPPATH'] += ['#Externals/GLew/include']

View File

@ -2,8 +2,12 @@
Import('env')
if env.has_key('shared_lzo') and env['shared_lzo']:
Return()
files = [
"minilzo.c",
]
env.StaticLibrary(env['local_libs'] + "lzo2", files)
env['CPPPATH'] += ['#Externals/LZO']

View File

@ -42,3 +42,4 @@ files = [
]
luaenv.StaticLibrary(env['local_libs'] + "lua", files)
env['CPPPATH'] += ['#Externals/Lua']

View File

@ -3,6 +3,9 @@
Import('env')
import sys
if env.has_key('shared_sdl') and env['shared_sdl']:
Return()
files = [
'src/SDL.c',
'src/SDL_error.c',
@ -36,3 +39,4 @@ else:
]
env.StaticLibrary(env['local_libs'] + "SDL", files)
env['CPPPATH'] += ['#Externals/SDL', '#Externals/SDL/include']

View File

@ -2,6 +2,9 @@
Import('env')
if env.has_key('shared_sfml') and env['shared_sfml']:
Return()
files = [
"SFML/Network/Ftp.cpp",
"SFML/Network/Http.cpp",
@ -14,3 +17,4 @@ files = [
]
env.StaticLibrary(env['local_libs'] + "sfml-network", files)
env['CPPPATH'] += ['#Externals/SFML/include']

View File

@ -2,6 +2,9 @@
Import('env')
if env.has_key('shared_soil') and env['shared_soil']:
Return()
files = [
'image_DXT.c',
'image_helper.c',
@ -10,3 +13,4 @@ files = [
]
env.StaticLibrary(env['local_libs'] + "SOIL", files)
env['CPPPATH'] += ['#Externals/SOIL']

View File

@ -3,11 +3,10 @@
Import('env')
import sys
if (sys.platform == 'linux2' and not env['HAVE_BLUEZ']) or \
(not sys.platform == 'darwin' and
not sys.platform == 'linux2' and
not sys.platform == 'win32'):
env['HAVE_WIIUSE'] = 0
env['HAVE_WIIUSE'] = 0
if not sys.platform == 'darwin' and not sys.platform == 'win32' and \
not (sys.platform == 'linux2' and env['HAVE_BLUEZ']):
Return()
env['HAVE_WIIUSE'] = 1
@ -25,3 +24,4 @@ elif sys.platform == 'win32':
files += [ "io_win.c" ]
env.StaticLibrary(env['local_libs'] + "wiiuse", files)
env['CPPPATH'] += ['#Externals/WiiUse/Src']

View File

@ -2,6 +2,9 @@
Import('env')
if env.has_key('shared_zlib') and env['shared_zlib']:
Return()
files = [
'adler32.c',
'compress.c',
@ -18,3 +21,4 @@ files = [
]
env.StaticLibrary(env['local_libs'] + "z", files)
env['CPPPATH'] += ['#Externals/zlib']