Compare revisions

Rye Mutt · Rye Mutt · Rye Mutt · Rye Mutt · Rye Mutt · Rye Mutt
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -34,7 +34,7 @@ variables:
    - pip install --upgrade autobuild -i https://pkg.alchemyviewer.org/repository/autobuild/simple --extra-index-url https://pypi.org/simple
  script:
    - |
-        autobuild configure -c ReleaseOS -- -DUSE_FMODSTUDIO=ON -DUSE_NVAPI=ON -DUSE_LTO=ON -DVS_DISABLE_FATAL_WARNINGS=ON -DREVISION_FROM_VCS=FALSE
+        autobuild configure -c ReleaseOS -- -DUSE_FMODSTUDIO=ON -DUSE_NVAPI=ON -DUSE_LTO=ON -DDISABLE_FATAL_WARNINGS=ON -DREVISION_FROM_VCS=FALSE
        autobuild build -c ReleaseOS --no-configure
  artifacts:
    name: "$env:CI_COMMIT_REF_NAME-$env:CI_COMMIT_SHORT_SHA"
@@ -46,6 +46,35 @@ variables:
      - build-vc-*/newview/Release/*.dll
      - build-vc-*/newview/Release/Alchemy_*_Setup.exe

+.mac_build:
+  stage: build
+  tags:
+    - mac
+  cache:
+    key:
+      files:
+        - autobuild.xml
+      prefix: ${CI_JOB_NAME}
+    paths:
+      - .cache/autobuild
+      - .cache/pip
+      - .venv
+    when: 'always'
+  before_script:
+    - virtualenv .venv -p python2
+    - source .venv/bin/activate
+    - pip install --upgrade autobuild dmgbuild -i https://pkg.alchemyviewer.org/repository/autobuild/simple --extra-index-url https://pypi.org/simple
+  script:
+    - |
+        autobuild configure -c ReleaseOS -- -DUSE_FMODSTUDIO=ON -DUSE_NVAPI=ON -DUSE_LTO=ON -DDISABLE_FATAL_WARNINGS=ON -DREVISION_FROM_VCS=FALSE
+        autobuild build -c ReleaseOS --no-configure
+  artifacts:
+    name: "$env:CI_COMMIT_REF_NAME-$env:CI_COMMIT_SHORT_SHA"
+    expire_in: 1 week
+    paths:
+      - build-darwin-*/build_data.json
+      - build-darwin-*/newview/Alchemy_*.dmg
+
 .linux_build:
  stage: build
  image: r.alchemyviewer.org/alchemy/infrastructure/debian-build-image:latest
@@ -68,7 +97,7 @@ variables:
    - pip install --upgrade autobuild -i https://pkg.alchemyviewer.org/repository/autobuild/simple --extra-index-url https://pypi.org/simple
  script:
    - |
-        autobuild configure -c ReleaseOS -- -DUSE_FMODSTUDIO=ON -DUSE_NVAPI=ON -DUSE_LTO=ON -DUNIX_DISABLE_FATAL_WARNINGS=ON -DREVISION_FROM_VCS=FALSE
+        autobuild configure -c ReleaseOS -- -DUSE_FMODSTUDIO=ON -DUSE_NVAPI=ON -DUSE_LTO=ON -DDISABLE_FATAL_WARNINGS=ON -DREVISION_FROM_VCS=FALSE
        autobuild build -c ReleaseOS --no-configure
  artifacts:
    name: "$env:CI_COMMIT_REF_NAME-$env:CI_COMMIT_SHORT_SHA"
@@ -93,6 +122,14 @@ variables:
    key:
      prefix: windows64

+.mac64_build:
+  extends: .mac_build
+  variables:
+    AUTOBUILD_ADDRSIZE: 64
+  cache:
+    key:
+      prefix: darwin64
+
 .linux32_build:
  extends: .linux_build
  variables:
@@ -148,6 +185,11 @@ build:master:linux64:
    - .linux64_build 
    - .master_rules

+build:master:mac64:
+  extends: 
+    - .mac64_build
+    - .master_rules
+
 .build:master:windows32:
  extends: 
    - .win32_build
@@ -163,6 +205,11 @@ build:project:linux64:
    - .linux64_build
    - .project_rules

+build:project:mac64:
+  extends: 
+    - .mac64_build
+    - .project_rules
+
 .build:project:windows64:
  extends: 
    - .win32_build
@@ -178,6 +225,11 @@ build:beta:linux64:
    - .linux64_build
    - .beta_rules

+build:beta:mac64:
+  extends: 
+    - .mac64_build
+    - .beta_rules
+
 .build:beta:windows32:
  extends: 
    - .win32_build
@@ -193,6 +245,11 @@ build:release:linux64:
    - .linux64_build
    - .release_rules

+build:release:mac64:
+  extends: 
+    - .mac64_build
+    - .release_rules
+
 .build:release:windows32:
  extends: 
    - .win32_build
@@ -228,6 +285,11 @@ build:release:windows64:
          Invoke-WebRequest @UploadParams -InFile .\$FileNameLnx64 -Uri "${UploadDestURL}/${FileNameLnx64}"
        Pop-Location

