diff options
| author | Nathan Letwory <nathan@letworyinteractive.com> | 2008-04-28 00:17:14 +0400 |
|---|---|---|
| committer | Nathan Letwory <nathan@letworyinteractive.com> | 2008-04-28 00:17:14 +0400 |
| commit | 1da7742b8a59679cfd9d61bde94bc4ccfdbe2b7b (patch) | |
| tree | f391325aa2d9d033976126b83e091f1ccb14c031 /SConstruct | |
| parent | ec02fff2aada174eb8d193326232b672e856275f (diff) | |
* change BF_CONFIG so that it is understood as 'user-config.py' instead of config/platform-config.py it tried to do before. If defined, it overrides the search (and potential use) of user-config.py.
It didn't work before anyway, so this change should affect nobody.
usage: scons BF_CONFIG=someconfigfile
Diffstat (limited to 'SConstruct')
| -rw-r--r-- | SConstruct | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/SConstruct b/SConstruct index 650e58c3536..dcb5cfef3ec 100644 --- a/SConstruct +++ b/SConstruct @@ -143,7 +143,7 @@ if crossbuild and platform!='win32': env['OURPLATFORM'] = platform -configfile = B.arguments.get('BF_CONFIG', 'config'+os.sep+platform+'-config.py') +configfile = 'config'+os.sep+platform+'-config.py' if os.path.exists(configfile): print B.bc.OKGREEN + "Using config file: " + B.bc.ENDC + configfile @@ -157,13 +157,14 @@ if crossbuild and env['PLATFORM'] != 'win32': # Needed for gui programs, console programs should do without it env.Append(LINKFLAGS=['-mwindows']) +userconfig = B.arguments.get('BF_CONFIG', 'user-config.py') # first read platform config. B.arguments will override optfiles = [configfile] -if os.path.exists('user-config.py'): - print B.bc.OKGREEN + "Using config file: " + B.bc.ENDC + 'user-config.py' - optfiles += ['user-config.py'] +if os.path.exists(userconfig): + print B.bc.OKGREEN + "Using user-config file: " + B.bc.ENDC + userconfig + optfiles += [userconfig] else: - print B.bc.WARNING + 'user-config.py' + " not found, no user overrides" + B.bc.ENDC + print B.bc.WARNING + userconfig + " not found, no user overrides" + B.bc.ENDC opts = btools.read_opts(optfiles, B.arguments) opts.Update(env) |