aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJacek Antonelli2008-10-17 20:41:43 -0500
committerJacek Antonelli2008-10-17 22:22:07 -0500
commit7e7308c8da7d6c892841f2a8cb7414e208576a2e (patch)
tree0e3f194b4eab32dd9b2cbc0ae29cea55d7c30cf1
parentUpdated to SL source 1.21.6. (diff)
downloadmeta-impy-7e7308c8da7d6c892841f2a8cb7414e208576a2e.zip
meta-impy-7e7308c8da7d6c892841f2a8cb7414e208576a2e.tar.gz
meta-impy-7e7308c8da7d6c892841f2a8cb7414e208576a2e.tar.bz2
meta-impy-7e7308c8da7d6c892841f2a8cb7414e208576a2e.tar.xz
Commented out fmod from viewer manifest.
-rw-r--r--ChangeLog.txt3
-rwxr-xr-xlinden/indra/newview/viewer_manifest.py6
2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog.txt b/ChangeLog.txt
index da20546..b66f4b7 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,5 +1,8 @@
12008-10-17 Jacek Antonelli <jacek.antonelli@gmail.com> 12008-10-17 Jacek Antonelli <jacek.antonelli@gmail.com>
2 2
3 * linden/indra/newview/viewer_manifest.py:
4 Commented out fmod from viewer manifest.
5
3 * Updated to SL source 1.21.6. 6 * Updated to SL source 1.21.6.
4 7
5 8
diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py
index 3d56c7d..c9a5812 100755
--- a/linden/indra/newview/viewer_manifest.py
+++ b/linden/indra/newview/viewer_manifest.py
@@ -167,7 +167,7 @@ class WindowsManifest(ViewerManifest):
167 self.path("dbghelp.dll") 167 self.path("dbghelp.dll")
168 168
169 # For using FMOD for sound... DJS 169 # For using FMOD for sound... DJS
170 self.path("fmod.dll") 170 #self.path("fmod.dll")
171 171
172 # For textures 172 # For textures
173 if self.prefix(src="../../libraries/i686-win32/lib/release", dst=""): 173 if self.prefix(src="../../libraries/i686-win32/lib/release", dst=""):
@@ -413,7 +413,7 @@ class DarwinManifest(ViewerManifest):
413# self.path("../../libraries/universal-darwin/lib_release/libllkdu.dylib", "libllkdu.dylib") 413# self.path("../../libraries/universal-darwin/lib_release/libllkdu.dylib", "libllkdu.dylib")
414 414
415 #libfmodwrapper.dylib 415 #libfmodwrapper.dylib
416 self.path(self.args['configuration'] + "/libfmodwrapper.dylib", "libfmodwrapper.dylib") 416 #self.path(self.args['configuration'] + "/libfmodwrapper.dylib", "libfmodwrapper.dylib")
417 417
418 # our apps 418 # our apps
419# self.path("../mac_crash_logger/" + self.args['configuration'] + "/mac-crash-logger.app", "mac-crash-logger.app") 419# self.path("../mac_crash_logger/" + self.args['configuration'] + "/mac-crash-logger.app", "mac-crash-logger.app")
@@ -613,7 +613,7 @@ class Linux_i686Manifest(LinuxManifest):
613 613
614 if self.prefix("../../libraries/i686-linux/lib_release_client", dst="lib"): 614 if self.prefix("../../libraries/i686-linux/lib_release_client", dst="lib"):
615# self.path("libkdu_v42R.so") 615# self.path("libkdu_v42R.so")
616 self.path("libfmod-3.75.so") 616# self.path("libfmod-3.75.so")
617 self.path("libapr-1.so.0") 617 self.path("libapr-1.so.0")
618 self.path("libaprutil-1.so.0") 618 self.path("libaprutil-1.so.0")
619 self.path("libdb-4.2.so") 619 self.path("libdb-4.2.so")