Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Update various dependencies and move them to github #42

Merged
merged 1 commit into from
Jun 23, 2024
Merged

Update various dependencies and move them to github #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
254 changes: 161 additions & 93 deletions autobuild.xml
View file
Open in desktop

Large diffs are not rendered by default.

24 changes: 8 additions & 16 deletions indra/cmake/Boost.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,22 +39,14 @@ if (WINDOWS)
)
elseif (LINUX)
target_link_libraries( ll::boost INTERFACE
optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libboost_fiber-mt${addrsfx}.a
debug ${ARCH_PREBUILT_DIRS_DEBUG}/libboost_fiber-mt-d${addrsfx}.a
optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libboost_context-mt${addrsfx}.a
debug ${ARCH_PREBUILT_DIRS_DEBUG}/libboost_context-mt-d${addrsfx}.a
optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libboost_filesystem-mt${addrsfx}.a
debug ${ARCH_PREBUILT_DIRS_DEBUG}/libboost_filesystem-mt-d${addrsfx}.a
optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libboost_program_options-mt${addrsfx}.a
debug ${ARCH_PREBUILT_DIRS_DEBUG}/libboost_program_options-mt-d${addrsfx}.a
optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libboost_regex-mt${addrsfx}.a
debug ${ARCH_PREBUILT_DIRS_DEBUG}/libboost_regex-mt-d${addrsfx}.a
optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libboost_thread-mt${addrsfx}.a
debug ${ARCH_PREBUILT_DIRS_DEBUG}/libboost_thread-mt-d${addrsfx}.a
optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libboost_wave-mt${addrsfx}.a
debug ${ARCH_PREBUILT_DIRS_DEBUG}/libboost_wave-mt-d${addrsfx}.a
optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libboost_system-mt${addrsfx}.a
debug ${ARCH_PREBUILT_DIRS_DEBUG}/libboost_system-mt-d${addrsfx}.a
${ARCH_PREBUILT_DIRS}/libboost_fiber-mt${addrsfx}.a
${ARCH_PREBUILT_DIRS}/libboost_context-mt${addrsfx}.a
${ARCH_PREBUILT_DIRS}/libboost_filesystem-mt${addrsfx}.a
${ARCH_PREBUILT_DIRS}/libboost_program_options-mt${addrsfx}.a
${ARCH_PREBUILT_DIRS}/libboost_regex-mt${addrsfx}.a
${ARCH_PREBUILT_DIRS}/libboost_thread-mt${addrsfx}.a
${ARCH_PREBUILT_DIRS}/libboost_wave-mt${addrsfx}.a
${ARCH_PREBUILT_DIRS}/libboost_system-mt${addrsfx}.a
rt
)
elseif (DARWIN)
Expand Down
3 changes: 1 addition & 2 deletions indra/cmake/CURL.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,7 @@ elseif(DARWIN)
)
else ()
target_link_libraries(ll::libcurl INTERFACE
debug ${ARCH_PREBUILT_DIRS_DEBUG}/libcurld.a
optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libcurl.a
${ARCH_PREBUILT_DIRS}/libcurl.a
ll::openssl
ll::nghttp2
ll::zlib-ng
Expand Down
4 changes: 4 additions & 0 deletions indra/cmake/FreeType.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@ if(NOT USE_SYSTEM_FREETYPE)
optimized ${ARCH_PREBUILT_DIRS_RELEASE}/freetype.lib
debug ${ARCH_PREBUILT_DIRS_DEBUG}/harfbuzz.lib
optimized ${ARCH_PREBUILT_DIRS_RELEASE}/harfbuzz.lib)
elseif (LINUX)
target_link_libraries( ll::freetype INTERFACE
${ARCH_PREBUILT_DIRS}/libfreetype.a
${ARCH_PREBUILT_DIRS}/libharfbuzz.a)
else()
target_link_libraries( ll::freetype INTERFACE
debug ${ARCH_PREBUILT_DIRS_DEBUG}/libfreetyped.a
Expand Down
2 changes: 1 addition & 1 deletion indra/cmake/LLPrimitive.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,5 @@ if (WINDOWS)
elseif (DARWIN)
target_link_libraries(ll::colladadom INTERFACE collada14dom ll::boost ll::libxml2 ll::minizip-ng)
elseif (LINUX)
target_link_libraries(ll::colladadom INTERFACE collada14dom ll::boost ll::libxml2 ll::minizip-ng)
target_link_libraries(ll::colladadom INTERFACE ${ARCH_PREBUILT_DIRS}/libcollada14dom.a ll::boost ll::libxml2 ll::minizip-ng)
endif()
3 changes: 1 addition & 2 deletions indra/cmake/LibXML2.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,7 @@ elseif(DARWIN)
target_link_libraries( ll::libxml2 INTERFACE xml2 iconv)
else()
target_link_libraries( ll::libxml2 INTERFACE
debug ${ARCH_PREBUILT_DIRS_DEBUG}/libxml2.a
optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libxml2.a
${ARCH_PREBUILT_DIRS}/libxml2.a
)
endif()

Expand Down
3 changes: 1 addition & 2 deletions indra/cmake/NGHTTP2.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@ if (WINDOWS)
)
elseif (LINUX)
target_link_libraries( ll::nghttp2 INTERFACE
debug ${ARCH_PREBUILT_DIRS_DEBUG}/libnghttp2.a
optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libnghttp2.a
${ARCH_PREBUILT_DIRS}/libnghttp2.a
)
else ()
target_link_libraries( ll::nghttp2 INTERFACE
Expand Down
6 changes: 2 additions & 4 deletions indra/cmake/OpenSSL.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,8 @@ if (WINDOWS)
)
elseif (LINUX)
target_link_libraries(ll::openssl INTERFACE
debug ${ARCH_PREBUILT_DIRS_DEBUG}/libssl.a
optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libssl.a
debug ${ARCH_PREBUILT_DIRS_DEBUG}/libcrypto.a
optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libcrypto.a
${ARCH_PREBUILT_DIRS}/libssl.a
${ARCH_PREBUILT_DIRS}/libcrypto.a
dl
)
else()
Expand Down
3 changes: 1 addition & 2 deletions indra/cmake/PNG.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@ if (WINDOWS)
)
elseif(LINUX)
target_link_libraries(ll::libpng INTERFACE
debug ${ARCH_PREBUILT_DIRS_DEBUG}/libpng16d.a
optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libpng16.a
${ARCH_PREBUILT_DIRS}/libpng16.a
)
else()
target_link_libraries(ll::libpng INTERFACE png16 )
Expand Down
21 changes: 18 additions & 3 deletions indra/cmake/ZLIBNG.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# -*- cmake -*-

