diff options
author | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-14 19:10:21 +0000 |
---|---|---|
committer | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-14 19:10:21 +0000 |
commit | a02ff58019cc94efe054751468944ccd5b0ab457 (patch) | |
tree | ac10286e54f395e6c02f95138f5304a7324d6e8d /media/media_unittests.scons | |
parent | 322f7f7005061fee5e3b691e6aee318ea93a7eb8 (diff) | |
download | chromium_src-a02ff58019cc94efe054751468944ccd5b0ab457.zip chromium_src-a02ff58019cc94efe054751468944ccd5b0ab457.tar.gz chromium_src-a02ff58019cc94efe054751468944ccd5b0ab457.tar.bz2 |
Recommit of media project files due to a mistake in media_unittest.vcproj
that worked in Visual Studio but broke on IncrediBuild. Also updated to
include dmg_fp dependency.
Trying ONE MORE TIME because I think gcl breaks with "A +" files (I used "svn merge -c REV ." to un-rollback my change).
Original: http://codereview.chromium.org/10683
Rollback: http://codereview.chromium.org/10908
Review URL: http://codereview.chromium.org/10733
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5490 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/media_unittests.scons')
-rw-r--r-- | media/media_unittests.scons | 52 |
1 files changed, 52 insertions, 0 deletions
diff --git a/media/media_unittests.scons b/media/media_unittests.scons new file mode 100644 index 0000000..b6116f7 --- /dev/null +++ b/media/media_unittests.scons @@ -0,0 +1,52 @@ +# Copyright (c) 2006-2008 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. + +__doc__ = """ +Configuration for building the media_unittests{,.exe} executable. +""" + +Import('env') + +env = env.Clone() + +env.SConscript([ + '$BASE_DIR/using_base.scons', + '$GTEST_DIR/../using_gtest.scons', + '$ICU38_DIR/using_icu38.scons', +], {'env':env}) + +env.Prepend( + CPPPATH = [ + '$CHROME_SRC_DIR', + ], +) + +if env['PLATFORM'] == 'win32': + env.Prepend( + CCFLAGS = [ + '/TP', + '/WX', + ], + CPPDEFINES = [ + '_WIN32_WINNT=0x0600', + 'WINVER=0x0600', + '_HAS_EXCEPTIONS=0', + ], + LINKFLAGS = [ + '/DELAYLOAD:"dwmapi.dll"', + '/DELAYLOAD:"uxtheme.dll"', + '/MACHINE:X86', + '/FIXED:No', + '/safeseh', + '/dynamicbase', + '/ignore:4199', + '/nxcompat', + ], + ) + +input_files = [ + 'base/run_all_unittests.cc', +] + +env.ChromeTestProgram('media_unittests', input_files) |