Matching v8 build settings more closely to try to fix regression in performance.

Review URL: http://codereview.chromium.org/67092

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13642 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 18 insertions, 5 deletions

diff --git a/build/common.gypi b/build/common.gypi
index 5058a31..6a67a24 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -39,6 +39,12 @@
     # {'variables': {'library': 'shared_library'}}
     # to compile as shared by default
     'library%': 'static_library',
+
+    # TODO(bradnelson): eliminate this when possible.
+    # To allow local gyp files to prevent release.vsprops from being included.
+    # Yes(1) means include release.vsprops.
+    # Once all vsprops settings are migrated into gyp, this can go away.
+    'msvs_use_common_release%': 1,
   },
   'target_defaults': {
     'conditions': [
@@ -124,7 +130,7 @@
               'DEAD_CODE_STRIPPING': 'YES',
             }
           }],
-          [ 'OS=="win"', {
+          [ 'OS=="win" and msvs_use_common_release', {
             'configuration_platform': 'Win32',
             'msvs_props': ['release.vsprops'],
           }],
diff --git a/build/temp_gyp/v8.gyp b/build/temp_gyp/v8.gyp
index daebcc3..a7b340b 100644
--- a/build/temp_gyp/v8.gyp
+++ b/build/temp_gyp/v8.gyp
@@ -6,6 +6,7 @@
 {
   'variables': {
     'chromium_code': 1,
+    'msvs_use_common_release': 0,
     'base_source_files': [
       '../../v8/src/third_party/dtoa/dtoa.c',
       '../../v8/src/accessors.cc',
@@ -275,6 +276,11 @@
             ],
           }],
           ['OS=="win"', {
+            'msvs_configuration_attributes': {
+              'OutputDirectory': '$(SolutionDir)$(ConfigurationName)',
+              'IntermediateDirectory': '$(OutDir)\\obj\\$(ProjectName)',
+              'CharacterSet': '1',
+            },
             'msvs_settings': {
               'VCCLCompilerTool': {
                 'RuntimeLibrary': '0',
@@ -398,7 +404,7 @@
             ]
           }
         ],
-        ['OS=="mac"', 
+        ['OS=="mac"',
           {
             'sources/': [
               ['include', 'src/platform-macos\\.cc$'],
@@ -504,7 +510,9 @@
     },
   ],
 
-  'conditions': [ ['OS!="linux"', { 'targets': [
+  'conditions': [ ['OS=="mac"', { 'targets': [
+    # TODO(bradnelson):  temporarily disable 'd8' target on Windows while
+    # we work fix the performance regressions.
     # TODO(sgk):  temporarily disable 'd8' target on Linux while
     # we work out getting the readline library on all the systems.
     {
@@ -659,8 +667,7 @@
     ['OS=="win"', {
       'target_defaults': {
         'defines': [
-          '_USE_32BIT_TIME_T'
-          'PCRE_STATIC',
+          '_USE_32BIT_TIME_T',
           '_CRT_SECURE_NO_DEPRECATE',
           '_CRT_NONSTDC_NO_DEPRECATE',
         ],