More of test_shell linking under windows.

Problems remain with some of the generated files.
Breakpad needs to be built as well.



git-svn-id: http://gyp.googlecode.com/svn/trunk@271 78cadc50-ecff-11dd-a971-7dbc132099af

5 files changed, 47 insertions, 22 deletions

diff --git a/samples/common.gypi b/samples/common.gypi
index d3778fd9..be574aa5 100644
--- a/samples/common.gypi
+++ b/samples/common.gypi
@@ -99,7 +99,6 @@
           '_HAS_TR1=0',
         ],
         'include_dirs': [
-          '..',
           '<(depth)/third_party/platformsdk_win2008_6_1/files/Include',
           '$(VSInstallDir)/VC/atlmfc/include',
         ],
diff --git a/samples/test_shell.gyp b/samples/test_shell.gyp
index 6de8f851..144883ed 100644
--- a/samples/test_shell.gyp
+++ b/samples/test_shell.gyp
@@ -67,6 +67,10 @@
         '../../../third_party/npapi/npapi.gyp:npapi',
         '../../webkit.gyp:glue',
       ],
+      # For breakpad.
+      'include_dirs': [
+        '../../../breakpad/src',
+      ],
       'conditions': [
         ['OS!="linux"', {'sources/': [['exclude', '_gtk\\.cc$']]}],
         ['OS!="mac"', {
@@ -75,7 +79,9 @@
             ['exclude', '_mac\\.(cc|mm?)$'],
           ]
         }],
-        ['OS!="win"', {
+        ['OS=="win"', {
+          'msvs_disabled_warnings': [ 4800 ],
+        }, {  # OS!=win
           'sources/': [
             ['exclude', '_win\\.cc$']
           ],
@@ -167,7 +173,9 @@
         '../../webkit.gyp:glue',
       ],
       'conditions': [
-        ['OS!="win"', {
+        ['OS=="win"', {
+          'msvs_disabled_warnings': [ 4800 ],
+        }, {  # OS!=win
           'sources!': [
             '../../../skia/ext/vector_canvas_unittest.cc',
             '../webcore_unit_tests/UniscribeHelper_unittest.cpp',
diff --git a/samples/v8.gyp b/samples/v8.gyp
index d58ef93c..1d73a9c8 100644
--- a/samples/v8.gyp
+++ b/samples/v8.gyp
@@ -332,9 +332,7 @@
           # dtoa-specific warnings by modifying dtoa as was done in Chromium
           # r9255.  Refer to that revision for details.
           'msvs_disabled_warnings': [4355, 4800, 4018, 4244],
-          'link_settings': {
-            'libraries': [ 'winmm.lib' ],
-          },
+          'msvs_system_libraries': [ 'winmm.lib' ],
         },],
       ],
     },
diff --git a/samples/webkit.gyp b/samples/webkit.gyp
index a8011611..6080b017 100644
--- a/samples/webkit.gyp
+++ b/samples/webkit.gyp
@@ -128,17 +128,25 @@
           'action_name': 'config.h',
           'inputs': [
             'config.h.in',
+            '../third_party/WebKit/WebCore/bridge/npapi.h',
+            '../third_party/WebKit/WebCore/bridge/npruntime.h',
+            'port/bindings/v8/npruntime_priv.h',
+            '../third_party/WebKit/JavaScriptCore/os-win32/stdint.h',
           ],
           'outputs': [
             '<(SHARED_INTERMEDIATE_DIR)/webkit/config.h',
           ],
-          # TODO(mark): INTERMEDIATE_DIR won't be right when that goes back
-          # to being target-specific, but right now, it's unused as no other
-          # headers are copied.  Additional copied headers (other than
-          # config.h) probably shouldn't be available too widely, so they
-          # probably shouldn't go into <(SHARED_INTERMEDIATE_DIR)/webkit or
-          # anything else in direct_dependent_settings.
-          'action': 'python build/action_jsconfig.py v8 <(SHARED_INTERMEDIATE_DIR)/webkit <(INTERMEDIATE_DIR) <(_inputs)',
+          # TODO(bradnelson): maybe these headers shouldn't be in the
+          #     SHARED_INTERMEDIATE_DIR, its very global.
+          'action': 'python build/action_jsconfig.py v8 <(SHARED_INTERMEDIATE_DIR)/webkit <(SHARED_INTERMEDIATE_DIR)/webkit <(_inputs)',
+
+          'conditions': [
+            ['OS=="win"', {
+              'inputs': [
+                '../third_party/WebKit/JavaScriptCore/os-win32/stdint.h',
+              ],
+            }],
+          ],
         },
       ],
       'direct_dependent_settings': {
@@ -318,14 +326,19 @@
             ['include', 'Thread(ing|Specific)Win\\.cpp$']
           ],
           'include_dirs': [
+            'build',
             '../third_party/WebKit/JavaScriptCore/kjs',
             '../third_party/WebKit/JavaScriptCore/API',
+            # These 3 do not seem to exist.
             '../third_party/WebKit/JavaScriptCore/bindings',
             '../third_party/WebKit/JavaScriptCore/bindings/c',
-            '../third_party/WebKit/JavaScriptCore/bindings/ini',
+            '../third_party/WebKit/JavaScriptCore/bindings/jni',
             'pending',
             'pending/wtf',
           ],
+          'include_dirs!': [
+            '<(SHARED_INTERMEDIATE_DIR)/webkit',
+          ],
         }],
       ],
     },
