From b99fcdb30ab65be55aefadaa187849525f189500 Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Thu, 13 Feb 2020 21:44:46 +0200 Subject: SL-12707 Build Fails Without FMOD Also adds correct working directory to RelWithDebInfoOS and enables OpenAl on OS builds for windows --- indra/newview/viewer_manifest.py | 51 +++++++++++++++++++++------------------- 1 file changed, 27 insertions(+), 24 deletions(-) (limited to 'indra/newview/viewer_manifest.py') diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index a403760670..2120e673d4 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -513,14 +513,17 @@ class WindowsManifest(ViewerManifest): print err.message print "Skipping GLOD library (assumming linked statically)" - # Get fmodex dll, continue if missing - try: - if(self.address_size == 64): - self.path("fmodex64.dll") - else: - self.path("fmodex.dll") - except: - print "Skipping fmodex audio library(assuming other audio engine)" + if self.args['fmodex'] == 'ON': + # Get fmodex dll + if(self.address_size == 64): + self.path("fmodex64.dll") + else: + self.path("fmodex.dll") + + if self.args['openal'] == 'ON': + # Get openal dll + self.path("OpenAL32.dll") + self.path("alut.dll") # For textures self.path("openjpeg.dll") @@ -1047,17 +1050,18 @@ class DarwinManifest(ViewerManifest): self.path2basename(relpkgdir, libfile) # dylibs that vary based on configuration - if self.args['configuration'].lower() == 'debug': - for libfile in ( - "libfmodexL.dylib", - ): - dylibs += path_optional(os.path.join(debpkgdir, libfile), libfile) - else: - for libfile in ( - "libfmodex.dylib", - ): - dylibs += path_optional(os.path.join(relpkgdir, libfile), libfile) - + if self.args['fmodex'] == 'ON': + if self.args['configuration'].lower() == 'debug': + for libfile in ( + "libfmodexL.dylib", + ): + dylibs += path_optional(os.path.join(debpkgdir, libfile), libfile) + else: + for libfile in ( + "libfmodex.dylib", + ): + dylibs += path_optional(os.path.join(relpkgdir, libfile), libfile) + # our apps executable_path = {} for app_bld_dir, app in (("mac_crash_logger", "mac-crash-logger.app"), @@ -1519,13 +1523,9 @@ class Linux_i686_Manifest(LinuxManifest): print "tcmalloc files not found, skipping" pass - try: + if self.args['fmodex'] == 'ON': self.path("libfmodex-*.so") self.path("libfmodex.so") - pass - except: - print "Skipping libfmodex.so - not found" - pass # Vivox runtimes @@ -1552,9 +1552,12 @@ class Linux_x86_64_Manifest(LinuxManifest): ################################################################ if __name__ == "__main__": + # fmodex and openal can be used simultaneously and controled by environment extra_arguments = [ dict(name='bugsplat', description="""BugSplat database to which to post crashes, if BugSplat crash reporting is desired""", default=''), + dict(name='fmodex', description="""Indication that fmodex libraries are needed""", default='OFF'), + dict(name='openal', description="""Indication openal libraries are needed""", default='OFF'), ] try: main(extra=extra_arguments) -- cgit v1.2.3 From 547361692e485bd8f8f2e6640fa13f55fb8d62ab Mon Sep 17 00:00:00 2001 From: Andrey Lihatskiy Date: Wed, 3 Jun 2020 00:20:38 +0300 Subject: Post-merge buildfix --- indra/newview/viewer_manifest.py | 9 --------- 1 file changed, 9 deletions(-) (limited to 'indra/newview/viewer_manifest.py') diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 5080b93345..e9007fd7b5 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -1057,11 +1057,6 @@ class DarwinManifest(ViewerManifest): if self.args['configuration'].lower() == 'debug': for libfile in ( "libfmodL.dylib", - # dylibs that vary based on configuration - if self.args['fmodex'] == 'ON': - if self.args['configuration'].lower() == 'debug': - for libfile in ( - "libfmodexL.dylib", ): dylibs += path_optional(os.path.join(debpkgdir, libfile), libfile) else: @@ -1069,10 +1064,6 @@ class DarwinManifest(ViewerManifest): "libfmod.dylib", ): dylibs += path_optional(os.path.join(relpkgdir, libfile), libfile) - - "libfmodex.dylib", - ): - dylibs += path_optional(os.path.join(relpkgdir, libfile), libfile) # our apps executable_path = {} -- cgit v1.2.3 From 9b1c8534fbb0e99e9e20142fdc9582f3966c1e01 Mon Sep 17 00:00:00 2001 From: Andrey Lihatskiy Date: Wed, 3 Jun 2020 11:36:13 +0300 Subject: More post-merge cleanup --- indra/newview/viewer_manifest.py | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'indra/newview/viewer_manifest.py') diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index e9007fd7b5..0a96444a7a 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -1064,7 +1064,7 @@ class DarwinManifest(ViewerManifest): "libfmod.dylib", ): dylibs += path_optional(os.path.join(relpkgdir, libfile), libfile) - + # our apps executable_path = {} for app_bld_dir, app in (("mac_crash_logger", "mac-crash-logger.app"), @@ -1535,10 +1535,6 @@ class Linux_i686_Manifest(LinuxManifest): except: print "Skipping libfmod.so - not found" pass - if self.args['fmodex'] == 'ON': - self.path("libfmodex-*.so") - self.path("libfmodex.so") - # Vivox runtimes with self.prefix(src=relpkgdir, dst="bin"): @@ -1564,12 +1560,11 @@ class Linux_x86_64_Manifest(LinuxManifest): ################################################################ if __name__ == "__main__": - # fmodex and openal can be used simultaneously and controled by environment + # fmodstudio and openal can be used simultaneously and controled by environment extra_arguments = [ dict(name='bugsplat', description="""BugSplat database to which to post crashes, if BugSplat crash reporting is desired""", default=''), dict(name='fmodstudio', description="""Indication if fmod studio libraries are needed""", default='OFF'), - dict(name='fmodex', description="""Indication that fmodex libraries are needed""", default='OFF'), dict(name='openal', description="""Indication openal libraries are needed""", default='OFF'), ] try: -- cgit v1.2.3