diff options
author | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-07 20:44:51 +0000 |
---|---|---|
committer | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-07 20:44:51 +0000 |
commit | bd63ce0ad16cab9822d7120bdcf2d5b7353598e3 (patch) | |
tree | aed796bf22fb22cf0a7ff1e6c12b151de3f5bf40 /win8/metro_driver/metro_driver.gyp | |
parent | 25da1685160963a14710a128977525ea55aee091 (diff) | |
download | chromium_src-bd63ce0ad16cab9822d7120bdcf2d5b7353598e3.zip chromium_src-bd63ce0ad16cab9822d7120bdcf2d5b7353598e3.tar.gz chromium_src-bd63ce0ad16cab9822d7120bdcf2d5b7353598e3.tar.bz2 |
Integrate the Windows 8 code into the Chromium tree (take 3).
This time, also:
fix invalid path in metro_driver.gyp.
set executable bit on check_sdk_patch.py and post_build.bat.
add back a switch that was removed recently
This reverts "Revert 155429 - Integrate the Windows 8 code into the Chromium tree."
Original CL: https://chromiumcodereview.appspot.com/10875008
BUG=127799
TEST=A Chromium build can run as the immersive browser on Windows 8.
TBR=ben
Review URL: https://chromiumcodereview.appspot.com/10919158
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@155474 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'win8/metro_driver/metro_driver.gyp')
-rw-r--r-- | win8/metro_driver/metro_driver.gyp | 98 |
1 files changed, 98 insertions, 0 deletions
diff --git a/win8/metro_driver/metro_driver.gyp b/win8/metro_driver/metro_driver.gyp new file mode 100644 index 0000000..186d2bd --- /dev/null +++ b/win8/metro_driver/metro_driver.gyp @@ -0,0 +1,98 @@ +# Copyright (c) 2012 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. +{ + 'conditions': [ + ['OS=="win" and (MSVS_VERSION=="2010" or MSVS_VERSION=="2010e")', { + 'variables': { + 'chromium_code': 1, + }, + 'includes': [ + '../../build/win_precompile.gypi', + ], + 'target_defaults': { + 'defines': [ + # This define is required to pull in the new Win8 interfaces from + # system headers like ShObjIdl.h + 'NTDDI_VERSION=0x06020000', + ], + 'msvs_settings': { + 'VCLinkerTool': { + 'AdditionalDependencies': [ + 'D2D1.lib', + 'D3D11.lib', + ], + }, + }, + }, + 'targets': [ + { + 'target_name': 'metro_driver', + 'type': 'shared_library', + 'dependencies': [ + '../../base/base.gyp:base', + '../../crypto/crypto.gyp:crypto', + '../../sandbox/sandbox.gyp:sandbox', + '../../google_update/google_update.gyp:google_update', + '../win8.gyp:check_sdk_patch', + ], + 'sources': [ + 'chrome_app_view.cc', + 'chrome_app_view.h', + 'chrome_url_launch_handler.cc', + 'chrome_url_launch_handler.h', + '../delegate_execute/chrome_util.cc', + '../delegate_execute/chrome_util.h', + 'devices_handler.cc', + 'devices_handler.h', + 'file_picker.h', + 'file_picker.cc', + 'metro_dialog_box.cc', + 'metro_dialog_box.h', + 'metro_driver.cc', + 'print_handler.cc', + 'print_handler.h', + 'print_document_source.cc', + 'print_document_source.h', + 'secondary_tile.h', + 'secondary_tile.cc', + 'settings_handler.cc', + 'settings_handler.h', + 'stdafx.h', + 'toast_notification_handler.cc', + 'toast_notification_handler.h', + 'winrt_utils.cc', + 'winrt_utils.h', + ], + 'copies': [ + { + 'destination': '<(PRODUCT_DIR)', + 'files': [ + 'resources/Logo.png', + 'resources/SecondaryTile.png', + 'resources/SmallLogo.png', + 'resources/splash-620x300.png', + 'resources/VisualElementsManifest.xml', + ], + }, + ], + }, + { + 'target_name': 'metro_driver_unittests', + 'type': 'executable', + 'dependencies': [ + '../../base/base.gyp:base', + '../../testing/gtest.gyp:gtest', + 'metro_driver', + ], + 'sources': [ + 'run_all_unittests.cc', + 'winrt_utils.cc', + 'winrt_utils.h', + 'winrt_utils_unittest.cc', + ], + }, + ], + },], + ], +} |