Permalink
Browse files

Add back Latif's CMake-based branding to BuildBranding.cmake

  • Loading branch information...
Lirusaito committed Apr 5, 2017
1 parent c92ccf8 commit 2eaf9a2c223396158467a98825adbab29c4eceab
@@ -0,0 +1,37 @@
# -*- cmake -*-
if (WINDOWS)
configure_file(
${CMAKE_SOURCE_DIR}/newview/res/viewerRes.rc.in
${CMAKE_SOURCE_DIR}/newview/res/viewerRes.rc
)
endif (WINDOWS)
if (DARWIN)
configure_file(
${CMAKE_SOURCE_DIR}/newview/English.lproj/InfoPlist.strings.in
${CMAKE_SOURCE_DIR}/newview/English.lproj/InfoPlist.strings
)
endif (DARWIN)
if (LINUX)
configure_file(
${CMAKE_SOURCE_DIR}/newview/linux_tools/wrapper.sh.in
${CMAKE_SOURCE_DIR}/newview/linux_tools/wrapper.sh
@ONLY
)
configure_file(
${CMAKE_SOURCE_DIR}/newview/linux_tools/handle_secondlifeprotocol.sh.in
${CMAKE_SOURCE_DIR}/newview/linux_tools/handle_secondlifeprotocol.sh
@ONLY
)
configure_file(
${CMAKE_SOURCE_DIR}/newview/linux_tools/install.sh.in
${CMAKE_SOURCE_DIR}/newview/linux_tools/install.sh
@ONLY
)
configure_file(
${CMAKE_SOURCE_DIR}/newview/linux_tools/refresh_desktop_app_entry.sh.in
${CMAKE_SOURCE_DIR}/newview/linux_tools/refresh_desktop_app_entry.sh
@ONLY
)
endif (LINUX)
@@ -13,6 +13,7 @@ set(cmake_SOURCE_FILES
Audio.cmake
BasicPluginBase.cmake
Boost.cmake
BuildBranding.cmake
BuildVersion.cmake
CARes.cmake
CEFPlugin.cmake
@@ -1,6 +1,6 @@
/* Localized versions of Info.plist keys */
CFBundleName = "${VIEWER_CHANNEL_ONE_WORD}";
CFBundleName = "${VIEWER_CHANNEL_NOSPACE}";
CFBundleShortVersionString = "${VIEWER_CHANNEL} Viewer ${vMAJOR}.${vMINOR}.${vPATCH}.${vBUILD}";
CFBundleGetInfoString = "${VIEWER_CHANNEL} Viewer ${vMAJOR}.${vMINOR}.${vPATCH}.${vBUILD}, Copyright 2012 Siana Gearz";
@@ -142,7 +142,7 @@ if [ -n "$LL_TCMALLOC" ]; then
fi
fi
export VIEWER_BINARY='do-not-directly-run-singularity-bin'
export VIEWER_BINARY='do-not-directly-run-@VIEWER_BRANDING_ID@-bin'
BINARY_TYPE=$(expr match "$(file -b bin/$VIEWER_BINARY)" '\(.*executable\)' | sed -e 's/ / /g')
if [ "${BINARY_TYPE}" == "ELF 32-bit LSB executable" ]; then
SL_ENV+='LD_LIBRARY_PATH="`pwd`/lib:$LD_LIBRARY_PATH"'
@@ -73,7 +73,7 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE
FONT 8, "MS Sans Serif"
BEGIN
ICON IDI_LL_ICON,IDC_STATIC,7,7,20,20
LTEXT "Loading Singularity Viewer...",666,36,13,91,8
LTEXT "Loading ${VIEWER_CHANNEL} Viewer...",666,36,13,91,8
END
@@ -154,12 +154,12 @@ BEGIN
BLOCK "040904b0"
BEGIN
VALUE "CompanyName", "Siana Gearz"
VALUE "FileDescription", "Singularity Viewer"
VALUE "FileDescription", "${VIEWER_CHANNEL} Viewer"
VALUE "FileVersion", "${VIEWER_VERSION_MAJOR}.${VIEWER_VERSION_MINOR}.${VIEWER_VERSION_PATCH}.${VIEWER_VERSION_REVISION}"
VALUE "InternalName", "Second Life"
VALUE "LegalCopyright", "Copyright � 2001-2010, Linden Research, Inc., Copyright 2010 Siana Gearz"
VALUE "OriginalFilename", "SingularityViewer.exe"
VALUE "ProductName", "Singularity Viewer"
VALUE "ProductName", "${VIEWER_CHANNEL} Viewer"
VALUE "ProductVersion", "${VIEWER_VERSION_MAJOR}.${VIEWER_VERSION_MINOR}.${VIEWER_VERSION_PATCH}.${VIEWER_VERSION_REVISION}"
END
END

0 comments on commit 2eaf9a2

Please sign in to comment.