Sync with alchemy
Minor installer fix Fix MSVC update breaking crashAndLoop Move Variables to their corresponding places Sync parts of deps/CMakeLists.txt Update Abseil and fmt
This commit is contained in:
@@ -42,6 +42,13 @@ option(BUILD_TESTING "Build test suite" OFF)
|
||||
option(UNATTENDED "Disable use of uneeded tooling for automated builds" OFF)
|
||||
|
||||
# Compiler and toolchain options
|
||||
option(USESYSTEMLIBS "Use libraries from your system rather than Linden-supplied prebuilt libraries." OFF)
|
||||
option(STANDALONE "Use libraries from your system rather than Linden-supplied prebuilt libraries." OFF)
|
||||
if (USESYSTEMLIBS)
|
||||
set(STANDALONE ON)
|
||||
elseif (STANDALONE)
|
||||
set(USESYSTEMLIBS ON)
|
||||
endif (USESYSTEMLIBS)
|
||||
option(INCREMENTAL_LINK "Use incremental linking on win32 builds (enable for faster links on some machines)" OFF)
|
||||
option(USE_PRECOMPILED_HEADERS "Enable use of precompiled header directives where supported." ON)
|
||||
option(USE_LTO "Enable global and interprocedural optimizations" OFF)
|
||||
@@ -270,16 +277,6 @@ endif (NOT VIEWER_CHANNEL_GRK)
|
||||
option(ENABLE_SIGNING "Enable signing the viewer" OFF)
|
||||
set(SIGNING_IDENTITY "" CACHE STRING "Specifies the signing identity to use, if necessary.")
|
||||
|
||||
# Compiler and toolchain options
|
||||
option(USESYSTEMLIBS "Use libraries from your system rather than Linden-supplied prebuilt libraries." OFF)
|
||||
option(STANDALONE "Use libraries from your system rather than Linden-supplied prebuilt libraries." OFF)
|
||||
if (USESYSTEMLIBS)
|
||||
set(STANDALONE ON)
|
||||
elseif (STANDALONE)
|
||||
set(USESYSTEMLIBS ON)
|
||||
endif (USESYSTEMLIBS)
|
||||
|
||||
|
||||
source_group("CMake Rules" FILES CMakeLists.txt)
|
||||
|
||||
endif(NOT DEFINED ${CMAKE_CURRENT_LIST_FILE}_INCLUDED)
|
||||
|
||||
@@ -3,21 +3,22 @@ project(deps)
|
||||
include(FetchContent)
|
||||
|
||||
set(CMAKE_FOLDER "Third Party")
|
||||
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
|
||||
|
||||
FetchContent_Declare(
|
||||
Catch2
|
||||
GIT_REPOSITORY https://github.com/catchorg/Catch2.git
|
||||
GIT_TAG v2.10.0
|
||||
GIT_TAG v2.11.0
|
||||
)
|
||||
FetchContent_Declare(
|
||||
fmt
|
||||
GIT_REPOSITORY https://github.com/fmtlib/fmt.git
|
||||
GIT_TAG 7512a55aa3ae309587ca89668ef9ec4074a51a1f
|
||||
GIT_TAG 6.1.2
|
||||
)
|
||||
FetchContent_Declare(
|
||||
absl
|
||||
GIT_REPOSITORY https://github.com/abseil/abseil-cpp.git
|
||||
GIT_TAG ab3552a18964e7063c8324f45b3896a6a20b08a8
|
||||
GIT_TAG 29235139149790f5afc430c11cec8f1eb1677607
|
||||
)
|
||||
|
||||
# This is a hack because absl has dumb cmake
|
||||
@@ -43,4 +44,5 @@ if(WINDOWS)
|
||||
FetchContent_MakeAvailable(fmt)
|
||||
endif()
|
||||
|
||||
set(CMAKE_FOLDER "")
|
||||
unset(CMAKE_FOLDER)
|
||||
unset(CMAKE_POSITION_INDEPENDENT_CODE)
|
||||
|
||||
@@ -1338,7 +1338,7 @@ namespace LLError
|
||||
}
|
||||
|
||||
#if LL_WINDOWS
|
||||
// VC80 was optimizing the error away.
|
||||
// MSVC is optimizing the error away.
|
||||
#pragma optimize("", off)
|
||||
#endif
|
||||
void crashAndLoop(const std::string& message)
|
||||
@@ -1347,9 +1347,8 @@ namespace LLError
|
||||
DoutFatal(dc::core, message);
|
||||
#else
|
||||
// Now, we go kaboom!
|
||||
int* make_me_crash = NULL;
|
||||
|
||||
*make_me_crash = 0;
|
||||
int* make_me_crash = nullptr;
|
||||
*make_me_crash = 0xDEADBEEF;
|
||||
|
||||
while(true)
|
||||
{
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||
;; Second Life setup.nsi
|
||||
;; Copyright 2004-2015, Linden Research, Inc.
|
||||
;; secondlife setup.nsi
|
||||
;; Copyright 2004-2011, Linden Research, Inc.
|
||||
;; Copyright 2013-2015 Alchemy Viewer Project
|
||||
;;
|
||||
;; This library is free software; you can redistribute it and/or
|
||||
;; modify it under the terms of the GNU Lesser General Public
|
||||
@@ -94,18 +95,6 @@
|
||||
;File Handling
|
||||
SetOverwrite on
|
||||
|
||||
;--------------------------------
|
||||
;Version Information
|
||||
|
||||
VIProductVersion "${VERSION_LONG}"
|
||||
VIAddVersionKey "ProductName" "Singularity Viewer Installer"
|
||||
VIAddVersionKey "Comments" "A viewer for the meta-verse!"
|
||||
VIAddVersionKey "CompanyName" "${VENDORSTR}"
|
||||
VIAddVersionKey "LegalCopyright" "Copyright © 2010-2019, ${VENDORSTR}"
|
||||
VIAddVersionKey "FileDescription" "${APPNAME} Installer"
|
||||
VIAddVersionKey "ProductVersion" "${VERSION_LONG}"
|
||||
VIAddVersionKey "FileVersion" "${VERSION_LONG}"
|
||||
|
||||
;--------------------------------
|
||||
;Interface Settings
|
||||
|
||||
@@ -198,6 +187,18 @@
|
||||
!include "%%SOURCE%%\installers\windows\lang_tr.nsi"
|
||||
!include "%%SOURCE%%\installers\windows\lang_zh.nsi"
|
||||
|
||||
;--------------------------------
|
||||
;Version Information
|
||||
|
||||
VIProductVersion "${VERSION_LONG}"
|
||||
VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductName" "Singularity Viewer Installer"
|
||||
VIAddVersionKey /LANG=${LANG_ENGLISH} "Comments" "A viewer for the meta-verse!"
|
||||
VIAddVersionKey /LANG=${LANG_ENGLISH} "CompanyName" "${VENDORSTR}"
|
||||
VIAddVersionKey /LANG=${LANG_ENGLISH} "LegalCopyright" "Copyright © 2010-2019, ${VENDORSTR}"
|
||||
VIAddVersionKey /LANG=${LANG_ENGLISH} "FileDescription" "${APPNAME} Installer"
|
||||
VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductVersion" "${VERSION_LONG}"
|
||||
VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion" "${VERSION_LONG}"
|
||||
|
||||
;--------------------------------
|
||||
;Reserve Files
|
||||
|
||||
@@ -206,7 +207,7 @@
|
||||
;because this will make your installer start faster.
|
||||
|
||||
!insertmacro MUI_RESERVEFILE_LANGDLL
|
||||
ReserveFile "${NSISDIR}\Plugins\x86-unicode\nsisdl.dll"
|
||||
ReserveFile "${NSISDIR}\Plugins\x86-unicode\NSISdl.dll"
|
||||
ReserveFile "${NSISDIR}\Plugins\x86-unicode\nsDialogs.dll"
|
||||
ReserveFile "${NSISDIR}\Plugins\x86-unicode\StartMenu.dll"
|
||||
ReserveFile "${NSISDIR}\Plugins\x86-unicode\StdUtils.dll"
|
||||
@@ -438,6 +439,7 @@ Section "Viewer"
|
||||
WriteINIStr "$SMPROGRAMS\$STARTMENUFOLDER\SL Create Account.url" "InternetShortcut" "URL" "http://join.secondlife.com/"
|
||||
WriteINIStr "$SMPROGRAMS\$STARTMENUFOLDER\SL Your Account.url" "InternetShortcut" "URL" "http://www.secondlife.com/account/"
|
||||
WriteINIStr "$SMPROGRAMS\$STARTMENUFOLDER\SL Scripting Language Help.url" "InternetShortcut" "URL" "http://wiki.secondlife.com/wiki/LSL_Portal"
|
||||
|
||||
!insertmacro MUI_STARTMENU_WRITE_END
|
||||
|
||||
;Other shortcuts
|
||||
|
||||
Reference in New Issue
Block a user