From b57a079a3838508b6ff0cbfcf24959d2525ee14e Mon Sep 17 00:00:00 2001 From: Dane Springmeyer Date: Wed, 31 Aug 2011 03:05:01 +0000 Subject: [PATCH] only link to bz2 if were linking statically --- SConstruct | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/SConstruct b/SConstruct index 50313bf8a..e49d5a717 100644 --- a/SConstruct +++ b/SConstruct @@ -1073,11 +1073,12 @@ if not preconfigured: conf.parse_config('FREETYPE_CONFIG') # check if freetype links to bz2 - temp_env = env.Clone() - temp_env['LIBS'] = [] - temp_env.ParseConfig('%s --libs' % env['FREETYPE_CONFIG']) - if 'bz2' in temp_env['LIBS']: - env['EXTRA_FREETYPE_LIBS'].append('bz2') + if env['RUNTIME_LINK'] == 'static': + temp_env = env.Clone() + temp_env['LIBS'] = [] + temp_env.ParseConfig('%s --libs' % env['FREETYPE_CONFIG']) + if 'bz2' in temp_env['LIBS']: + env['EXTRA_FREETYPE_LIBS'].append('bz2') if env['XMLPARSER'] == 'tinyxml': env['CPPPATH'].append('#tinyxml')