diff options
Diffstat (limited to 'scons/generic.py')
| -rw-r--r-- | scons/generic.py | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/scons/generic.py b/scons/generic.py index 01a374e363..03563e4c62 100644 --- a/scons/generic.py +++ b/scons/generic.py @@ -303,14 +303,17 @@ def generate(env): # Load tool chain env.Tool(env['toolchain']) + env['gcc'] = 'gcc' in os.path.basename(env['CC']).split('-') + env['msvc'] = env['CC'] == 'cl' + # shortcuts debug = env['debug'] machine = env['machine'] platform = env['platform'] x86 = env['machine'] == 'x86' ppc = env['machine'] == 'ppc' - gcc = env['platform'] in ('linux', 'freebsd', 'darwin') or env['toolchain'] == 'crossmingw' - msvc = env['platform'] in ('windows', 'winddk', 'wince') and env['toolchain'] != 'crossmingw' + gcc = env['gcc'] + msvc = env['msvc'] # C preprocessor options cppdefines = [] @@ -328,9 +331,12 @@ def generate(env): #'UNICODE', # http://msdn2.microsoft.com/en-us/library/6dwk3a1z.aspx, #'WIN32_LEAN_AND_MEAN', - 'VC_EXTRALEAN', - '_CRT_SECURE_NO_DEPRECATE', ] + if msvc: + cppdefines += [ + 'VC_EXTRALEAN', + '_CRT_SECURE_NO_DEPRECATE', + ] if debug: cppdefines += ['_DEBUG'] if platform == 'winddk': |