livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Still more macOS build fixes. These should do it.

Tonya Souther 2019-03-10 14:11:14 -05:00
parent 7e324ee16e
commit 2b0e4bcfe5
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/CMakeLists.txt
View File

@ -2539,7 +2539,7 @@ if (DARWIN)
# Info-SecondLife.plist file in the configure_file() directive below.
#set(product "${VIEWER_CHANNEL}")
set(product "Firestorm")
set(MACOSX_EXECUTABLE_NAME "${VIEWER_CHANNEL}")
set(MACOSX_EXECUTABLE_NAME "Firestorm")
set(MACOSX_BUNDLE_INFO_STRING "Firestorm Viewer")
set(MACOSX_BUNDLE_ICON_FILE "firestorm_icon.icns")
set(MACOSX_BUNDLE_GUI_IDENTIFIER "com.phoenixviewer.firestorm.viewer-${ND_VIEWER_FLAVOR}")

3
indra/newview/viewer_manifest.py
View File

@ -1345,7 +1345,8 @@ class DarwinManifest(ViewerManifest):
def construct(self):
# copy over the build result (this is a no-op if run within the xcode script)
self.path(self.args['configuration'] + "/Firestorm.app", dst="")
# self.path(os.path.join(self.args['configuration'], self.channel()+".app"), dst="")
self.path(os.path.join(self.args['configuration'], "Firestorm.app"), dst="")
pkgdir = os.path.join(self.args['build'], os.pardir, 'packages')
relpkgdir = os.path.join(pkgdir, "lib", "release")