+        Push-Location .\build-darwin-64\newview\
+          $FileNameMac64 = Get-ChildItem -Path . -Name -Include Alchemy_*.dmg
+          Invoke-WebRequest @UploadParams -InFile .\$FileNameMac64 -Uri "${UploadDestURL}/${FileNameMac64}"
+        Pop-Location
+
        Push-Location .\build-vc-64\newview\Release\
          $FileNameWin64 = Get-ChildItem -Path . -Name -Include Alchemy_*_Setup.exe
          Invoke-WebRequest @UploadParams -InFile .\$FileNameWin64 -Uri "${UploadDestURL}/${FileNameWin64}"

--- a/autobuild.xml
+++ b/autobuild.xml
--- a/indra/CMakeLists.txt
+++ b/indra/CMakeLists.txt
@@ -13,10 +13,8 @@ project(${ROOT_PROJECT_NAME})

 set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")

-set(CMAKE_C_STANDARD 17)
+set(CMAKE_C_STANDARD 11)
 set(CMAKE_CXX_STANDARD 17)
-set(CMAKE_CXX_STANDARD_REQUIRED ON)
-set(CMAKE_CXX_VISIBILITY_PRESET hidden)

 set_property(GLOBAL PROPERTY USE_FOLDERS ON)


--- a/indra/cmake/00-Common.cmake
+++ b/indra/cmake/00-Common.cmake
@@ -52,6 +52,9 @@ if((USE_SSE41 AND USE_AVX) OR (USE_SSE41 AND USE_AVX AND USE_AVX2) OR (USE_AVX A
  message(FATAL_ERROR "Usage of multiple SIMD flags is unsupported")
 endif()

+# Warnings
+option(DISABLE_FATAL_WARNINGS "Disable warnings as errors" ON)
+
 # Platform-specific compilation flags.
 if (WINDOWS)
  # Don't build DLLs.
@@ -167,9 +170,9 @@ if (WINDOWS)
      set(GLOBAL_CXX_FLAGS "${GLOBAL_CXX_FLAGS} /favor:INTEL64")
  endif()

-  if (NOT VS_DISABLE_FATAL_WARNINGS)
+  if (NOT DISABLE_FATAL_WARNINGS)
    set(GLOBAL_CXX_FLAGS "${GLOBAL_CXX_FLAGS} /WX")
-  endif (NOT VS_DISABLE_FATAL_WARNINGS)
+  endif (NOT DISABLE_FATAL_WARNINGS)

  set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${GLOBAL_CXX_FLAGS}" CACHE STRING "C++ compiler debug options" FORCE)
  set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} ${GLOBAL_CXX_FLAGS}" CACHE STRING "C++ compiler release-with-debug options" FORCE)
@@ -191,12 +194,9 @@ if (WINDOWS)

  # library linkage defines
  add_definitions(
-      /DBOOST_ALL_DYN_LINK
-      /DDLL_IMPORT
-      /DDOM_DYNAMIC
-      /DPNG_USE_DLL
-      /DWEBP_DLL
-      /DZLIB_DLL
+      /DCURL_STATICLIB=1
+      /DURI_STATIC_BUILD=1
+      /DLIBXML_STATIC=1
  )

  # configure win32 API for 7 and above compatibility
@@ -276,30 +276,28 @@ endif (LINUX)


 if (DARWIN)
-  # Warnings should be fatal -- thanks, Nicky Perian, for spotting reversed default
-  set(CLANG_DISABLE_FATAL_WARNINGS OFF)
  add_definitions(-DLL_DARWIN=1 -DGL_SILENCE_DEPRECATION)
  set(CMAKE_CXX_LINK_FLAGS "-Wl,-headerpad_max_install_names,-search_paths_first")
  set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_CXX_LINK_FLAGS}")
-  set(DARWIN_extra_cstar_flags "-gdwarf-2 -Wno-unused-local-typedef")
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${DARWIN_extra_cstar_flags}")
-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}  ${DARWIN_extra_cstar_flags}")
+  set(DARWIN_extra_cstar_flags "-gdwarf-2")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3 ${DARWIN_extra_cstar_flags}")
+  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O3 ${DARWIN_extra_cstar_flags}")
  # NOTE: it's critical that the optimization flag is put in front.
  # NOTE: it's critical to have both CXX_FLAGS and C_FLAGS covered.

-  add_definitions(-D_LIBCPP_ENABLE_CXX17_REMOVED_AUTO_PTR=1)
+  add_definitions(
+      -D_LIBCPP_ENABLE_CXX17_REMOVED_AUTO_PTR=1
+      -DBOOST_CONFIG_SUPPRESS_OUTDATED_MESSAGE=1
+      -DBOOST_ALLOW_DEPRECATED_HEADERS=1
+      )
 endif (DARWIN)


 if (LINUX OR DARWIN)
-  if (CMAKE_CXX_COMPILER MATCHES ".*clang")
-    set(CMAKE_COMPILER_IS_CLANGXX 1)
-  endif (CMAKE_CXX_COMPILER MATCHES ".*clang")
-
-  if (CMAKE_COMPILER_IS_GNUCXX)
+  if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
    set(GCC_WARNINGS "-Wall -Wno-sign-compare -Wno-unused-parameter -Wno-unused-but-set-parameter -Wno-ignored-qualifiers -Wno-unused-function -Wnon-virtual-dtor")