@@ -411,10 +424,10 @@
             '../third_party/WebKit/WebCore/css/SVGCSSValueKeywords.in',
           ],
           'outputs': [
-            '<(INTERMEDIATE_DIR)/CSSValueKeywords.c',
-            '<(INTERMEDIATE_DIR)/CSSValueKeywords.gperf',
-            '<(INTERMEDIATE_DIR)/CSSValueKeywords.h',
-            '<(INTERMEDIATE_DIR)/CSSValueKeywords.in',
+            '<(SHARED_INTERMEDIATE_DIR)/webkit/CSSValueKeywords.c',
+            '<(SHARED_INTERMEDIATE_DIR)/webkit/CSSValueKeywords.gperf',
+            '<(SHARED_INTERMEDIATE_DIR)/webkit/CSSValueKeywords.h',
+            '<(SHARED_INTERMEDIATE_DIR)/webkit/CSSValueKeywords.in',
           ],
           'action': 'python build/action_cssvaluekeywords.py <(_inputs) <(_outputs)',
         },
@@ -534,10 +547,10 @@
           # outputs.  The harness script will generate one file and copy it to
           # the other.
           'outputs': [
-            '<(INTERMEDIATE_DIR)/<(RULE_INPUT_ROOT).c',
-            '<(INTERMEDIATE_DIR)/<(RULE_INPUT_ROOT).cpp',
+            '<(SHARED_INTERMEDIATE_DIR)/webkit/<(RULE_INPUT_ROOT).c',
+            '<(SHARED_INTERMEDIATE_DIR)/webkit/<(RULE_INPUT_ROOT).cpp',
           ],
-          'action': 'python build/rule_gperf.py <(RULE_INPUT_PATH) <(INTERMEDIATE_DIR)',
+          'action': 'python build/rule_gperf.py <(RULE_INPUT_PATH) <(SHARED_INTERMEDIATE_DIR)/webkit',
           'process_outputs_as_sources': 0,
         },
         # Rule to build generated JavaScript (V8) bindings from .idl source.
@@ -3964,6 +3977,7 @@
       'target_name': 'glue',
       'type': 'static_library',
       'dependencies': [
+        'config',
         'webcore',
         '../net/net.gyp:net',
       ],
diff --git a/samples/zlib.gyp b/samples/zlib.gyp
index 383f974d..67fdf9b5 100644
--- a/samples/zlib.gyp
+++ b/samples/zlib.gyp
@@ -50,7 +50,13 @@
         ],
       },
       'conditions': [
-        ['OS!="win"', {
+        ['OS=="win"', {
+          # This is needed for the stuff in contrib/minizip.
+          # They include: third_party/zlib/zlib.h
+          'include_dirs': [
+             '../..',
+          ],
+        }, {  # OS!=win
           'product_name': 'z',
           'sources/': [['exclude', '^contrib/minizip/']],
         }],