diff options
| -rw-r--r-- | SConstruct | 7 | ||||
| -rwxr-xr-x | tools/btools.py | 4 |
2 files changed, 9 insertions, 2 deletions
diff --git a/SConstruct b/SConstruct index 8d0c0356b9d..70931073ad7 100644 --- a/SConstruct +++ b/SConstruct @@ -108,6 +108,13 @@ if not env: print "Could not create a build environment" Exit() +cc = B.arguments.get('CC', None) +cxx = B.arguments.get('CXX', None) +if cc: + env['CC'] = cc +if cxx: + env['CXX'] = cxx + if env['CC'] in ['cl', 'cl.exe'] and sys.platform=='win32': platform = 'win32-vc' elif env['CC'] in ['gcc'] and sys.platform=='win32': diff --git a/tools/btools.py b/tools/btools.py index afa21f2d28f..ba14712c201 100755 --- a/tools/btools.py +++ b/tools/btools.py @@ -37,14 +37,14 @@ def validate_arguments(args, bc): 'WITH_BF_FTGL', 'BF_FTGL', 'BF_FTGL_INC', 'BF_FTGL_LIB', 'WITH_BF_FFMPEG', 'WITH_BF_PLAYER', - 'CFLAGS', 'CCFLAGS', 'CPPFLAGS', + 'CFLAGS', 'CCFLAGS', 'CPPFLAGS', 'REL_CFLAGS', 'REL_CCFLAGS', 'C_WARN', 'CC_WARN', 'LLIBS', 'PLATFORM_LINKFLAGS', 'BF_PROFILE_FLAGS' ] arg_list = ['BF_DEBUG', 'BF_QUIET', 'BF_CROSS', 'BF_UPDATE', 'BF_INSTALLDIR', 'BF_TOOLSET', 'BF_BINNAME', 'BF_BUILDDIR', 'BF_FANCY', 'BF_QUICK', 'BF_PROFILE', 'BF_DEBUG', - 'BF_PRIORITYLIST', 'BF_BUILDINFO' + 'BF_PRIORITYLIST', 'BF_BUILDINFO','CC', 'CXX' ] all_list = opts_list + arg_list |