-  elseif (CMAKE_COMPILER_IS_CLANGXX)
-    set(GCC_WARNINGS "-Wall -Wno-sign-compare -Wno-trigraphs")
+  elseif (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
+    set(GCC_WARNINGS "-Wall -Wno-sign-compare -Wno-trigraphs -Wno-unused-local-typedef -Wno-unknown-warning-option")
  endif()

  CHECK_CXX_COMPILER_FLAG(-Wdeprecated-copy HAS_DEPRECATED_COPY)
@@ -307,9 +305,9 @@ if (LINUX OR DARWIN)
    set(GCC_WARNINGS "${GCC_WARNINGS} -Wno-deprecated-copy")
  endif()

-  if (NOT GCC_DISABLE_FATAL_WARNINGS)
-  #  set(GCC_WARNINGS "${GCC_WARNINGS} -Werror")
-  endif (NOT GCC_DISABLE_FATAL_WARNINGS)
+  if (NOT DISABLE_FATAL_WARNINGS)
+    set(GCC_WARNINGS "${GCC_WARNINGS} -Werror")
+  endif (NOT DISABLE_FATAL_WARNINGS)

  set(GCC_CXX_WARNINGS "${GCC_WARNINGS} -Wno-reorder")


--- a/indra/cmake/Boost.cmake
+++ b/indra/cmake/Boost.cmake
@@ -24,60 +24,33 @@ else (USESYSTEMLIBS)
  set(addrsfx "-x${ADDRESS_SIZE}")

  if (WINDOWS)
-    if(MSVC80)
-      # This should be obsolete at this point
-      set(BOOST_VERSION "1.74")
-      set(BOOST_CONTEXT_LIBRARY 
-          optimized libboost_context-vc80-mt-${BOOST_VERSION}
-          debug libboost_context-vc80-mt-gd-${BOOST_VERSION})
-      set(BOOST_FILESYSTEM_LIBRARY 
-          optimized libboost_filesystem-vc80-mt-${BOOST_VERSION}
-          debug libboost_filesystem-vc80-mt-gd-${BOOST_VERSION})
-      set(BOOST_PROGRAM_OPTIONS_LIBRARY 
-          optimized libboost_program_options-vc80-mt-${BOOST_VERSION}
-          debug libboost_program_options-vc80-mt-gd-${BOOST_VERSION})
-      set(BOOST_REGEX_LIBRARY
-          optimized libboost_regex-vc80-mt-${BOOST_VERSION}
-          debug libboost_regex-vc80-mt-gd-${BOOST_VERSION})
-      set(BOOST_SIGNALS_LIBRARY 
-          optimized libboost_signals-vc80-mt-${BOOST_VERSION}
-          debug libboost_signals-vc80-mt-gd-${BOOST_VERSION})
-      set(BOOST_SYSTEM_LIBRARY 
-          optimized libboost_system-vc80-mt-${BOOST_VERSION}
-          debug libboost_system-vc80-mt-gd-${BOOST_VERSION})
-      set(BOOST_THREAD_LIBRARY 
-          optimized libboost_thread-vc80-mt-${BOOST_VERSION}
-          debug libboost_thread-vc80-mt-gd-${BOOST_VERSION})
-    else(MSVC80)
-      # MSVC 10.0 config
-      set(BOOST_CONTEXT_LIBRARY 
-          optimized boost_context-mt${addrsfx}
-          debug boost_context-mt-gd${addrsfx})
-      set(BOOST_FIBER_LIBRARY 
-          optimized boost_fiber-mt${addrsfx}
-          debug boost_fiber-mt-gd${addrsfx})
-      set(BOOST_FILESYSTEM_LIBRARY 
-          optimized boost_filesystem-mt${addrsfx}
-          debug boost_filesystem-mt-gd${addrsfx})
-      set(BOOST_PROGRAM_OPTIONS_LIBRARY 
-          optimized boost_program_options-mt${addrsfx}
-          debug boost_program_options-mt-gd${addrsfx})
-      set(BOOST_REGEX_LIBRARY
-          optimized boost_regex-mt${addrsfx}
-          debug boost_regex-mt-gd${addrsfx})
-      set(BOOST_SIGNALS_LIBRARY 
-          optimized boost_signals-mt${addrsfx}
-          debug boost_signals-mt-gd${addrsfx})
-      set(BOOST_STACKTRACE_LIBRARY 
-          optimized boost_stacktrace_windbg-mt${addrsfx}
-          debug boost_stacktrace_windbg-mt-gd${addrsfx})
-      set(BOOST_SYSTEM_LIBRARY 
-          optimized boost_system-mt${addrsfx}
-          debug boost_system-mt-gd${addrsfx})
-      set(BOOST_THREAD_LIBRARY 
-          optimized boost_thread-mt${addrsfx}
-          debug boost_thread-mt-gd${addrsfx})
-    endif (MSVC80)
+    set(BOOST_CONTEXT_LIBRARY 
+        optimized libboost_context-mt${addrsfx}
+        debug libboost_context-mt-gd${addrsfx})
+    set(BOOST_FIBER_LIBRARY 
+        optimized libboost_fiber-mt${addrsfx}
+        debug libboost_fiber-mt-gd${addrsfx})
+    set(BOOST_FILESYSTEM_LIBRARY 
+        optimized libboost_filesystem-mt${addrsfx}
+        debug libboost_filesystem-mt-gd${addrsfx})
+    set(BOOST_PROGRAM_OPTIONS_LIBRARY 
+        optimized libboost_program_options-mt${addrsfx}
+        debug libboost_program_options-mt-gd${addrsfx})
+    set(BOOST_REGEX_LIBRARY
+        optimized libboost_regex-mt${addrsfx}
+        debug libboost_regex-mt-gd${addrsfx})
+    set(BOOST_SIGNALS_LIBRARY 
+        optimized libboost_signals-mt${addrsfx}
+        debug libboost_signals-mt-gd${addrsfx})
+    set(BOOST_STACKTRACE_LIBRARY 
+        optimized libboost_stacktrace_windbg-mt${addrsfx}
+        debug libboost_stacktrace_windbg-mt-gd${addrsfx})
+    set(BOOST_SYSTEM_LIBRARY 
+        optimized libboost_system-mt${addrsfx}
+        debug libboost_system-mt-gd${addrsfx})
+    set(BOOST_THREAD_LIBRARY 
+        optimized libboost_thread-mt${addrsfx}
+        debug libboost_thread-mt-gd${addrsfx})
  elseif (LINUX)
    set(BOOST_CONTEXT_LIBRARY
        optimized boost_context-mt${addrsfx}

--- a/indra/cmake/CEFPlugin.cmake
+++ b/indra/cmake/CEFPlugin.cmake
@@ -24,16 +24,10 @@ elseif (DARWIN)
        message(FATAL_ERROR "AppKit not found")
    endif()

-    FIND_LIBRARY(CEF_LIBRARY "Chromium Embedded Framework" ${ARCH_PREBUILT_DIRS_RELEASE})
-    if (NOT CEF_LIBRARY)
-        message(FATAL_ERROR "CEF not found")
-    endif()
-
    set(CEF_PLUGIN_LIBRARIES
        ${ARCH_PREBUILT_DIRS_RELEASE}/libcef_dll_wrapper.a
        ${ARCH_PREBUILT_DIRS_RELEASE}/libdullahan.a
        ${APPKIT_LIBRARY}
-        ${CEF_LIBRARY}
       )

 elseif (LINUX)

--- a/indra/cmake/CURL.cmake
+++ b/indra/cmake/CURL.cmake
@@ -10,7 +10,7 @@ else (USESYSTEMLIBS)
  use_prebuilt_binary(curl)
  if (WINDOWS)
    set(CURL_LIBRARIES 
-    debug libcurl_debug.lib
+    debug libcurld.lib
    optimized libcurl.lib)
  else (WINDOWS)
    set(CURL_LIBRARIES libcurl.a)

--- a/indra/cmake/Copy3rdPartyLibs.cmake
+++ b/indra/cmake/Copy3rdPartyLibs.cmake
@@ -54,38 +54,18 @@ if(WINDOWS)

    set(release_src_dir "${ARCH_PREBUILT_DIRS_RELEASE}")
    set(release_files
-        boost_context-mt${addrsfx}.dll
-        boost_fiber-mt${addrsfx}.dll
-        boost_filesystem-mt${addrsfx}.dll
-        boost_program_options-mt${addrsfx}.dll
-        boost_regex-mt${addrsfx}.dll
-        boost_stacktrace_windbg-mt${addrsfx}.dll
-        boost_thread-mt${addrsfx}.dll
        epoxy-0.dll
        ${EXPAT_COPY}
-        freetype.dll
        glod.dll
-        jpeg8.dll
        libapr-1.dll
        libaprutil-1.dll
        libapriconv-1.dll
-        libcollada14dom23.dll
-        libcurl.dll
-        libeay32.dll
        libhunspell.dll
        libogg.dll
-        libpng16.dll
        libvorbis.dll
        libvorbisfile.dll
-        libwebp.dll
-        libxml2.dll
-        minizip.dll
-        nghttp2.dll
        openjp2.dll
-        ssleay32.dll
-        uriparser.dll
        xmlrpc-epi.dll
-        zlib1.dll
        )

    # Filenames are different for 32/64 bit BugSplat file and we don't
@@ -139,12 +119,6 @@ elseif(DARWIN)
        libGLOD.dylib
        libhunspell-1.7.0.dylib
        libndofdev.dylib
-        libnghttp2.dylib
-        libnghttp2.14.dylib
-        libnghttp2.14.19.0.dylib
-        liburiparser.dylib
-        liburiparser.1.dylib
-        liburiparser.1.0.27.dylib
        libxmlrpc-epi.dylib
        libxmlrpc-epi.0.dylib
       )

--- a/indra/cmake/LLPrimitive.cmake
+++ b/indra/cmake/LLPrimitive.cmake
@@ -4,9 +4,11 @@
 include(Prebuilt)
 include(Boost)
 include(URIPARSER)
+include(ZLIB)

 use_prebuilt_binary(colladadom)
 use_prebuilt_binary(libxml2)
+use_prebuilt_binary(minizip-ng)

 set(LLPRIMITIVE_INCLUDE_DIRS
    ${LIBS_OPEN_DIR}/llprimitive
@@ -15,30 +17,39 @@ if (WINDOWS)
    set(LLPRIMITIVE_LIBRARIES 
        debug llprimitive
        optimized llprimitive
-        debug libcollada14dom23-d
-        optimized libcollada14dom23
+        debug libcollada14dom23-sd
+        optimized libcollada14dom23-s
+        ${BOOST_FILESYSTEM_LIBRARY}
        ${BOOST_SYSTEM_LIBRARIES}
+        libxml2_a
+        ${URIPARSER_LIBRARIES}
+        ${MINIZIP_LIBRARIES}
+        ${ZLIB_LIBRARIES}
        )
 elseif (DARWIN)
-    use_prebuilt_binary(pcre)
    set(LLPRIMITIVE_LIBRARIES 
        llprimitive
        debug collada14dom-d
        optimized collada14dom
-        minizip
+        ${BOOST_FILESYSTEM_LIBRARY}
+        ${BOOST_SYSTEM_LIBRARIES}
        xml2
-        pcrecpp
-        pcre
        iconv           # Required by libxml2
+        ${URIPARSER_LIBRARIES}
+        ${MINIZIP_LIBRARIES}
+        ${ZLIB_LIBRARIES}
        )
 elseif (LINUX)
    set(LLPRIMITIVE_LIBRARIES 
        llprimitive
        debug collada14dom-d
        optimized collada14dom
-        minizip
+        ${BOOST_FILESYSTEM_LIBRARY}
+        ${BOOST_SYSTEM_LIBRARIES}
        xml2
        ${URIPARSER_LIBRARIES}
+        ${MINIZIP_LIBRARIES}
+        ${ZLIB_LIBRARIES}
        )
 endif (WINDOWS)

--- a/indra/cmake/LLSharedLibs.cmake
+++ b/indra/cmake/LLSharedLibs.cmake
@@ -72,12 +72,4 @@ macro(ll_stage_sharedlib DSO_TARGET)
          COMMENT "Copying llcommon to the staging folder."
        )
    endif(NOT WINDOWS)
-
-  if (DARWIN)
-    set_target_properties(${DSO_TARGET} PROPERTIES
-      BUILD_WITH_INSTALL_NAME_DIR 1
-      INSTALL_NAME_DIR "@executable_path/../Frameworks"
-      )
-  endif(DARWIN)
-
 endmacro(ll_stage_sharedlib)
--- a/indra/cmake/NGHTTP2.cmake
+++ b/indra/cmake/NGHTTP2.cmake
@@ -12,7 +12,7 @@ else (USESYSTEMLIBS)
      ${ARCH_PREBUILT_DIRS_RELEASE}/nghttp2.lib
      )
  elseif (DARWIN)
