diff options
| author | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-28 20:54:53 +0000 |
|---|---|---|
| committer | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-28 20:54:53 +0000 |
| commit | e55a7ddf8a95cd64c620f4536d641fede75d51d0 (patch) | |
| tree | 867aaff2ab9ed59cf8b56f650373aec6508fc39f /chrome_frame | |
| parent | e6b248eb71e9c422d8186974f57a1a1bd5c2ff92 (diff) | |
| download | chromium_src-e55a7ddf8a95cd64c620f4536d641fede75d51d0.zip chromium_src-e55a7ddf8a95cd64c620f4536d641fede75d51d0.tar.gz chromium_src-e55a7ddf8a95cd64c620f4536d641fede75d51d0.tar.bz2 | |
Correct line endings in chrome_frame_launcher.gyp.
BUG=none
TEST=gyp works on cygwin on windows
TBR=xiyuan
Review URL: http://codereview.chromium.org/2379002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48525 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
| -rw-r--r-- | chrome_frame/chrome_frame_launcher.gyp | 168 |
1 files changed, 84 insertions, 84 deletions
diff --git a/chrome_frame/chrome_frame_launcher.gyp b/chrome_frame/chrome_frame_launcher.gyp index 1466399..97e1629 100644 --- a/chrome_frame/chrome_frame_launcher.gyp +++ b/chrome_frame/chrome_frame_launcher.gyp @@ -1,84 +1,84 @@ -# Copyright (c) 2010 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.
-
-{
- 'variables': {
- 'chromium_code': 1,
-
- # Keep the archive builder happy.
- 'chrome_personalization%': 1,
- 'use_syncapi_stub%': 0,
-
- 'conditions': [
- ['OS=="win"', {
- 'python': [
- '<(DEPTH)\\third_party\\python_24\\setup_env.bat && python'
- ],
- }, { # OS != win
- 'python': [
- 'python'
- ],
- }],
- ],
- },
- 'includes': [
- '../build/common.gypi',
- ],
- 'target_defaults': {
- 'include_dirs': [
- # all our own includes are relative to src/
- '..',
- ],
- },
- 'targets': [
- {
- 'target_name': 'chrome_launcher',
- 'type': 'executable',
- 'msvs_guid': 'B7E540C1-49D9-4350-ACBC-FB8306316D16',
- 'dependencies': [
- '../breakpad/breakpad.gyp:breakpad_handler',
- ],
- 'sources': [
- 'chrome_launcher_main.cc',
- 'chrome_launcher.cc',
- 'chrome_launcher.h',
- ],
- 'msvs_settings': {
- 'VCLinkerTool': {
- 'OutputFile':
- '$(OutDir)\\servers\\$(ProjectName).exe',
- # Set /SUBSYSTEM:WINDOWS since this is not a command-line program.
- 'SubSystem': '2',
- 'AdditionalDependencies': [
- 'shlwapi.lib',
- ],
-
- },
- },
- 'configurations': {
- 'Release_Base': {
- # Set flags to unconditionally optimize chrome_frame_launcher.exe
- # for release builds.
- 'msvs_settings': {
- 'VCLinkerTool': {
- 'LinkTimeCodeGeneration': '1',
- },
- 'VCCLCompilerTool': {
- 'Optimization': '3',
- 'InlineFunctionExpansion': '2',
- 'EnableIntrinsicFunctions': 'true',
- 'FavorSizeOrSpeed': '2',
- 'OmitFramePointers': 'true',
- 'EnableFiberSafeOptimizations': 'true',
- 'WholeProgramOptimization': 'true',
- },
- 'VCLibrarianTool': {
- 'AdditionalOptions': ['/ltcg', '/expectedoutputsize:120000000'],
- },
- },
- },
- },
- },
- ],
-}
\ No newline at end of file +# Copyright (c) 2010 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. + +{ + 'variables': { + 'chromium_code': 1, + + # Keep the archive builder happy. + 'chrome_personalization%': 1, + 'use_syncapi_stub%': 0, + + 'conditions': [ + ['OS=="win"', { + 'python': [ + '<(DEPTH)\\third_party\\python_24\\setup_env.bat && python' + ], + }, { # OS != win + 'python': [ + 'python' + ], + }], + ], + }, + 'includes': [ + '../build/common.gypi', + ], + 'target_defaults': { + 'include_dirs': [ + # all our own includes are relative to src/ + '..', + ], + }, + 'targets': [ + { + 'target_name': 'chrome_launcher', + 'type': 'executable', + 'msvs_guid': 'B7E540C1-49D9-4350-ACBC-FB8306316D16', + 'dependencies': [ + '../breakpad/breakpad.gyp:breakpad_handler', + ], + 'sources': [ + 'chrome_launcher_main.cc', + 'chrome_launcher.cc', + 'chrome_launcher.h', + ], + 'msvs_settings': { + 'VCLinkerTool': { + 'OutputFile': + '$(OutDir)\\servers\\$(ProjectName).exe', + # Set /SUBSYSTEM:WINDOWS since this is not a command-line program. + 'SubSystem': '2', + 'AdditionalDependencies': [ + 'shlwapi.lib', + ], + + }, + }, + 'configurations': { + 'Release_Base': { + # Set flags to unconditionally optimize chrome_frame_launcher.exe + # for release builds. + 'msvs_settings': { + 'VCLinkerTool': { + 'LinkTimeCodeGeneration': '1', + }, + 'VCCLCompilerTool': { + 'Optimization': '3', + 'InlineFunctionExpansion': '2', + 'EnableIntrinsicFunctions': 'true', + 'FavorSizeOrSpeed': '2', + 'OmitFramePointers': 'true', + 'EnableFiberSafeOptimizations': 'true', + 'WholeProgramOptimization': 'true', + }, + 'VCLibrarianTool': { + 'AdditionalOptions': ['/ltcg', '/expectedoutputsize:120000000'], + }, + }, + }, + }, + }, + ], +} |