piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-21 21:30:19 -06:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

42
SconsTests/utils.py
View File

@ -30,14 +30,14 @@ def ConfigPKG(context, name):
if ret:
context.env.ParseConfig('pkg-config --cflags --libs \'%s\'' % name)
return int(ret)
def CheckPKG(context, name):
context.Message( 'Checking for %s... ' % name )
if platform.system().lower() == 'windows':
return 0
return 0
ret = 1
if not ConfigPKG(context, name.lower()):
ret = CheckLib(context, name)
ret = CheckLib(context, name)
context.Result(ret)
return int(ret)
@ -52,20 +52,20 @@ def CheckSDL(context, version):
else:
found_ver = os.popen('sdl-config --version').read().strip()
required = [int(n) for n in version.split(".")]
found = [int(n) for n in found_ver.split(".")]
found = [int(n) for n in found_ver.split(".")]
ret = (found >= required)
context.Result(ret)
if ret:
context.env.ParseConfig('sdl-config --cflags --libs')
ret = CheckLib(context, 'SDL')
return int(ret)
def CheckPortaudio(context, version):
found = 0
if CheckPKG(context, 'portaudio'):
context.Message( 'Checking for lib portaudio version > %s... ' % version)
found = context.TryRun("""
found = context.TryRun("""
#include <portaudio.h>
#include <stdio.h>
int main(int argc, char **argv) {
@ -81,18 +81,22 @@ def CheckPortaudio(context, version):
context.Result(ret)
return int(ret)
def GenerateRevFile(flavour, template, output):
def GenerateRevFile(flavour, template, output):
try:
svnrev = os.popen('svnversion .').read().strip().split(':')[0]
svnrev = os.popen('svnversion ' + os.path.dirname(template)).\
read().strip().split(':')[0]
except:
svnrev = ""
revstr = svnrev + "-" + flavour
tmpstr = open(template, "r").read().replace("$WCMODS?$WCREV$M:$WCREV$$",revstr)
outfile = open(output, 'w')
outfile.write(tmpstr +"\n")
outfile.close()
return revstr
svnrev = ''
if flavour:
svnrev += '-' + flavour
if output:
tmpstr = open(template, 'r').read().\
replace("$WCMODS?$WCREV$M:$WCREV$$", svnrev)
outfile = open(output, 'w')
outfile.write(tmpstr + '\n')
outfile.close()
return svnrev