summaryrefslogtreecommitdiff
path: root/Source/Core/Common/SConscript
diff options
context:
space:
mode:
authorSoren Jorvang <soren.jorvang@gmail.com>2011-03-20 18:35:07 +0000
committerSoren Jorvang <soren.jorvang@gmail.com>2011-03-20 18:35:07 +0000
commit215baff4c8524ec7aa2a084ab7323a57f3261f54 (patch)
treed672c23ad80d3251192c3f39d42367ba31de0e19 /Source/Core/Common/SConscript
parentd14efe561bf8a6c57cbc15fc9e2c3b509c45c10e (diff)
Simplify the SCons build:
With wxWidgets 2.9.2 now in Externals, SCons was the only external dependency other than Xcode and building just SCons from Macports caused a fair mount of extra stuff to be built unnecessarily, so just include a copy of scons-local. Always build wxWidgets from Externals which allows us to get rid of the home-grown autoconf machinery in SconsTests. The main use case for args.cache was the wxconfig option, which is no longer relevant after the above changes and caching options has a lot of potential for confusion, especially since other build systems don't tend to do this, so we no longer do it now. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7381 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core/Common/SConscript')
-rw-r--r--Source/Core/Common/SConscript7
1 files changed, 5 insertions, 2 deletions
diff --git a/Source/Core/Common/SConscript b/Source/Core/Common/SConscript
index 0515186ff8..74eebdd611 100644
--- a/Source/Core/Common/SConscript
+++ b/Source/Core/Common/SConscript
@@ -5,8 +5,11 @@ import os
import sys
def createVersion(env, target, source):
- from SconsTests import utils
- utils.GenerateRevFile(env['flavor'], source[0].path, target[0].path)
+ tmpstr = open(source[0].path, 'r').read().\
+ replace("$WCMODS?$WCREV$M:$WCREV$$", env['svnrev'])
+ outfile = open(target[0].path, 'w')
+ outfile.write(tmpstr + '\n')
+ outfile.close()
Execute(Delete('Src/svnrev.h'))
env.Command('Src/svnrev.h', 'Src/svnrev_template.h',