diff options
| author | tschmelcher@google.com <tschmelcher@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-11 20:21:44 +0000 |
|---|---|---|
| committer | tschmelcher@google.com <tschmelcher@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-11 20:21:44 +0000 |
| commit | a69f43a56e3e1e9a4355fc35e92dbd42a6dc972d (patch) | |
| tree | d6942bf12983187150a19704d77c78b2d3e90ff5 /o3d | |
| parent | b7c2041e034432303469669390ac2f456ca6c751 (diff) | |
| download | chromium_src-a69f43a56e3e1e9a4355fc35e92dbd42a6dc972d.zip chromium_src-a69f43a56e3e1e9a4355fc35e92dbd42a6dc972d.tar.gz chromium_src-a69f43a56e3e1e9a4355fc35e92dbd42a6dc972d.tar.bz2 | |
Linux: Ship libCg on 32-bit Debian systems too, since nvidia-cg-toolkit doesn't seem to like to use the latest version. Cg 2.2 fixes some Linux bugs, so it's worth ensuring that it's used on all systems.
Review URL: http://codereview.chromium.org/194081
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26003 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d')
| -rw-r--r-- | o3d/installer/linux/build.scons | 4 | ||||
| -rw-r--r-- | o3d/installer/linux/debian_i386/control | 2 | ||||
| -rw-r--r-- | o3d/installer/linux/debian_i386/google-o3d.install | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/o3d/installer/linux/build.scons b/o3d/installer/linux/build.scons index f03893b..ab7ecb0 100644 --- a/o3d/installer/linux/build.scons +++ b/o3d/installer/linux/build.scons @@ -175,7 +175,9 @@ if subprocess.Popen(["which", "dpkg-buildpackage"], "debian_i386/rules" ], [("libnpo3dautoplugin.so", - '$ARTIFACTS_DIR/libnpo3dautoplugin.so') + '$ARTIFACTS_DIR/libnpo3dautoplugin.so'), + ("libCg.so", '$ARTIFACTS_DIR/libCg.so'), + ("libCgGL.so", '$ARTIFACTS_DIR/libCgGL.so') ], output_dir='$ARTIFACTS_DIR', force_version=env.get('O3D_PLUGIN_VERSION')) diff --git a/o3d/installer/linux/debian_i386/control b/o3d/installer/linux/debian_i386/control index 57f1b9f..ff7f05b 100644 --- a/o3d/installer/linux/debian_i386/control +++ b/o3d/installer/linux/debian_i386/control @@ -7,7 +7,7 @@ Standards-Version: 3.7.2 Package: google-o3d Architecture: i386 -Depends: libc6, libstdc++6, libgcc1, zlib1g, libglew1.5, nvidia-cg-toolkit +Depends: libc6, libstdc++6, libgcc1, zlib1g, libglew1.5 Conflicts: o3d-plugin Replaces: o3d-plugin Description: Google O3D Plugin diff --git a/o3d/installer/linux/debian_i386/google-o3d.install b/o3d/installer/linux/debian_i386/google-o3d.install index 17e2a72..d10e9e4 100644 --- a/o3d/installer/linux/debian_i386/google-o3d.install +++ b/o3d/installer/linux/debian_i386/google-o3d.install @@ -1 +1,3 @@ libnpo3dautoplugin.so opt/google/o3d +libCg.so opt/google/o3d/lib +libCgGL.so opt/google/o3d/lib |