diff options
| author | Soren Jorvang <soren.jorvang@gmail.com> | 2010-08-01 16:30:22 +0000 |
|---|---|---|
| committer | Soren Jorvang <soren.jorvang@gmail.com> | 2010-08-01 16:30:22 +0000 |
| commit | 52d3137598be98a0c41598324f8cc4dd0e83ccc5 (patch) | |
| tree | a819a13696ac5396d3b8233c19f3c6a440fc4699 /Externals/SFML/src/SConscript | |
| parent | fad075351c55d8121417fd0c952c0ba80ce0a5d8 (diff) | |
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
Diffstat (limited to 'Externals/SFML/src/SConscript')
| -rw-r--r-- | Externals/SFML/src/SConscript | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Externals/SFML/src/SConscript b/Externals/SFML/src/SConscript index 2ec3e26d6d..258d3df72a 100644 --- a/Externals/SFML/src/SConscript +++ b/Externals/SFML/src/SConscript @@ -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'] |