summaryrefslogtreecommitdiffstats
path: root/o3d/svn_paths.scons
diff options
context:
space:
mode:
authorapatrick@google.com <apatrick@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-23 22:17:10 +0000
committerapatrick@google.com <apatrick@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-23 22:17:10 +0000
commit1d3a6d08fcc0759fdd589e48a85f3331cc9f7a98 (patch)
treefe614bc0b7b1303f746eb2a74408fdaaba78adac /o3d/svn_paths.scons
parent5e892c20535dcbeae099f92148feea8473cf1445 (diff)
downloadchromium_src-1d3a6d08fcc0759fdd589e48a85f3331cc9f7a98.zip
chromium_src-1d3a6d08fcc0759fdd589e48a85f3331cc9f7a98.tar.gz
chromium_src-1d3a6d08fcc0759fdd589e48a85f3331cc9f7a98.tar.bz2
Code to load the software renderer and initialize it. Code to force the software renderer enabled with registry entry even if hardware is capable. Build scripts copy the software renderer dll to the plugin directory on an intall build.
Review URL: http://codereview.chromium.org/147039 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19070 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d/svn_paths.scons')
-rw-r--r--o3d/svn_paths.scons6
1 files changed, 4 insertions, 2 deletions
diff --git a/o3d/svn_paths.scons b/o3d/svn_paths.scons
index 019a618..4741f6a 100644
--- a/o3d/svn_paths.scons
+++ b/o3d/svn_paths.scons
@@ -51,17 +51,18 @@ env.Replace(
GTEST_DIR = '$THIRD_PARTY/gtest/files',
# TODO: pull from Chrome's SVN with gclient ?
ICU38_DIR = '$THIRD_PARTY/icu38/files',
+ INTERNAL_DIR = '$SCONSTRUCT_DIR/../o3d-internal',
JPEG_DIR = '$THIRD_PARTY/jpeg/src',
JSDOCTOOLKIT_DIR = '$THIRD_PARTY/jsdoctoolkit/files',
# To run selenium tests you will need a tgz'ed copy of firefox.
# Specify the path to it below.
# See tests/build.scons
MAC_HERMETIC_FIREFOX_DIR = (
- '$SCONSTRUCT_DIR/../o3d-internal/third_party/firefox'),
+ '$INTERNAL_DIR/third_party/firefox'),
# If we have directx redistributables present,
# then build o3dextras.
DIRECTX_REDIST_DIR=(
- '$SCONSTRUCT_DIR/../o3d-internal/third_party/dx_nov_2007_redist'),
+ '$INTERNAL_DIR/third_party/dx_nov_2007_redist'),
# NACL has to be in this weird directory because it looks for
# googleclient two levels above it.
NACL_DIR = '$THIRD_PARTY/native_client/googleclient/native_client',
@@ -75,6 +76,7 @@ env.Replace(
SELENIUM_PYTHON_DIR = '$THIRD_PARTY/py/selenium',
# TODO: pull from SVN with gclient ?
SKIA_DIR = '$THIRD_PARTY/skia',
+ SWIFTSHADER_DIR = '$INTERNAL_DIR/third_party/swiftshader/files',
# TODO: pull from SVN with gclient ?
V8_SRC_DIR = '$THIRD_PARTY/v8',
WIX_DIR = '$THIRD_PARTY/wix_2_0_4221/files',