diff options
| author | tschmelcher@chromium.org <tschmelcher@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-05 22:03:28 +0000 |
|---|---|---|
| committer | tschmelcher@chromium.org <tschmelcher@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-05 22:03:28 +0000 |
| commit | f93be30de128f68037f8eef0dd644df809b6d325 (patch) | |
| tree | 3c03b9865f35b322fc8d81c35c107a4ff3c541e6 | |
| parent | b7ab02638029b9dcb5f600a419acdf74fcfb0335 (diff) | |
| download | chromium_src-f93be30de128f68037f8eef0dd644df809b6d325.zip chromium_src-f93be30de128f68037f8eef0dd644df809b6d325.tar.gz chromium_src-f93be30de128f68037f8eef0dd644df809b6d325.tar.bz2 | |
Grr, change last CL to define ChangeResolution as a target with type of none on non-Windows, because that is the only way to keep both the "make" and XCode generators happy.
TEST=built on Linux and Mac
BUG=none
Review URL: http://codereview.chromium.org/2000001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46504 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | o3d/tests/lab/ChangeResolution/change_resolution.gyp | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/o3d/tests/lab/ChangeResolution/change_resolution.gyp b/o3d/tests/lab/ChangeResolution/change_resolution.gyp index b749a77..9701975 100644 --- a/o3d/tests/lab/ChangeResolution/change_resolution.gyp +++ b/o3d/tests/lab/ChangeResolution/change_resolution.gyp @@ -4,21 +4,22 @@ { 'targets': [ - ], - 'conditions': [ - ['OS == "win"', - { - 'targets': [ + { + 'target_name': 'ChangeResolution', + 'conditions': [ + ['OS == "win"', { - 'target_name': 'ChangeResolution', 'type': 'executable', 'defines': ['_WIN32_WINNT=0x0501'], # for ChangeDisplaySettings 'sources': [ 'change_resolution.cpp', ], }, + { + 'type': 'none', + }, ], - }, - ], + ], + }, ], } |