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

Unique BundleID for OS vs Havok flavors

master
Cinders 2013-09-09 22:49:08 -06:00
parent ef5f9ae01e
commit 96e04da82c
2 changed files with 6 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

@ -2287,7 +2287,7 @@ if (DARWIN)
set(product "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")
set(MACOSX_BUNDLE_GUI_IDENTIFIER "com.phoenixviewer.firestorm.viewer-${ND_VIEWER_FLAVOR}")
set(MACOSX_BUNDLE_LONG_VERSION_STRING "${VIEWER_CHANNEL} ${VIEWER_SHORT_VERSION}.${VIEWER_VERSION_REVISION}")
set(MACOSX_BUNDLE_BUNDLE_NAME "Firestorm")
set(MACOSX_BUNDLE_SHORT_VERSION_STRING "${VIEWER_SHORT_VERSION}")

6
indra/newview/llappviewer.cpp
View File

@ -278,7 +278,11 @@ static LLAppViewerListener sAppViewerListener(LLAppViewer::instance);
#if LL_DARWIN
// <FS:CR>
//const char * const LL_VERSION_BUNDLE_ID = "com.secondlife.indra.viewer";
const char * const LL_VERSION_BUNDLE_ID = "com.phoenixviewer.firestorm.viewer";
#ifdef OPENSIM
const char * const LL_VERSION_BUNDLE_ID = "com.phoenixviewer.firestorm.viewer-oss";
#else // !OPENSIM
const char * const LL_VERSION_BUNDLE_ID = "com.phoenixviewer.firestorm.viewer-hvk";
#endif // OPENSIM
// </FS:CR>
extern void init_apple_menu(const char* product);
#endif // LL_DARWIN