include(Prebuilt)
include(ZSTD)

include_guard()
add_library( ll::zlib-ng INTERFACE IMPORTED )
Expand All @@ -15,13 +16,20 @@ if (WINDOWS)
target_link_libraries( ll::zlib-ng INTERFACE
debug ${ARCH_PREBUILT_DIRS_DEBUG}/zlibd.lib
optimized ${ARCH_PREBUILT_DIRS_RELEASE}/zlib.lib)
elseif (LINUX)
target_link_libraries( ll::zlib-ng INTERFACE
${ARCH_PREBUILT_DIRS}/libz.a)
else()
target_link_libraries( ll::zlib-ng INTERFACE
debug ${ARCH_PREBUILT_DIRS_DEBUG}/libz.a
optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libz.a)
endif (WINDOWS)

target_include_directories( ll::zlib-ng SYSTEM INTERFACE ${LIBS_PREBUILT_DIR}/include/zlib)
if(LINUX)
target_include_directories( ll::zlib-ng SYSTEM INTERFACE ${LIBS_PREBUILT_DIR}/include)
else()
target_include_directories( ll::zlib-ng SYSTEM INTERFACE ${LIBS_PREBUILT_DIR}/include/zlib)
endif()

add_library( ll::minizip-ng INTERFACE IMPORTED )

