Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(328)

Side by Side Diff: SConstruct

Issue 264047: X64: Fix bugs affecting Win64. (Closed)
Patch Set: Addressed review comments Created 11 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « .gitignore ('k') | src/execution.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 355 matching lines...) Expand 10 before | Expand all | Expand 10 after
366 'CPPDEFINES': ['_HAS_EXCEPTIONS=0'], 366 'CPPDEFINES': ['_HAS_EXCEPTIONS=0'],
367 'LIBS': ['winmm', 'ws2_32'] 367 'LIBS': ['winmm', 'ws2_32']
368 }, 368 },
369 'library:shared': { 369 'library:shared': {
370 'CPPDEFINES': ['USING_V8_SHARED'] 370 'CPPDEFINES': ['USING_V8_SHARED']
371 }, 371 },
372 'arch:ia32': { 372 'arch:ia32': {
373 'CPPDEFINES': ['V8_TARGET_ARCH_IA32'] 373 'CPPDEFINES': ['V8_TARGET_ARCH_IA32']
374 }, 374 },
375 'arch:x64': { 375 'arch:x64': {
376 'CPPDEFINES': ['V8_TARGET_ARCH_X64'] 376 'CPPDEFINES': ['V8_TARGET_ARCH_X64'],
377 'LINKFLAGS': ['/STACK:2091752']
377 }, 378 },
378 } 379 }
379 } 380 }
380 381
381 382
382 SAMPLE_FLAGS = { 383 SAMPLE_FLAGS = {
383 'all': { 384 'all': {
384 'CPPPATH': [join(abspath('.'), 'include')], 385 'CPPPATH': [join(abspath('.'), 'include')],
385 'LIBS': ['$LIBRARY'], 386 'LIBS': ['$LIBRARY'],
386 }, 387 },
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
467 'CCFLAGS': ['/GL'], 468 'CCFLAGS': ['/GL'],
468 'LINKFLAGS': ['/LTCG'], 469 'LINKFLAGS': ['/LTCG'],
469 } 470 }
470 }, 471 },
471 'arch:ia32': { 472 'arch:ia32': {
472 'CPPDEFINES': ['V8_TARGET_ARCH_IA32'], 473 'CPPDEFINES': ['V8_TARGET_ARCH_IA32'],
473 'LINKFLAGS': ['/MACHINE:X86'] 474 'LINKFLAGS': ['/MACHINE:X86']
474 }, 475 },
475 'arch:x64': { 476 'arch:x64': {
476 'CPPDEFINES': ['V8_TARGET_ARCH_X64'], 477 'CPPDEFINES': ['V8_TARGET_ARCH_X64'],
477 'LINKFLAGS': ['/MACHINE:X64'] 478 'LINKFLAGS': ['/MACHINE:X64', '/STACK:2091752']
478 }, 479 },
479 'mode:debug': { 480 'mode:debug': {
480 'CCFLAGS': ['/Od'], 481 'CCFLAGS': ['/Od'],
481 'LINKFLAGS': ['/DEBUG'], 482 'LINKFLAGS': ['/DEBUG'],
482 'msvcrt:static': { 483 'msvcrt:static': {
483 'CCFLAGS': ['/MTd'] 484 'CCFLAGS': ['/MTd']
484 }, 485 },
485 'msvcrt:shared': { 486 'msvcrt:shared': {
486 'CCFLAGS': ['/MDd'] 487 'CCFLAGS': ['/MDd']
487 } 488 }
(...skipping 493 matching lines...) Expand 10 before | Expand all | Expand 10 after
981 # version of scons. Also, there's a bug in some revisions that 982 # version of scons. Also, there's a bug in some revisions that
982 # doesn't allow this flag to be set, so we swallow any exceptions. 983 # doesn't allow this flag to be set, so we swallow any exceptions.
983 # Lovely. 984 # Lovely.
984 try: 985 try:
985 SetOption('warn', 'no-deprecated') 986 SetOption('warn', 'no-deprecated')
986 except: 987 except:
987 pass 988 pass
988 989
989 990
990 Build() 991 Build()
OLDNEW
« no previous file with comments | « .gitignore ('k') | src/execution.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698