Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge git://github.com/narv/SingularityViewer

Browse Source
This commit is contained in:
Siana Gearz
2011-05-13 13:26:33 +02:00
parent def7d1052c ebe7053526
commit 5aa145cc02
3 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
indra/llcommon/CMakeLists.txt
View File

@@ -216,3 +216,12 @@ target_link_libraries(
${WINDOWS_LIBRARIES}
)
if (DARWIN)
# Don't embed a full path in the library's install name
set_target_properties(
llcommon
PROPERTIES
BUILD_WITH_INSTALL_RPATH 1
INSTALL_NAME_DIR "@executable_path/../Resources"
)
endif (DARWIN)

4
indra/llcommon/llversionviewer.h
View File

@@ -36,12 +36,12 @@
const S32 LL_VERSION_MAJOR = 1;
const S32 LL_VERSION_MINOR = 5;
const S32 LL_VERSION_PATCH = 7;
const S32 LL_VERSION_BUILD = 1;
const S32 LL_VERSION_BUILD = 2;
const char * const LL_CHANNEL = "Singularity";
#if LL_DARWIN
const char * const LL_VERSION_BUNDLE_ID = "com.secondlife.snowglobe.viewer";
const char * const LL_VERSION_BUNDLE_ID = "com.secondlife.singularity.viewer";
#endif
#endif