| Index: SConstruct
|
| ===================================================================
|
| --- SConstruct (revision 2773)
|
| +++ SConstruct (working copy)
|
| @@ -181,18 +181,26 @@
|
| },
|
| 'msvc': {
|
| 'all': {
|
| - 'DIALECTFLAGS': ['/nologo'],
|
| 'CCFLAGS': ['$DIALECTFLAGS', '$WARNINGFLAGS'],
|
| 'CXXFLAGS': ['$CCFLAGS', '/GR-', '/Gy'],
|
| - 'CPPDEFINES': ['WIN32', '_USE_32BIT_TIME_T'],
|
| - 'LINKFLAGS': ['/NOLOGO', '/MACHINE:X86', '/INCREMENTAL:NO',
|
| - '/NXCOMPAT', '/IGNORE:4221'],
|
| - 'ARFLAGS': ['/NOLOGO'],
|
| + 'CPPDEFINES': ['WIN32'],
|
| + 'LINKFLAGS': ['/INCREMENTAL:NO', '/NXCOMPAT', '/IGNORE:4221'],
|
| 'CCPDBFLAGS': ['/Zi']
|
| },
|
| + 'verbose:off': {
|
| + 'DIALECTFLAGS': ['/nologo'],
|
| + 'ARFLAGS': ['/NOLOGO']
|
| + },
|
| 'arch:ia32': {
|
| - 'CPPDEFINES': ['V8_TARGET_ARCH_IA32']
|
| + 'CPPDEFINES': ['V8_TARGET_ARCH_IA32', '_USE_32BIT_TIME_T'],
|
| + 'LINKFLAGS': ['/MACHINE:X86'],
|
| + 'ARFLAGS': ['/MACHINE:X86']
|
| },
|
| + 'arch:x64': {
|
| + 'CPPDEFINES': ['V8_TARGET_ARCH_X64'],
|
| + 'LINKFLAGS': ['/MACHINE:X64'],
|
| + 'ARFLAGS': ['/MACHINE:X64']
|
| + },
|
| 'mode:debug': {
|
| 'CCFLAGS': ['/Od', '/Gm'],
|
| 'CPPDEFINES': ['_DEBUG', 'ENABLE_DISASSEMBLER', 'DEBUG'],
|
| @@ -253,12 +261,14 @@
|
| },
|
| 'msvc': {
|
| 'all': {
|
| - 'WARNINGFLAGS': ['/W3', '/WX', '/wd4355', '/wd4800']
|
| + 'WARNINGFLAGS': ['/WX', '/wd4355', '/wd4800']
|
| },
|
| - 'library:shared': {
|
| - 'CPPDEFINES': ['BUILDING_V8_SHARED'],
|
| - 'LIBS': ['winmm', 'ws2_32']
|
| + 'arch:ia32': {
|
| + 'WARNINGFLAGS': ['/W3']
|
| },
|
| + 'arch:x64': {
|
| + 'WARNINGFLAGS': ['/W2']
|
| + },
|
| 'arch:arm': {
|
| 'CPPDEFINES': ['V8_TARGET_ARCH_ARM'],
|
| # /wd4996 is to silence the warning about sscanf
|
| @@ -355,7 +365,10 @@
|
| },
|
| 'arch:ia32': {
|
| 'CPPDEFINES': ['V8_TARGET_ARCH_IA32']
|
| - }
|
| + },
|
| + 'arch:x64': {
|
| + 'CPPDEFINES': ['V8_TARGET_ARCH_X64']
|
| + },
|
| }
|
| }
|
|
|
| @@ -420,10 +433,15 @@
|
| },
|
| 'msvc': {
|
| 'all': {
|
| - 'CCFLAGS': ['/nologo'],
|
| - 'LINKFLAGS': ['/nologo'],
|
| 'LIBS': ['winmm', 'ws2_32']
|
| },
|
| + 'verbose:off': {
|
| + 'CCFLAGS': ['/nologo'],
|
| + 'LINKFLAGS': ['/NOLOGO']
|
| + },
|
| + 'verbose:on': {
|
| + 'LINKFLAGS': ['/VERBOSE']
|
| + },
|
| 'library:shared': {
|
| 'CPPDEFINES': ['USING_V8_SHARED']
|
| },
|
| @@ -445,8 +463,13 @@
|
| }
|
| },
|
| 'arch:ia32': {
|
| - 'CPPDEFINES': ['V8_TARGET_ARCH_IA32']
|
| + 'CPPDEFINES': ['V8_TARGET_ARCH_IA32'],
|
| + 'LINKFLAGS': ['/MACHINE:X86']
|
| },
|
| + 'arch:x64': {
|
| + 'CPPDEFINES': ['V8_TARGET_ARCH_X64'],
|
| + 'LINKFLAGS': ['/MACHINE:X64']
|
| + },
|
| 'mode:debug': {
|
| 'CCFLAGS': ['/Od'],
|
| 'LINKFLAGS': ['/DEBUG'],
|
| @@ -588,6 +611,11 @@
|
| 'values': ['dumb', 'readline'],
|
| 'default': 'dumb',
|
| 'help': 'the console to use for the d8 shell'
|
| + },
|
| + 'verbose': {
|
| + 'values': ['on', 'off'],
|
| + 'default': 'off',
|
| + 'help': 'more output from compiler and linker'
|
| }
|
| }
|
|
|
|
|