diff options
| author | gspencer@google.com <gspencer@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-03 18:31:33 +0000 |
|---|---|---|
| committer | gspencer@google.com <gspencer@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-03 18:31:33 +0000 |
| commit | 415723327b754d66568d471e85d058006d46fa5f (patch) | |
| tree | 1cd14c12d723d706c10d3cb0b027e806445b0d76 /o3d/v8 | |
| parent | 80c95a050efedc4c99276fadc6503dd63d6d4e7a (diff) | |
| download | chromium_src-415723327b754d66568d471e85d058006d46fa5f.zip chromium_src-415723327b754d66568d471e85d058006d46fa5f.tar.gz chromium_src-415723327b754d66568d471e85d058006d46fa5f.tar.bz2 | |
This switches some of our dependencies that come from the code.google.com site
over to be code that is in the Chrome repository (v8), or to the same version
that Chrome is using (breakpad, gtest). This also fixes the breakpad dependency so it doesn't have to sync every time.
Review URL: http://codereview.chromium.org/112084
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17506 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d/v8')
| -rw-r--r-- | o3d/v8/build.scons | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/o3d/v8/build.scons b/o3d/v8/build.scons index 579cb5b..ccb133b 100644 --- a/o3d/v8/build.scons +++ b/o3d/v8/build.scons @@ -50,8 +50,7 @@ env = env.Clone( V8_MODE = 'release', V8_MODE_DIR = '$V8_SRC_DIR/obj/$V8_MODE', V8_SCONS_COM = '$PYTHON $SCONS -C $V8_SRC_DIR -f SConstruct ' - '$DEBUG_OPTS mode=$V8_MODE ' - 'PLATFORM_SDK_DIR="$PLATFORM_SDK_VISTA_6_0_DIR"', + '$DEBUG_OPTS mode=$V8_MODE importenv=INCLUDE,LIB', SCONS = '$SCONS_DIR/scons.py', DEBUG_OPTS = ['--debug=%s' % item for item in GetOption('debug')] ) @@ -93,6 +92,24 @@ if v8_env.Bit('windows'): except KeyError: v8_env['ENV']['USERPROFILE'] = "" + include_path = ";".join( + [v8_env.subst("$INCLUDE"), + v8_env.subst("$PLATFORM_SDK_VISTA_6_0_DIR/Include")]) + + try: + v8_env['ENV']['INCLUDE'] += ";" + include_path + except KeyError: + v8_env['ENV']['INCLUDE'] = include_path + + lib_path = ";".join( + [v8_env.subst("$LIB"), + v8_env.subst("$PLATFORM_SDK_VISTA_6_0_DIR/Lib")]) + + try: + v8_env['ENV']['LIB'] += ";" + lib_path + except KeyError: + v8_env['ENV']['LIB'] = lib_path + v8_no_snapshot = v8_env.Command( v8_scons_targets_no_snapshot, [], |