Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 8 additions & 8 deletions autobuild.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@
<key>archive</key>
<map>
<key>hash</key>
<string>3f2f65cb135cd9d4704371eaf6d973517c372161</string>
<string>f5d20f9e964cb4c927a6616844b9ff044ad0498d</string>
<key>hash_algorithm</key>
<string>sha1</string>
<key>url</key>
<string>https://github.com/secondlife/3p-sdl2/releases/download/v2.30.8-r1/SDL2-2.30.8-darwin64-11540565100.tar.zst</string>
<string>https://github.com/secondlife/3p-sdl2/releases/download/v2.32.0-r1/SDL2-2.32.0-r1-darwin64-13365192785.tar.zst</string>
</map>
<key>name</key>
<string>darwin64</string>
Expand All @@ -40,11 +40,11 @@
<key>archive</key>
<map>
<key>hash</key>
<string>27a431140f6f3f12f00b6a38f741fab43caa7708</string>
<string>456d1896eb3cad66067050a047bdda3e82136477</string>
<key>hash_algorithm</key>
<string>sha1</string>
<key>url</key>
<string>https://github.com/secondlife/3p-sdl2/releases/download/v2.30.8-r1/SDL2-2.30.8-linux64-11540565100.tar.zst</string>
<string>https://github.com/secondlife/3p-sdl2/releases/download/v2.32.0-r1/SDL2-2.32.0-r1-linux64-13365192785.tar.zst</string>
</map>
<key>name</key>
<string>linux64</string>
Expand All @@ -54,11 +54,11 @@
<key>archive</key>
<map>
<key>hash</key>
<string>f3485e4a02a7e8ba899e17cdc9ff0aaad661fcc1</string>
<string>ccf57c04f2b3e2b5dd7f4b118a69b8194756ea83</string>
<key>hash_algorithm</key>
<string>sha1</string>
<key>url</key>
<string>https://github.com/secondlife/3p-sdl2/releases/download/v2.30.8-r1/SDL2-2.30.8-windows64-11540565100.tar.zst</string>
<string>https://github.com/secondlife/3p-sdl2/releases/download/v2.32.0-r1/SDL2-2.32.0-r1-windows64-13365192785.tar.zst</string>
</map>
<key>name</key>
<string>windows64</string>
Expand Down Expand Up @@ -2084,11 +2084,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
<key>archive</key>
<map>
<key>hash</key>
<string>cbbcf3c5341e4ff4f956c0de960dc238faf20d54</string>
<string>836bd3122a98b4e019e1dd00d79df3774b6c3b36</string>
<key>hash_algorithm</key>
<string>sha1</string>
<key>url</key>
<string>https://github.com/secondlife/3p-open-libndofdev/releases/download/v1.14-r4/open_libndofdev-0.14.11545940352-linux64-11545940352.tar.zst</string>
<string>https://github.com/AiraYumi/3p-open-libndofdev/releases/download/v1.14-r100/open_libndofdev-0.14.13381052644-linux64-13381052644.tar.zst</string>
</map>
<key>name</key>
<string>linux64</string>
Expand Down
1 change: 0 additions & 1 deletion indra/cmake/Copy3rdPartyLibs.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,6 @@ elseif(DARWIN)
set(release_files
libndofdev.dylib
libSDL2.dylib
libSDL2-2.0.dylib
)

if(LLCOMMON_LINK_SHARED)
Expand Down
4 changes: 2 additions & 2 deletions indra/newview/viewer_manifest.py
Original file line number Diff line number Diff line change
Expand Up @@ -936,7 +936,7 @@ def construct(self):

with self.prefix(src=relpkgdir, dst=""):
self.path("libndofdev.dylib")
self.path("libSDL2-*.dylib")
self.path("libSDL2*.dylib")

with self.prefix(src_dst="cursors_mac"):
self.path("*.tif")
Expand Down Expand Up @@ -1038,7 +1038,7 @@ def path_optional(src, dst):

# SDL2
for libfile in (
'libSDL2-2.0.dylib',
'libSDL2.dylib',
):
dylibs += path_optional(os.path.join(relpkgdir, libfile), libfile)

Expand Down