-    set(NGHTTP2_LIBRARIES libnghttp2.dylib)
+    set(NGHTTP2_LIBRARIES libnghttp2.a)
  else (WINDOWS)
    set(NGHTTP2_LIBRARIES libnghttp2.a)
  endif (WINDOWS)

--- a/indra/cmake/Variables.cmake
+++ b/indra/cmake/Variables.cmake
@@ -150,6 +150,7 @@ endif (${CMAKE_SYSTEM_NAME} MATCHES "Linux")

 if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
  set(DARWIN 1)
+  set(CMAKE_MACOSX_RPATH TRUE)

  # Xcode setup
  if (XCODE_VERSION LESS 12.0.0)
@@ -158,31 +159,39 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
  message( "Building with " ${CMAKE_OSX_SYSROOT} )
  set(CMAKE_OSX_DEPLOYMENT_TARGET 10.13)

-
-  set(CMAKE_XCODE_ATTRIBUTE_GCC_OPTIMIZATION_LEVEL fast)
-  set(CMAKE_XCODE_ATTRIBUTE_GCC_FAST_MATH YES)
+  set(CMAKE_XCODE_ATTRIBUTE_GCC_OPTIMIZATION_LEVEL 3)
+  set(CMAKE_XCODE_ATTRIBUTE_GCC_FAST_MATH NO)
  set(CMAKE_XCODE_ATTRIBUTE_GCC_STRICT_ALIASING NO)
  set(CMAKE_XCODE_ATTRIBUTE_GCC_SYMBOLS_PRIVATE_EXTERN YES)
