diff options
| author | Glenn Rice <glennricster@gmail.com> | 2010-02-02 23:21:19 +0000 |
|---|---|---|
| committer | Glenn Rice <glennricster@gmail.com> | 2010-02-02 23:21:19 +0000 |
| commit | 05a998f77725403564ee4e2efeee512d9d402019 (patch) | |
| tree | 22c1d321c4e7f84375fb3aa3bf573f8fb7594dc5 /SConstruct | |
| parent | feba09f7a3e8d8e9b1ea2fe0d666c5be82941096 (diff) | |
Code cleanup to improve readability.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4995 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'SConstruct')
| -rw-r--r-- | SConstruct | 29 |
1 files changed, 8 insertions, 21 deletions
diff --git a/SConstruct b/SConstruct index d8e8768540..d9f6c229d6 100644 --- a/SConstruct +++ b/SConstruct @@ -242,37 +242,24 @@ if flavour == 'debug': elif flavour == 'prof': extra = '-prof' -# TODO: support global install +# Set up the install locations if (ARGUMENTS.get('install') == 'global'): env['prefix'] = os.path.join(env['prefix'] + os.sep) -else: - env['prefix'] = os.path.join(env['base_dir'] + 'Binary', platform.system() + '-' + platform.machine() + extra +os.sep) -#TODO add lib -if (ARGUMENTS.get('install') == 'global'): - env['plugin_dir'] = env['prefix'] + 'lib/dolphin-emu/' -else: - if sys.platform == 'darwin': - env['plugin_dir'] = env['prefix'] + 'Dolphin.app/Contents/PlugIns/' - else: - env['plugin_dir'] = env['prefix'] + 'Plugins/' -#TODO add bin -if (ARGUMENTS.get('install') == 'global'): env['binary_dir'] = env['prefix'] + 'bin/' -else: - env['binary_dir'] = env['prefix'] -#TODO add bin -if (ARGUMENTS.get('install') == 'global'): env['libs_dir'] = env['prefix'] + 'lib/' -else: - env['libs_dir'] = env['prefix'] + 'Libs/' -#TODO where should this go? -if (ARGUMENTS.get('install') == 'global'): + env['plugin_dir'] = env['prefix'] + 'lib/dolphin-emu/' env['data_dir'] = env['prefix'] + "share/dolphin-emu/" else: + env['prefix'] = os.path.join(env['base_dir'] + 'Binary', platform.system() + '-' + platform.machine() + extra + os.sep) + env['binary_dir'] = env['prefix'] if sys.platform == 'darwin': + env['plugin_dir'] = env['prefix'] + 'Dolphin.app/Contents/PlugIns/' env['data_dir'] = env['prefix'] + 'Dolphin.app/Contents/' + env['libs_dir'] = env['prefix'] + 'Libs/' else: + env['plugin_dir'] = env['prefix'] + 'plugins/' env['data_dir'] = env['prefix'] + env['libs_dir'] = env['prefix'] + 'lib/' env['RPATH'].append(env['libs_dir']) |