Expand All @@ -33,13 +41,20 @@ endif()
use_prebuilt_binary(minizip-ng)
if (WINDOWS)
target_link_libraries( ll::minizip-ng INTERFACE
debug ${ARCH_PREBUILT_DIRS_DEBUG}/libminizip.lib
optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libminizip.lib
debug ${ARCH_PREBUILT_DIRS_DEBUG}/minizip.lib
optimized ${ARCH_PREBUILT_DIRS_RELEASE}/minizip.lib
ll::zstd
ll::zlib-ng)
elseif (LINUX)
target_link_libraries( ll::minizip-ng INTERFACE
${ARCH_PREBUILT_DIRS}/libminizip.a
ll::zstd
ll::zlib-ng)
else()
target_link_libraries( ll::minizip-ng INTERFACE
debug ${ARCH_PREBUILT_DIRS_DEBUG}/libminizip.a
optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libminizip.a
ll::zstd
ll::zlib-ng)
endif (WINDOWS)

Expand Down
27 changes: 27 additions & 0 deletions indra/cmake/ZSTD.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# -*- cmake -*-

include(Prebuilt)

include_guard()
add_library( ll::zstd INTERFACE IMPORTED )

if(USE_CONAN )
target_link_libraries( ll::zstd INTERFACE CONAN_PKG::zlib )
return()
endif()

use_prebuilt_binary(zstd)
if (WINDOWS)
target_link_libraries( ll::zstd INTERFACE
debug ${ARCH_PREBUILT_DIRS_DEBUG}/zstd_static.lib
optimized ${ARCH_PREBUILT_DIRS_RELEASE}/zstd_static.lib)
elseif (LINUX)
target_link_libraries( ll::zstd INTERFACE
${ARCH_PREBUILT_DIRS}/libzstd.a)
else()
target_link_libraries( ll::zstd INTERFACE
debug ${ARCH_PREBUILT_DIRS_DEBUG}/libzstd.a
optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libzstd.a)
endif (WINDOWS)

target_include_directories( ll::zstd SYSTEM INTERFACE ${LIBS_PREBUILT_DIR}/include)
2 changes: 1 addition & 1 deletion indra/llcommon/llsdserialize.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
#include <boost/iostreams/stream.hpp>
#include <boost/align/aligned_allocator.hpp>

#ifdef LL_USESYSTEMLIBS
#if defined(LL_USESYSTEMLIBS) || defined(LL_LINUX)
# include <zlib.h>
#else
# include "zlib/zlib.h" // for davep's dirty little zip functions
Expand Down
2 changes: 1 addition & 1 deletion indra/llcommon/llsys.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
#include "llsys.h"

#include <iostream>
#ifdef LL_USESYSTEMLIBS
#if defined(LL_USESYSTEMLIBS) || defined(LL_LINUX)
# include <zlib.h>
#else
# include "zlib/zlib.h"
Expand Down
2 changes: 1 addition & 1 deletion indra/llprimitive/llmodel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
#include "llvector4a.h"
#include "hbxxh.h"

#ifdef LL_USESYSTEMLIBS
#if defined(LL_USESYSTEMLIBS) || defined(LL_LINUX)
# include <zlib.h>
#else
# include "zlib/zlib.h"
Expand Down
2 changes: 1 addition & 1 deletion indra/newview/llviewerobjectlist.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
// [SL:KB] - Patch: World-Derender | Checked: 2011-12-15 (Catznip-3.2.1)
#include "llderenderlist.h"
// [/SL:KB]
#ifdef LL_USESYSTEMLIBS
#if defined(LL_USESYSTEMLIBS) || defined(LL_LINUX)
#include <zlib.h>
#else
#include "zlib/zlib.h"
Expand Down
10 changes: 10 additions & 0 deletions indra/newview/viewer_manifest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -932,6 +932,16 @@ def package_finish(self):
self.run_command(['security', 'unlock-keychain',
'-p', keychain_pwd, viewer_keychain])

if self.args['sentry'] == 'ON' or self.args['sentry'] == 'TRUE':
self.run_command(
['codesign',
'--verbose',
'--force',
'--timestamp',
'--keychain', viewer_keychain,
'--sign', identity,
os.path.join(frameworks_path, "Sentry.framework")])

if self.args['openal'] == 'ON' or self.args['openal'] == 'TRUE':
self.run_command(
['codesign',
Expand Down