+  if(USE_LTO)
+    set(CMAKE_XCODE_ATTRIBUTE_LLVM_LTO YES_THIN)
+  endif()

  set(CMAKE_XCODE_ATTRIBUTE_GCC_GENERATE_DEBUGGING_SYMBOLS YES)
  set(CMAKE_XCODE_ATTRIBUTE_DEBUG_INFORMATION_FORMAT dwarf-with-dsym)
  set(CMAKE_XCODE_ATTRIBUTE_DEAD_CODE_STRIPPING YES)

  set(CMAKE_XCODE_ATTRIBUTE_CLANG_X86_VECTOR_INSTRUCTIONS sse4.2)
+
  # C++ specifics
  set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LANGUAGE_STANDARD "c++17")
  set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LIBRARY "libc++")

+  # Obj-C
+  set(CMAKE_XCODE_ATTRIBUTE_CLANG_ENABLE_OBJC_WEAK YES)
+
  # Disable codesigning, for now it's handled with snake
  set(CMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED NO)
  set(CMAKE_XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY "")
  set(CMAKE_XCODE_ATTRIBUTE_CODE_SIGN_ENTITLEMENTS "")

-  set(CMAKE_XCODE_ATTRIBUTE_GCC_WARN_NON_VIRTUAL_DESTRUCTOR YES)
-  set(CMAKE_XCODE_ATTRIBUTE_GCC_WARN_HIDDEN_VIRTUAL_FUNCTIONS YES)
-  set(CMAKE_XCODE_ATTRIBUTE_CLANG_WARN_SUSPICIOUS_MOVE YES)
  set(CMAKE_XCODE_ATTRIBUTE_CLANG_WARN_RANGE_LOOP_ANALYSIS YES)
