From b10f0bbd46e5119521a7b560db4a7bfa339276dc Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Tue, 9 Nov 2021 20:50:44 +0200 Subject: SL-16320 Fix build failing due to not having any jpgs --- indra/newview/viewer_manifest.py | 1 - 1 file changed, 1 deletion(-) (limited to 'indra/newview/viewer_manifest.py') diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index b932f43141..8842829b5d 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -148,7 +148,6 @@ class ViewerManifest(LLManifest): with self.prefix(src_dst="skins"): # include the entire textures directory recursively with self.prefix(src_dst="*/textures"): - self.path("*/*.jpg") self.path("*/*.png") self.path("*.tga") self.path("*.j2c") -- cgit v1.2.3 From b21c17eee973dc06c1392dd45dbc19c1ce394852 Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Thu, 11 Jun 2020 16:38:59 +0300 Subject: Debug Fmod with logging #2 --- indra/newview/viewer_manifest.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'indra/newview/viewer_manifest.py') diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 4b4958e1c2..a7392f701f 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -515,7 +515,7 @@ class WindowsManifest(ViewerManifest): if(self.args['configuration'].lower() == 'debug'): self.path("fmodL.dll") else: - self.path("fmod.dll") + self.path("fmodL.dll") if self.args['openal'] == 'ON': # Get openal dll @@ -1050,7 +1050,7 @@ class DarwinManifest(ViewerManifest): dylibs += path_optional(os.path.join(debpkgdir, libfile), libfile) else: for libfile in ( - "libfmod.dylib", + "libfmodL.dylib", ): dylibs += path_optional(os.path.join(relpkgdir, libfile), libfile) @@ -1512,9 +1512,9 @@ class Linux_i686_Manifest(LinuxManifest): if self.args['fmodstudio'] == 'ON': try: - self.path("libfmod.so.11.7") - self.path("libfmod.so.11") - self.path("libfmod.so") + self.path("libfmodL.so.11.7") + self.path("libfmodL.so.11") + self.path("libfmodL.so") pass except: print "Skipping libfmod.so - not found" -- cgit v1.2.3 From be820f2eb90519ac0fa8d13be9dc5a798e8bfc7f Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Mon, 14 Mar 2022 18:21:16 +0200 Subject: Revert "Debug Fmod with logging" This reverts commits b21c17eee973dc06c1392dd45dbc19c1ce394852 and 2f78338aeb3d0297813bc9c9c7a9d75a2055000d. 'Debug Fmod' was not an intended commit, was meant for local testing. But might be a good idea to make this a part of DebWithRelInfo or provide a cmake switch. --- indra/newview/viewer_manifest.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'indra/newview/viewer_manifest.py') diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 527d3941b0..7855a62c87 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -517,7 +517,7 @@ class WindowsManifest(ViewerManifest): if(self.args['configuration'].lower() == 'debug'): self.path("fmodL.dll") else: - self.path("fmodL.dll") + self.path("fmod.dll") if self.args['openal'] == 'ON': # Get openal dll @@ -1051,7 +1051,7 @@ class DarwinManifest(ViewerManifest): dylibs += path_optional(os.path.join(debpkgdir, libfile), libfile) else: for libfile in ( - "libfmodL.dylib", + "libfmod.dylib", ): dylibs += path_optional(os.path.join(relpkgdir, libfile), libfile) @@ -1545,9 +1545,9 @@ class Linux_i686_Manifest(LinuxManifest): if self.args['fmodstudio'] == 'ON': try: - self.path("libfmodL.so.11.7") - self.path("libfmodL.so.11") - self.path("libfmodL.so") + self.path("libfmod.so.11.7") + self.path("libfmod.so.11") + self.path("libfmod.so") pass except: print("Skipping libfmod.so - not found") -- cgit v1.2.3