diff options
| author | Joshua Leung <aligorith@gmail.com> | 2012-11-12 06:30:16 +0400 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2012-11-12 06:30:16 +0400 |
| commit | c844033cd0ddf23137e338abae91afece98752b6 (patch) | |
| tree | 80c1f49da6b74c28efcbaf99915863fe2531f688 /build_files/scons/config/win32-mingw-config.py | |
| parent | cf1801e1678c06bf94a75bda01d4b6739476d8ca (diff) | |
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
Diffstat (limited to 'build_files/scons/config/win32-mingw-config.py')
| -rw-r--r-- | build_files/scons/config/win32-mingw-config.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/build_files/scons/config/win32-mingw-config.py b/build_files/scons/config/win32-mingw-config.py index 768722fac32..77641f8c842 100644 --- a/build_files/scons/config/win32-mingw-config.py +++ b/build_files/scons/config/win32-mingw-config.py @@ -164,8 +164,7 @@ WITH_BF_BOOST = True BF_BOOST = LIBDIR + '/boost' BF_BOOST_INC = BF_BOOST + '/include' BF_BOOST_LIB = 'boost_date_time-mgw46-mt-s-1_49 boost_filesystem-mgw46-mt-s-1_49 boost_regex-mgw46-mt-s-1_49 boost_system-mgw46-mt-s-1_49 boost_thread-mgw46-mt-s-1_49' -if WITH_BF_INTERNATIONAL: - BF_BOOST_LIB += ' boost_locale-mgw46-mt-s-1_49' +BF_BOOST_LIB_INTERNATIONAL = 'boost_locale-mgw46-mt-s-1_49' BF_BOOST_LIBPATH = BF_BOOST + '/lib' #Ray trace optimization |