-
+  set(CMAKE_XCODE_ATTRIBUTE_CLANG_WARN_STRICT_PROTOTYPES YES)
+  set(CMAKE_XCODE_ATTRIBUTE_CLANG_WARN_SUSPICIOUS_MOVE YES)
+  set(CMAKE_XCODE_ATTRIBUTE_GCC_WARN_HIDDEN_VIRTUAL_FUNCTIONS YES)
+  set(CMAKE_XCODE_ATTRIBUTE_GCC_WARN_NON_VIRTUAL_DESTRUCTOR YES)
+  set(CMAKE_XCODE_ATTRIBUTE_GCC_WARN_UNINITIALIZED_AUTOS YES)
+  
  set(ADDRESS_SIZE 64)
  set(ARCH x86_64)
  set(CMAKE_OSX_ARCHITECTURES x86_64)

--- a/indra/cmake/WebP.cmake
+++ b/indra/cmake/WebP.cmake
@@ -10,8 +10,8 @@ else (USESYSTEMLIBS)
  use_prebuilt_binary(libwebp)
  if (WINDOWS)
    set(WEBP_LIBRARIES 
-        debug libwebp_debug_dll
-        optimized libwebp_dll
+        debug libwebp_debug
+        optimized libwebp
        )
    set(WEBP_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/webp)
  elseif(DARWIN)

--- a/indra/cmake/ZLIB.cmake
+++ b/indra/cmake/ZLIB.cmake
@@ -8,16 +8,18 @@ include(Prebuilt)
 if (USESYSTEMLIBS)
  include(FindZLIB)
 else (USESYSTEMLIBS)
-  use_prebuilt_binary(zlib)
+  use_prebuilt_binary(zlib-ng)
+  use_prebuilt_binary(minizip-ng)
  if (WINDOWS)
    set(MINIZIP_LIBRARIES 
-      debug minizipd
-      optimized minizip)
+      debug libminizip
+      optimized libminizip)

    set(ZLIB_LIBRARIES 
      debug zlibd
      optimized zlib)
  elseif (LINUX)
+    set(MINIZIP_LIBRARIES minizip)
    #
    # When we have updated static libraries in competition with older
    # shared libraries and we want the former to win, we need to do some
@@ -33,7 +35,8 @@ else (USESYSTEMLIBS)
    set(ZLIB_PRELOAD_ARCHIVES -Wl,--whole-archive z -Wl,--no-whole-archive)
    set(ZLIB_LIBRARIES z)
  elseif (DARWIN)
-    set(ZLIB_LIBRARIES z)
+    set(MINIZIP_LIBRARIES minizip)
+    set(ZLIB_LIBRARIES -Wl,-force_load,${ARCH_PREBUILT_DIRS_RELEASE}/libz.a)
  endif (WINDOWS)
  set(ZLIB_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/zlib)
 endif (USESYSTEMLIBS)
