From c844033cd0ddf23137e338abae91afece98752b6 Mon Sep 17 00:00:00 2001 From: Joshua Leung Date: Mon, 12 Nov 2012 02:30:16 +0000 Subject: Scons compiling fix Proper implementation for only including the boost locale libs when WITH_BF_INTERNATIONAL is enabled, so that those of us who do not need/want to bother with translated ui's can compile. The way it was done before was wrong as 1) the value was always set to true earlier in the config scripts, 2) the base config scripts run before user config overrides are set --- build_files/scons/config/linux-config.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'build_files/scons/config/linux-config.py') diff --git a/build_files/scons/config/linux-config.py b/build_files/scons/config/linux-config.py index 9bab4bc1dad..9ffe67e6b48 100644 --- a/build_files/scons/config/linux-config.py +++ b/build_files/scons/config/linux-config.py @@ -226,8 +226,7 @@ if not os.path.exists(LCGDIR + '/boost'): BF_BOOST = '/usr' BF_BOOST_INC = BF_BOOST + '/include' BF_BOOST_LIB = 'boost_date_time boost_filesystem boost_regex boost_system boost_thread' -if WITH_BF_INTERNATIONAL: - BF_BOOST_LIB += ' boost_locale' +BF_BOOST_LIB_INTERNATIONAL = 'boost_locale' BF_BOOST_LIBPATH = BF_BOOST + '/lib' WITH_BF_CYCLES = WITH_BF_OIIO and WITH_BF_BOOST -- cgit v1.2.3