diff options
| author | bradnelson@google.com <bradnelson@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-07 23:23:45 +0000 |
|---|---|---|
| committer | bradnelson@google.com <bradnelson@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-07 23:23:45 +0000 |
| commit | 25a3f6b52228bc68ce63c4032ed6b17cecd7b3c5 (patch) | |
| tree | 9ca7ae979c46b2e7b91387494abf1e1a3eaa2177 /build | |
| parent | 5cc06369ee53fbde978506263f0b15735560cfd6 (diff) | |
| download | chromium_src-25a3f6b52228bc68ce63c4032ed6b17cecd7b3c5.zip chromium_src-25a3f6b52228bc68ce63c4032ed6b17cecd7b3c5.tar.gz chromium_src-25a3f6b52228bc68ce63c4032ed6b17cecd7b3c5.tar.bz2 | |
Fixing v8 settings to fix startup_tests regression.
Review URL: http://codereview.chromium.org/62121
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13304 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/temp_gyp/v8.gyp | 53 |
1 files changed, 49 insertions, 4 deletions
diff --git a/build/temp_gyp/v8.gyp b/build/temp_gyp/v8.gyp index 49f6d0e..a64a7ca 100644 --- a/build/temp_gyp/v8.gyp +++ b/build/temp_gyp/v8.gyp @@ -240,18 +240,27 @@ '../common.gypi', ], 'target_defaults': { + 'defines': [ + 'ENABLE_LOGGING_AND_PROFILING', + ], 'configurations': { 'Debug': { 'defines': [ 'DEBUG', + '_DEBUG', 'ENABLE_DISASSEMBLER', - 'ENABLE_LOGGING_AND_PROFILING', ], + 'msvs_settings': { + 'VCCLCompilerTool': { + 'Optimizations': '0', + 'RuntimeLibrary': '1', + }, + 'VCLinkerTool': { + 'LinkIncremental': '2', + }, + }, }, 'Release': { - 'defines': [ - 'ENABLE_LOGGING_AND_PROFILING', - ], 'conditions': [ ['OS=="linux"', { 'cflags!': [ @@ -265,6 +274,25 @@ '-O3', ], }], + ['OS=="win"', { + 'msvs_settings': { + 'VCCLCompilerTool': { + 'RuntimeLibrary': '0', + 'Optimizations': '2', + 'InlineFunctionExpansion': '2', + 'EnableIntrinsicFunctions': 'true', + 'FavorSizeOrSpeed': '0', + 'OmitFramePointers': 'true', + 'StringPooling': 'true', + }, + 'VCLinkerTool': { + 'LinkIncremental': '1', + 'OptimizeReferences': '2', + 'OptimizeForWindows98': '1', + 'EnableCOMDATFolding': '2', + }, + }, + }], ], }, }, @@ -626,5 +654,22 @@ ], }, ]}], # OS != "linux" (temporary, TODO(sgk)) + + + ['OS=="win"', { + 'target_defaults': { + 'defines': [ + '_USE_32BIT_TIME_T' + 'PCRE_STATIC', + '_CRT_SECURE_NO_DEPRECATE', + '_CRT_NONSTDC_NO_DEPRECATE', + ], + 'msvs_settings': { + 'VCLinkerTool': { + 'AdditionalOptions': '/IGNORE:4221 /NXCOMPAT', + }, + }, + }, + }], ], } |