diff options
| author | tschmelcher@chromium.org <tschmelcher@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-05 20:29:42 +0000 |
|---|---|---|
| committer | tschmelcher@chromium.org <tschmelcher@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-05 20:29:42 +0000 |
| commit | 804f29246b1734ddc39cbf42f881fdedc6083983 (patch) | |
| tree | 074158683bba74bea65d4059f38cf160bc7453d3 /o3d | |
| parent | d35c36649f96c03db3cb99ec7c4cccb39f65edf7 (diff) | |
| download | chromium_src-804f29246b1734ddc39cbf42f881fdedc6083983.zip chromium_src-804f29246b1734ddc39cbf42f881fdedc6083983.tar.gz chromium_src-804f29246b1734ddc39cbf42f881fdedc6083983.tar.bz2 | |
Only define the ChangeResolution target on Windows. This fixes a problem where the make generator on the buildbots was trying to build the target on Linux.
Committing without code review because the code review server is down.
TEST=built all targets on Linux
BUG=none
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46488 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d')
| -rw-r--r-- | o3d/tests/lab/ChangeResolution/change_resolution.gyp | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/o3d/tests/lab/ChangeResolution/change_resolution.gyp b/o3d/tests/lab/ChangeResolution/change_resolution.gyp index 3e2ffa3..b749a77 100644 --- a/o3d/tests/lab/ChangeResolution/change_resolution.gyp +++ b/o3d/tests/lab/ChangeResolution/change_resolution.gyp @@ -4,13 +4,21 @@ { 'targets': [ - { - 'target_name': 'ChangeResolution', - 'type': 'executable', - 'defines': ['_WIN32_WINNT=0x0501'], # for ChangeDisplaySettings - 'sources': [ - 'change_resolution.cpp', - ], - }, + ], + 'conditions': [ + ['OS == "win"', + { + 'targets': [ + { + 'target_name': 'ChangeResolution', + 'type': 'executable', + 'defines': ['_WIN32_WINNT=0x0501'], # for ChangeDisplaySettings + 'sources': [ + 'change_resolution.cpp', + ], + }, + ], + }, + ], ], } |