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

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',

Source/Core/DolphinWX/SConscript

@@ -3,7 +3,6 @@
 Import('env')
 import os
 import sys
-from SconsTests import utils
 
 if env['nowx']:
 	files = ['Src/MainNoGUI.cpp']
@@ -113,8 +112,7 @@ elif sys.platform == 'darwin':
 		CFBundleIdentifier = 'com.dolphin-emulator.dolphin',
 		CFBundleLocalizations = languages,
 		CFBundlePackageType = 'APPL',
-		CFBundleShortVersionString =
-			utils.GenerateRevFile('', Dir('#None').abspath, None),
+		CFBundleShortVersionString = env['svnrev'],
 		CFBundleVersion = '3.0',
 		LSMinimumSystemVersion = '10.5.4',
 		LSRequiresCarbon = True,

Source/Core/VideoCommon/Src/OpenCL/OCLTextureDecoder.cpp

@@ -216,7 +216,7 @@ void TexDecoder_OpenCL_Initialize()
 			}
 			for (u32 i = 0; i < nDevices; ++i)
 			{
-				if (binary_sizes[i] != NULL)
+				if (binary_sizes[i] != 0)
 				{
 					free(binaries[i]);
 				}