From c5d4c2c1b1c6ac669f2573b5ae84fa946f0db243 Mon Sep 17 00:00:00 2001 From: Glenn Rice Date: Sun, 14 Mar 2010 21:01:02 +0000 Subject: [PATCH] Fix an issue with scons not using cached command line arguments git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5196 8ced0084-cf51-0410-be5f-012b33b47a6e --- SConstruct | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/SConstruct b/SConstruct index c29b5d8e19..9657922eaf 100644 --- a/SConstruct +++ b/SConstruct @@ -185,7 +185,7 @@ if not env['verbose']: env['RANLIBCOMSTR'] = "Indexing $TARGET" # build flavor -flavour = ARGUMENTS.get('flavor') +flavour = env['flavor'] if (flavour == 'debug'): compileFlags.append('-ggdb') cppDefines.append('_DEBUG') #enables LOGGING @@ -254,7 +254,7 @@ elif flavour == 'prof': extra = '-prof' # Set up the install locations -if (ARGUMENTS.get('install') == 'global'): +if (env['install'] == 'global'): env['prefix'] = os.path.join(env['prefix'] + os.sep) env['binary_dir'] = env['prefix'] + 'bin/' env['libs_dir'] = env['prefix'] + 'lib/' @@ -415,7 +415,7 @@ conf.Define('SHARED_SOIL', env['SHARED_SOIL']) conf.Define('SHARED_LZO', env['SHARED_LZO']) conf.Define('SHARED_SFML', env['SHARED_SFML']) conf.Define('USER_DIR', "\"" + env['userdir'] + "\"") -if (ARGUMENTS.get('install') == 'global'): +if (env['install'] == 'global'): conf.Define('DATA_DIR', "\"" + env['data_dir'] + "\"") conf.Define('LIBS_DIR', "\"" + env['libs_dir'] + "\"")