From 804f29246b1734ddc39cbf42f881fdedc6083983 Mon Sep 17 00:00:00 2001 From: "tschmelcher@chromium.org" <tschmelcher@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Date: Wed, 5 May 2010 20:29:42 +0000 Subject: 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 --- .../lab/ChangeResolution/change_resolution.gyp | 24 ++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) (limited to 'o3d') 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', + ], + }, + ], + }, + ], ], } -- cgit v1.1