Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / win8 / metro_driver / metro_driver.gyp

diff --git a/src/win8/metro_driver/metro_driver.gyp b/src/win8/metro_driver/metro_driver.gyp
index c4797fb..3cd62ef 100644 (file)
--- a/src/win8/metro_driver/metro_driver.gyp
+++ b/src/win8/metro_driver/metro_driver.gyp
@@ -8,17 +8,31 @@
         'chromium_code': 1,
       },
       'includes': [
+        '../../build/util/version.gypi',
         '../../build/win_precompile.gypi',
-        '../../chrome/version.gypi',
       ],
       'target_defaults': {
+        # This and the force include below is a workaround for intsafe.h in
+        # VS 2010.
+        'msvs_system_include_dirs': [
+          '<(DEPTH)/build',
+        ],
         'msvs_settings': {
-            'VCLinkerTool': {
-                'AdditionalDependencies': [
-                    'D2D1.lib',
-                    'D3D11.lib',
-                ],
-            },
+          'VCLinkerTool': {
+            'AdditionalDependencies': [
+              'D2D1.lib',
+              'D3D11.lib',
+              'runtimeobject.lib',
+            ],
+            'DelayLoadDLLs': [
+              'API-MS-WIN-CORE-WINRT-ERROR-L1-1-0.DLL',
+              'API-MS-WIN-CORE-WINRT-L1-1-0.DLL',
+              'API-MS-WIN-CORE-WINRT-STRING-L1-1-0.DLL',
+            ],
+          },
+          'VCCLCompilerTool': {
+            'ForcedIncludeFiles': [ 'intsafe_workaround.h', ],
+          },
         },
       },
       'targets': [
@@ -60,12 +74,14 @@
             '../../sandbox/sandbox.gyp:sandbox',
             '../../ui/metro_viewer/metro_viewer.gyp:metro_viewer_messages',
             '../../url/url.gyp:url_lib',
-            '../win8.gyp:check_sdk_patch',
             'metro_driver_version_resources',
           ],
           'sources': [
+            'display_properties.cc',
+            'display_properties.h',
             'metro_driver.cc',
             'metro_driver.h',
+            'metro_driver_win7.cc',
             'stdafx.h',
             'winrt_utils.cc',
             'winrt_utils.h',
@@ -74,7 +90,7 @@
           'conditions': [
             ['use_aura==1', {
               'dependencies': [
-                '../win8.gyp:metro_viewer',
+                '../win8.gyp:metro_viewer_constants',
               ],
               'sources': [
                 'chrome_app_view_ash.cc',
@@ -84,6 +100,9 @@
                 'file_picker_ash.cc',
                 'file_picker_ash.h',
               ],
+              'includes': [
+                'ime/ime.gypi',
+              ],
             }, {  # use_aura!=1
               'sources': [
                 'chrome_app_view.cc',