--- a/indra/deps/CMakeLists.txt
+++ b/indra/deps/CMakeLists.txt
@@ -52,7 +52,7 @@ FetchContent_Declare(
 FetchContent_Declare(
  absl
  GIT_REPOSITORY https://git.alchemyviewer.org/alchemy/mirrors/abseil-cpp.git
-  GIT_TAG        3b4a16abad2c2ddc494371cc39a2946e36d35d11
+  GIT_TAG        079cf662544a14bd1cfaae6d6512645541ba10fb
  )

 # This is a hack because absl has dumb cmake
@@ -84,6 +84,7 @@ endif()

 # #Download the rest of the libraries
 # FetchContent_MakeAvailable(fmt)
+set(MESHOPT_BUILD_SHARED_LIBS OFF)
 FetchContent_MakeAvailable(meshoptimizer)

 # # Typically you don't care so much for a third party library's tests to be

--- a/indra/llappearance/llavatarappearance.cpp
+++ b/indra/llappearance/llavatarappearance.cpp
@@ -559,7 +559,7 @@ void LLAvatarAppearance::computeBodySize()
 	{
 		mBodySize = new_body_size;

-#if SHOW_DEBUG
+#ifdef SHOW_DEBUG
        compareJointStateMaps(mLastBodySizeState, mCurrBodySizeState);
 #endif
 	}
@@ -613,7 +613,7 @@ BOOL LLAvatarAppearance::setupBone(const LLAvatarBoneInfo* info, LLJoint* parent
 {
 	LLJoint* joint = NULL;

-#if SHOW_DEBUG
+#ifdef SHOW_DEBUG
    LL_DEBUGS("BVH") << "bone info: name " << info->mName
                     << " isJoint " << info->mIsJoint
                     << " volume_num " << volume_num

--- a/indra/llappearance/llavatarjointmesh.cpp
+++ b/indra/llappearance/llavatarjointmesh.cpp
@@ -53,7 +53,7 @@ LLAvatarJoint *getBaseSkeletonAncestor(LLAvatarJoint* joint)
    LLJoint *ancestor = joint->getParent();
    while (ancestor->getParent() && (ancestor->getSupport() != LLJoint::SUPPORT_BASE))
    {
-#if SHOW_DEBUG
+#ifdef SHOW_DEBUG
        LL_DEBUGS("Avatar") << "skipping non-base ancestor " << ancestor->getName() << LL_ENDL;
 #endif
        ancestor = ancestor->getParent();
@@ -331,7 +331,7 @@ void LLAvatarJointMesh::setMesh( LLPolyMesh *mesh )
 	if (!mMesh->isLOD())
 	{
 		setupJoint((LLAvatarJoint*)getRoot());
-#if SHOW_DEBUG
+#ifdef SHOW_DEBUG
        LL_DEBUGS("Avatar") << getName() << " joint render entries: " << mMesh->mJointRenderData.size() << LL_ENDL;
 #endif
 	}
@@ -355,7 +355,7 @@ void LLAvatarJointMesh::setupJoint(LLAvatarJoint* current_joint)
 		}

 		// we've found a skinjoint for this joint..
-#if SHOW_DEBUG
+#ifdef SHOW_DEBUG
        LL_DEBUGS("Avatar") << "Mesh: " << getName() << " joint " << current_joint->getName() << " matches skinjoint " << sj << LL_ENDL;
 #endif

@@ -372,7 +372,7 @@ void LLAvatarJointMesh::setupJoint(LLAvatarJoint* current_joint)
 			// ...then just add ourselves
 			LLAvatarJoint* jointp = js.mJoint;
 			jrd.push_back(new LLJointRenderData(&jointp->getWorldMatrix(), &js));
-#if SHOW_DEBUG
+#ifdef SHOW_DEBUG
 			LL_DEBUGS("Avatar") << "add joint[" << (jrd.size()-1) << "] = " << js.mJoint->getName() << LL_ENDL;
 #endif
 		}
@@ -380,11 +380,11 @@ void LLAvatarJointMesh::setupJoint(LLAvatarJoint* current_joint)
 		else
 		{
 			jrd.push_back(new LLJointRenderData(&ancestor->getWorldMatrix(), NULL));
-#if SHOW_DEBUG
+#ifdef SHOW_DEBUG
 			LL_DEBUGS("Avatar") << "add2 ancestor joint[" << (jrd.size()-1) << "] = " << ancestor->getName() << LL_ENDL;
 #endif
 			jrd.push_back(new LLJointRenderData(&current_joint->getWorldMatrix(), &js));
-#if SHOW_DEBUG
+#ifdef SHOW_DEBUG
            LL_DEBUGS("Avatar") << "add2 joint[" << (jrd.size()-1) << "] = " << current_joint->getName() << LL_ENDL;
 #endif
 		}

--- a/indra/llappearance/llwearabletype.cpp
+++ b/indra/llappearance/llwearabletype.cpp
@@ -65,7 +65,7 @@ class LLWearableDictionary final : public LLParamSingleton<LLWearableDictionary>
 // [RLVa:KB] - Checked: 2010-03-03 (RLVa-1.2.0a) | Added: RLVa-1.2.0a
 protected:
 	// The default implementation asserts on 'notFound()' and returns -1 which isn't a valid EWearableType
-	virtual LLWearableType::EType notFound() const { return LLWearableType::WT_INVALID; }
+	virtual LLWearableType::EType notFound() const override { return LLWearableType::WT_INVALID; }
 // [/RLVa:KB]
 };


--- a/indra/llappearance/llwearabletype.h
+++ b/indra/llappearance/llwearabletype.h
@@ -37,7 +37,7 @@ class LLWearableType final : public LLParamSingleton<LLWearableType>
 {
 	LLSINGLETON(LLWearableType, LLTranslationBridge* trans);
 	~LLWearableType();
-	void initSingleton();
+	void initSingleton() override;
 	friend struct WearableEntry;
 public: 
 	enum EType

--- a/indra/llcharacter/lljoint.cpp
+++ b/indra/llcharacter/lljoint.cpp
@@ -443,7 +443,7 @@ void LLJoint::addAttachmentPosOverride( const LLVector3& pos, const LLUUID& mesh
    bool has_active_override_before = hasAttachmentPosOverride( before_pos, before_mesh_id );
 	if (!m_attachmentPosOverrides.count())
 	{
-#if SHOW_DEBUG
+#ifdef SHOW_DEBUG
 		if (do_debug_joint(getName()))
 		{
 			LL_DEBUGS("Avatar") << "av " << av_info << " joint " << getName() << " saving m_posBeforeOverrides " << getPosition() << LL_ENDL;
@@ -458,7 +458,7 @@ void LLJoint::addAttachmentPosOverride( const LLVector3& pos, const LLUUID& mesh
    if (!has_active_override_before || (after_pos != before_pos))
    {
        active_override_changed = true; 
-#if SHOW_DEBUG
+#ifdef SHOW_DEBUG
        if (do_debug_joint(getName()))
        {
            LL_DEBUGS("Avatar") << "av " << av_info << " joint " << getName() << " addAttachmentPosOverride for mesh " << mesh_id << " pos " << pos << LL_ENDL;
@@ -489,7 +489,7 @@ void LLJoint::removeAttachmentPosOverride( const LLUUID& mesh_id, const std::str
        if (!has_active_override_after || (after_pos != before_pos))
        {
            active_override_changed = true;
-#if SHOW_DEBUG
+#ifdef SHOW_DEBUG
            if (do_debug_joint(getName()))
            {
                LL_DEBUGS("Avatar") << "av " << av_info << " joint " << getName()
@@ -602,7 +602,7 @@ void LLJoint::updatePos(const std::string& av_info)
 	LLUUID mesh_id;
 	if (m_attachmentPosOverrides.findActiveOverride(mesh_id,found_pos))
 	{
-#if SHOW_DEBUG
+#ifdef SHOW_DEBUG
        if (do_debug_joint(getName()))
        {
            LL_DEBUGS("Avatar") << "av " << av_info << " joint " << getName() << " updatePos, winner of " << m_attachmentPosOverrides.count() << " is mesh " << mesh_id << " pos " << found_pos << LL_ENDL;
@@ -612,7 +612,7 @@ void LLJoint::updatePos(const std::string& av_info)
 	}
 	else
 	{
-#if SHOW_DEBUG
+#ifdef SHOW_DEBUG
        if (do_debug_joint(getName()))
        {
            LL_DEBUGS("Avatar") << "av " << av_info << " joint " << getName() << " updatePos, winner is posBeforeOverrides " << m_posBeforeOverrides << LL_ENDL;
@@ -632,7 +632,7 @@ void LLJoint::updateScale(const std::string& av_info)
 	LLUUID mesh_id;
 	if (m_attachmentScaleOverrides.findActiveOverride(mesh_id,found_scale))
 	{
-#if SHOW_DEBUG
+#ifdef SHOW_DEBUG
        if (do_debug_joint(getName()))
        {
            LL_DEBUGS("Avatar") << "av " << av_info << " joint " << getName() << " updateScale, winner of " << m_attachmentScaleOverrides.count() << " is mesh " << mesh_id << " scale " << found_scale << LL_ENDL;
@@ -642,7 +642,7 @@ void LLJoint::updateScale(const std::string& av_info)
 	}
 	else
 	{
-#if SHOW_DEBUG
+#ifdef SHOW_DEBUG
        if (do_debug_joint(getName()))
        {
            LL_DEBUGS("Avatar") << "av " << av_info << " joint " << getName() << " updateScale, winner is scaleBeforeOverrides " << m_scaleBeforeOverrides << LL_ENDL;
@@ -664,7 +664,7 @@ void LLJoint::addAttachmentScaleOverride( const LLVector3& scale, const LLUUID&
 	}
 	if (!m_attachmentScaleOverrides.count())
 	{
-#if SHOW_DEBUG
+#ifdef SHOW_DEBUG
 		if (do_debug_joint(getName()))
 		{
 			LL_DEBUGS("Avatar") << "av " << av_info << " joint " << getName() << " saving m_scaleBeforeOverrides " << getScale() << LL_ENDL;
@@ -673,7 +673,7 @@ void LLJoint::addAttachmentScaleOverride( const LLVector3& scale, const LLUUID&
 		m_scaleBeforeOverrides = getScale();
 	}
 	m_attachmentScaleOverrides.add(mesh_id,scale);
-#if SHOW_DEBUG
+#ifdef SHOW_DEBUG
 	if (do_debug_joint(getName()))
 	{
 		LL_DEBUGS("Avatar") << "av " << av_info << " joint " << getName() << " addAttachmentScaleOverride for mesh " << mesh_id << " scale " << scale << LL_ENDL;
@@ -693,7 +693,7 @@ void LLJoint::removeAttachmentScaleOverride( const LLUUID& mesh_id, const std::s
 	}
 	if (m_attachmentScaleOverrides.remove(mesh_id))
 	{
-#if SHOW_DEBUG
+#ifdef SHOW_DEBUG
 		if (do_debug_joint(getName()))
 		{
 			LL_DEBUGS("Avatar") << "av " << av_info << " joint " << getName()
No results found