From 966be89d980e6359a6b5daa84d780bca30d0f845 Mon Sep 17 00:00:00 2001 From: Lirusaito Date: Tue, 10 Nov 2015 20:28:40 -0500 Subject: [PATCH] Fix Mac not packaging with fmod and therefore exploding. if configuration (set by CMAKE_CFG_INTDIR) is '.', we now fallback on buildtype in viewer_manifest.py --- indra/newview/viewer_manifest.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 1230617e3..d922212c7 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -197,6 +197,9 @@ class ViewerManifest(LLManifest): def add_extra_libraries(self): found_libs = [] + config_arg = self.args['configuration'].lower() + if(config_arg == '.'): + config_arg = self.buildtype().lower() if 'extra_libraries' in self.args and self.args['extra_libraries'] != '': try: path_list = self.args['extra_libraries'].strip('"').split('|') @@ -210,11 +213,11 @@ class ViewerManifest(LLManifest): except: config, file = (None, None) if(config == 'optimized'): - if(self.args['configuration'].lower() != 'release' and self.args['configuration'].lower() != 'relwithdebinfo' and self.args['configuration'].lower() != 'universal'): + if(config_arg != 'release' and config_arg != 'relwithdebinfo' and config_arg != 'universal'): continue cur_path = file if(config == 'debug'): - if(self.args['configuration'].lower() != 'debug'): + if(config_arg != 'debug'): continue cur_path = file if(cur_path != ''):