From de7abc6bd06428d63ac9535855eb5c14ab79d0f2 Mon Sep 17 00:00:00 2001 From: nakeee Date: Sun, 28 Dec 2008 17:56:59 +0000 Subject: [PATCH] By JP's request Build directory is now per flavour Debug build will add -debug i.e. Binary/i686-debug/Dolphin git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1705 8ced0084-cf51-0410-be5f-012b33b47a6e --- SConstruct | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/SConstruct b/SConstruct index 9e2995af67..3b03ab6e04 100644 --- a/SConstruct +++ b/SConstruct @@ -184,7 +184,7 @@ tests = {'CheckWXConfig' : wxconfig.CheckWXConfig, 'CheckPKG' : utils.CheckPKG, 'CheckSDL' : utils.CheckSDL} -build_dir = os.path.join('Build', platform.system() + '-' + platform.machine() + os.sep) +build_dir = os.path.join('Build', platform.system() + '-' + platform.machine() + '-' + env['flavor'] + os.sep) VariantDir(build_dir, '.', duplicate=0) conf = env.Configure(custom_tests = tests, @@ -270,8 +270,12 @@ env.AddMethod(utils.filterWarnings) env['base_dir'] = os.getcwd()+ '/'; # install paths +extra='' +if env['flavor'] == 'debug': + extra = '-debug' + # TODO: support global install -env['prefix'] = os.path.join(env['base_dir'] + 'Binary', platform.system() + '-' + platform.machine() + '/') +env['prefix'] = os.path.join(env['base_dir'] + 'Binary', platform.system() + '-' + platform.machine() + extra +os.sep) #TODO add lib env['plugin_dir'] = env['prefix'] + 'Plugins/' #TODO add bin