diff options
| author | apatrick@google.com <apatrick@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-23 22:17:10 +0000 |
|---|---|---|
| committer | apatrick@google.com <apatrick@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-23 22:17:10 +0000 |
| commit | 1d3a6d08fcc0759fdd589e48a85f3331cc9f7a98 (patch) | |
| tree | fe614bc0b7b1303f746eb2a74408fdaaba78adac /o3d/plugin | |
| parent | 5e892c20535dcbeae099f92148feea8473cf1445 (diff) | |
| download | chromium_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/plugin')
| -rw-r--r-- | o3d/plugin/build.scons | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/o3d/plugin/build.scons b/o3d/plugin/build.scons index 666cd7a..9bd29dd 100644 --- a/o3d/plugin/build.scons +++ b/o3d/plugin/build.scons @@ -270,7 +270,7 @@ if env.Bit('mac'): env['SHLIBPREFIX'] = [''] env['SHLIBSUFFIX'] = [''] plugin_dll = env.SharedLibrary('o3d', inputs) - plugin_install = env.Replicate('$ARTIFACTS_DIR/O3D.plugin/Contents/MacOS/', plugin_dll) + plugin_artifacts = env.Replicate('$ARTIFACTS_DIR/O3D.plugin/Contents/MacOS/', plugin_dll) # insert version number into Info.plist env.ReplaceStrings( @@ -385,10 +385,10 @@ if env.Bit('mac'): else: plugin_dll = env.SharedLibrary('npo3dautoplugin', inputs) # copy to artifacts - plugin_install = env.Replicate('$ARTIFACTS_DIR', plugin_dll) + plugin_artifacts = env.Replicate('$ARTIFACTS_DIR', plugin_dll) if env.Bit('linux'): - env.Requires(plugin_install, env.Replicate( + env.Requires(plugin_artifacts, env.Replicate( '$ARTIFACTS_DIR', [ '$CG_DIR/lib/libCg.so', '$CG_DIR/lib/libCgGL.so', @@ -398,15 +398,22 @@ if env.Bit('linux'): # alias 'plugin' to build the plug-in in artifacts -env.Alias('plugin', plugin_install) +env.Alias('plugin', plugin_artifacts) # TODO: have a common way to do colliding installs like this. # Do the install step only if this variant is the first target. if (env['BUILD_TYPE'] == ARGUMENTS.get('MODE') or (ARGUMENTS.get('MODE', 'default') == 'default' and env['BUILD_TYPE'] == 'dbg-d3d')): - i = env.Replicate('$FIREFOX_PLUGIN_DIR', plugin_dll[0]) - env.Alias('install', i) + plugin_install = env.Replicate('$FIREFOX_PLUGIN_DIR', plugin_dll[0]) + env.Alias('install', plugin_install) + + if env.Bit('windows'): + # Copy SwiftShader to plugin dir. + swiftshader_path = env.subst('$SWIFTSHADER_DIR/swiftshader_d3d9.dll') + if os.path.exists(swiftshader_path): + env.Requires(plugin_install, + env.Replicate('$FIREFOX_PLUGIN_DIR/O3DExtras', swiftshader_path)) if env.Bit('windows'): # Make the logging program |