| OLD | NEW |
| 1 # Copyright 2008 the V8 project authors. All rights reserved. | 1 # Copyright 2008 the V8 project authors. All rights reserved. |
| 2 # Redistribution and use in source and binary forms, with or without | 2 # Redistribution and use in source and binary forms, with or without |
| 3 # modification, are permitted provided that the following conditions are | 3 # modification, are permitted provided that the following conditions are |
| 4 # met: | 4 # met: |
| 5 # | 5 # |
| 6 # * Redistributions of source code must retain the above copyright | 6 # * Redistributions of source code must retain the above copyright |
| 7 # notice, this list of conditions and the following disclaimer. | 7 # notice, this list of conditions and the following disclaimer. |
| 8 # * Redistributions in binary form must reproduce the above | 8 # * Redistributions in binary form must reproduce the above |
| 9 # copyright notice, this list of conditions and the following | 9 # copyright notice, this list of conditions and the following |
| 10 # disclaimer in the documentation and/or other materials provided | 10 # disclaimer in the documentation and/or other materials provided |
| (...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 142 'arch:ia32': { | 142 'arch:ia32': { |
| 143 'CCFLAGS': ['-m32'], | 143 'CCFLAGS': ['-m32'], |
| 144 'LINKFLAGS': ['-m32'] | 144 'LINKFLAGS': ['-m32'] |
| 145 }, | 145 }, |
| 146 'arch:arm': { | 146 'arch:arm': { |
| 147 'CCFLAGS': ['-m32'], | 147 'CCFLAGS': ['-m32'], |
| 148 'LINKFLAGS': ['-m32'] | 148 'LINKFLAGS': ['-m32'] |
| 149 } | 149 } |
| 150 }, | 150 }, |
| 151 'arch:ia32': { | 151 'arch:ia32': { |
| 152 'CPPDEFINES': ['V8_ARCH_IA32', 'ILP32'] | 152 'CPPDEFINES': ['V8_TARGET_ARCH_IA32'] |
| 153 }, | 153 }, |
| 154 'arch:arm': { | 154 'arch:arm': { |
| 155 'CPPDEFINES': ['V8_ARCH_ARM', 'ILP32'] | 155 'CPPDEFINES': ['V8_TARGET_ARCH_ARM'] |
| 156 }, | 156 }, |
| 157 'arch:x64': { | 157 'arch:x64': { |
| 158 'CPPDEFINES': ['V8_ARCH_X64', 'LP64'] | 158 'CPPDEFINES': ['V8_TARGET_ARCH_X64'] |
| 159 }, | 159 }, |
| 160 'prof:oprofile': { | 160 'prof:oprofile': { |
| 161 'CPPDEFINES': ['ENABLE_OPROFILE_AGENT'] | 161 'CPPDEFINES': ['ENABLE_OPROFILE_AGENT'] |
| 162 } | 162 } |
| 163 }, | 163 }, |
| 164 'msvc': { | 164 'msvc': { |
| 165 'all': { | 165 'all': { |
| 166 'DIALECTFLAGS': ['/nologo'], | 166 'DIALECTFLAGS': ['/nologo'], |
| 167 'CCFLAGS': ['$DIALECTFLAGS', '$WARNINGFLAGS'], | 167 'CCFLAGS': ['$DIALECTFLAGS', '$WARNINGFLAGS'], |
| 168 'CXXFLAGS': ['$CCFLAGS', '/GR-', '/Gy'], | 168 'CXXFLAGS': ['$CCFLAGS', '/GR-', '/Gy'], |
| 169 'CPPDEFINES': ['WIN32', '_USE_32BIT_TIME_T'], | 169 'CPPDEFINES': ['WIN32', '_USE_32BIT_TIME_T'], |
| 170 'LINKFLAGS': ['/NOLOGO', '/MACHINE:X86', '/INCREMENTAL:NO', | 170 'LINKFLAGS': ['/NOLOGO', '/MACHINE:X86', '/INCREMENTAL:NO', |
| 171 '/NXCOMPAT', '/IGNORE:4221'], | 171 '/NXCOMPAT', '/IGNORE:4221'], |
| 172 'ARFLAGS': ['/NOLOGO'], | 172 'ARFLAGS': ['/NOLOGO'], |
| 173 'CCPDBFLAGS': ['/Zi'] | 173 'CCPDBFLAGS': ['/Zi'] |
| 174 }, | 174 }, |
| 175 'arch:ia32': { | 175 'arch:ia32': { |
| 176 'CPPDEFINES': ['V8_ARCH_IA32'] | 176 'CPPDEFINES': ['V8_TARGET_ARCH_IA32'] |
| 177 }, | 177 }, |
| 178 'mode:debug': { | 178 'mode:debug': { |
| 179 'CCFLAGS': ['/Od', '/Gm'], | 179 'CCFLAGS': ['/Od', '/Gm'], |
| 180 'CPPDEFINES': ['_DEBUG', 'ENABLE_DISASSEMBLER', 'DEBUG'], | 180 'CPPDEFINES': ['_DEBUG', 'ENABLE_DISASSEMBLER', 'DEBUG'], |
| 181 'LINKFLAGS': ['/DEBUG'], | 181 'LINKFLAGS': ['/DEBUG'], |
| 182 'msvcrt:static': { | 182 'msvcrt:static': { |
| 183 'CCFLAGS': ['/MTd'] | 183 'CCFLAGS': ['/MTd'] |
| 184 }, | 184 }, |
| 185 'msvcrt:shared': { | 185 'msvcrt:shared': { |
| 186 'CCFLAGS': ['/MDd'] | 186 'CCFLAGS': ['/MDd'] |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 232 }, | 232 }, |
| 233 'msvc': { | 233 'msvc': { |
| 234 'all': { | 234 'all': { |
| 235 'WARNINGFLAGS': ['/W3', '/WX', '/wd4355', '/wd4800'] | 235 'WARNINGFLAGS': ['/W3', '/WX', '/wd4355', '/wd4800'] |
| 236 }, | 236 }, |
| 237 'library:shared': { | 237 'library:shared': { |
| 238 'CPPDEFINES': ['BUILDING_V8_SHARED'], | 238 'CPPDEFINES': ['BUILDING_V8_SHARED'], |
| 239 'LIBS': ['winmm', 'ws2_32'] | 239 'LIBS': ['winmm', 'ws2_32'] |
| 240 }, | 240 }, |
| 241 'arch:arm': { | 241 'arch:arm': { |
| 242 'CPPDEFINES': ['V8_ARCH_ARM'], | 242 'CPPDEFINES': ['V8_TARGET_ARCH_ARM'], |
| 243 # /wd4996 is to silence the warning about sscanf | 243 # /wd4996 is to silence the warning about sscanf |
| 244 # used by the arm simulator. | 244 # used by the arm simulator. |
| 245 'WARNINGFLAGS': ['/wd4996'] | 245 'WARNINGFLAGS': ['/wd4996'] |
| 246 }, | 246 }, |
| 247 'disassembler:on': { | 247 'disassembler:on': { |
| 248 'CPPDEFINES': ['ENABLE_DISASSEMBLER'] | 248 'CPPDEFINES': ['ENABLE_DISASSEMBLER'] |
| 249 } | 249 } |
| 250 } | 250 } |
| 251 } | 251 } |
| 252 | 252 |
| (...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 341 }, | 341 }, |
| 342 'msvc': { | 342 'msvc': { |
| 343 'all': { | 343 'all': { |
| 344 'CPPDEFINES': ['_HAS_EXCEPTIONS=0'], | 344 'CPPDEFINES': ['_HAS_EXCEPTIONS=0'], |
| 345 'LIBS': ['winmm', 'ws2_32'] | 345 'LIBS': ['winmm', 'ws2_32'] |
| 346 }, | 346 }, |
| 347 'library:shared': { | 347 'library:shared': { |
| 348 'CPPDEFINES': ['USING_V8_SHARED'] | 348 'CPPDEFINES': ['USING_V8_SHARED'] |
| 349 }, | 349 }, |
| 350 'arch:ia32': { | 350 'arch:ia32': { |
| 351 'CPPDEFINES': ['V8_ARCH_IA32'] | 351 'CPPDEFINES': ['V8_TARGET_ARCH_IA32'] |
| 352 } | 352 } |
| 353 } | 353 } |
| 354 } | 354 } |
| 355 | 355 |
| 356 | 356 |
| 357 SAMPLE_FLAGS = { | 357 SAMPLE_FLAGS = { |
| 358 'all': { | 358 'all': { |
| 359 'CPPPATH': [join(abspath('.'), 'include')], | 359 'CPPPATH': [join(abspath('.'), 'include')], |
| 360 'LIBS': ['$LIBRARY'], | 360 'LIBS': ['$LIBRARY'], |
| 361 }, | 361 }, |
| (...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 435 }, | 435 }, |
| 436 'msvcrt:shared': { | 436 'msvcrt:shared': { |
| 437 'CCFLAGS': ['/MD'] | 437 'CCFLAGS': ['/MD'] |
| 438 }, | 438 }, |
| 439 'msvcltcg:on': { | 439 'msvcltcg:on': { |
| 440 'CCFLAGS': ['/GL'], | 440 'CCFLAGS': ['/GL'], |
| 441 'LINKFLAGS': ['/LTCG'], | 441 'LINKFLAGS': ['/LTCG'], |
| 442 } | 442 } |
| 443 }, | 443 }, |
| 444 'arch:ia32': { | 444 'arch:ia32': { |
| 445 'CPPDEFINES': ['V8_ARCH_IA32'] | 445 'CPPDEFINES': ['V8_TARGET_ARCH_IA32'] |
| 446 }, | 446 }, |
| 447 'mode:debug': { | 447 'mode:debug': { |
| 448 'CCFLAGS': ['/Od'], | 448 'CCFLAGS': ['/Od'], |
| 449 'LINKFLAGS': ['/DEBUG'], | 449 'LINKFLAGS': ['/DEBUG'], |
| 450 'msvcrt:static': { | 450 'msvcrt:static': { |
| 451 'CCFLAGS': ['/MTd'] | 451 'CCFLAGS': ['/MTd'] |
| 452 }, | 452 }, |
| 453 'msvcrt:shared': { | 453 'msvcrt:shared': { |
| 454 'CCFLAGS': ['/MDd'] | 454 'CCFLAGS': ['/MDd'] |
| 455 } | 455 } |
| (...skipping 458 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 914 # version of scons. Also, there's a bug in some revisions that | 914 # version of scons. Also, there's a bug in some revisions that |
| 915 # doesn't allow this flag to be set, so we swallow any exceptions. | 915 # doesn't allow this flag to be set, so we swallow any exceptions. |
| 916 # Lovely. | 916 # Lovely. |
| 917 try: | 917 try: |
| 918 SetOption('warn', 'no-deprecated') | 918 SetOption('warn', 'no-deprecated') |
| 919 except: | 919 except: |
| 920 pass | 920 pass |
| 921 | 921 |
| 922 | 922 |
| 923 Build() | 923 Build() |
| OLD | NEW |