| Index: SConstruct
|
| ===================================================================
|
| --- SConstruct (revision 1731)
|
| +++ SConstruct (working copy)
|
| @@ -160,14 +160,18 @@
|
| }
|
| },
|
| 'mode:release': {
|
| - 'CCFLAGS': ['/O2', '/GL'],
|
| - 'LINKFLAGS': ['/OPT:REF', '/OPT:ICF', '/LTCG'],
|
| - 'ARFLAGS': ['/LTCG'],
|
| + 'CCFLAGS': ['/O2'],
|
| + 'LINKFLAGS': ['/OPT:REF', '/OPT:ICF'],
|
| 'msvcrt:static': {
|
| 'CCFLAGS': ['/MT']
|
| },
|
| 'msvcrt:shared': {
|
| 'CCFLAGS': ['/MD']
|
| + },
|
| + 'msvcltcg:on': {
|
| + 'CCFLAGS': ['/GL'],
|
| + 'LINKFLAGS': ['/LTCG'],
|
| + 'ARFLAGS': ['/LTCG'],
|
| }
|
| },
|
| }
|
| @@ -360,12 +364,16 @@
|
| },
|
| 'mode:release': {
|
| 'CCFLAGS': ['/O2'],
|
| - 'LINKFLAGS': ['/OPT:REF', '/OPT:ICF', '/LTCG'],
|
| + 'LINKFLAGS': ['/OPT:REF', '/OPT:ICF'],
|
| 'msvcrt:static': {
|
| 'CCFLAGS': ['/MT']
|
| },
|
| 'msvcrt:shared': {
|
| 'CCFLAGS': ['/MD']
|
| + },
|
| + 'msvcltcg:on': {
|
| + 'CCFLAGS': ['/GL'],
|
| + 'LINKFLAGS': ['/LTCG'],
|
| }
|
| },
|
| 'mode:debug': {
|
| @@ -474,8 +482,13 @@
|
| 'msvcrt': {
|
| 'values': ['static', 'shared'],
|
| 'default': 'static',
|
| - 'help': 'the type of MSVCRT library to use'
|
| + 'help': 'the type of Microsoft Visual C++ runtime library to use'
|
| },
|
| + 'msvcltcg': {
|
| + 'values': ['on', 'off'],
|
| + 'default': 'on',
|
| + 'help': 'use Microsoft Visual C++ link-time code generation'
|
| + },
|
| 'wordsize': {
|
| 'values': ['64', '32'],
|
| 'default': WORDSIZE_GUESS,
|
|
|