diff options
| author | José Fonseca <jfonseca@vmware.com> | 2009-01-06 16:16:38 +0000 |
|---|---|---|
| committer | José Fonseca <jfonseca@vmware.com> | 2009-01-06 18:23:16 +0000 |
| commit | 26ba5ce0e8fc54d330a0f26d0c5ab76e250fae3a (patch) | |
| tree | 2fcac7598f7aa54ab0c19339ae3e390ab3f01ddd /scons | |
| parent | 4ebb8f78e780ffa6f5f7082d0e36a792bceca321 (diff) | |
scons: Choose the appropriate MSVC CRT.
Diffstat (limited to 'scons')
| -rw-r--r-- | scons/gallium.py | 10 | ||||
| -rw-r--r-- | scons/generic.py | 10 |
2 files changed, 20 insertions, 0 deletions
diff --git a/scons/gallium.py b/scons/gallium.py index 19eeb18be8..33bd65dd54 100644 --- a/scons/gallium.py +++ b/scons/gallium.py @@ -390,6 +390,16 @@ def generate(env): env.Append(CFLAGS = cflags) env.Append(CXXFLAGS = cflags) + if env['platform'] == 'windows' and msvc: + # Choose the appropriate MSVC CRT + # http://msdn.microsoft.com/en-us/library/2kzt1wy3.aspx + if env['debug']: + env.Append(CCFLAGS = ['/MTd']) + env.Append(SHCCFLAGS = ['/LDd']) + else: + env.Append(CCFLAGS = ['/MT']) + env.Append(SHCCFLAGS = ['/LD']) + # Assembler options if gcc: if env['machine'] == 'x86': diff --git a/scons/generic.py b/scons/generic.py index f0bb3de9fc..0ed21a4e6c 100644 --- a/scons/generic.py +++ b/scons/generic.py @@ -458,6 +458,16 @@ def generate(env): env.Append(CFLAGS = cflags) env.Append(CXXFLAGS = cflags) + if env['platform'] == 'windows' and msvc: + # Choose the appropriate MSVC CRT + # http://msdn.microsoft.com/en-us/library/2kzt1wy3.aspx + if env['debug']: + env.Append(CCFLAGS = ['/MTd']) + env.Append(SHCCFLAGS = ['/LDd']) + else: + env.Append(CCFLAGS = ['/MT']) + env.Append(SHCCFLAGS = ['/LD']) + # Assembler options if gcc: if env['machine'] == 'x86': |