diff --git a/autobuild.xml b/autobuild.xml index 4b86f44f5db0620031c8ab6d43d1084e17d177cb..801fa9044a96c442fd321ab5bc4297e372b01b80 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -2107,6 +2107,38 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string> <key>version</key> <string>4.10.0000.32327.5fc3fe7c.558436</string> </map> + <key>squirrel</key> + <map> + <key>copyright</key> + <string>Copyright (c) 2012 GitHub, Inc.</string> + <key>description</key> + <string>Squirrel installer framework</string> + <key>license</key> + <string>MIT</string> + <key>license_file</key> + <string>LICENSES/squirrel.txt</string> + <key>name</key> + <string>squirrel</string> + <key>platforms</key> + <map> + <key>windows64</key> + <map> + <key>archive</key> + <map> + <key>hash</key> + <string>6ebc2d8934207911406aea18de8eac46bcd18cc4b6f6e2c24b936cac2d7f0abe94fc17e274f5567dc4280ace5a4e8accac658edb0cdf0623348fc72678c999cd</string> + <key>hash_algorithm</key> + <string>blake2b</string> + <key>url</key> + <string>https://git.alchemyviewer.org/api/v4/projects/197/packages/generic/squirrel/2.9.42.1850/squirrel-2.9.42-windows64-1850.tar.zst</string> + </map> + <key>name</key> + <string>windows64</string> + </map> + </map> + <key>version</key> + <string>2.9.42</string> + </map> <key>threejs</key> <map> <key>copyright</key> diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index 5a0597a36c1c7086f73da5180bf6c57580c767fa..8a1f230133864e7807434c0e88ff82f589a5dc88 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -69,6 +69,10 @@ if( LLPHYSICSEXTENSIONS_SRC_DIR ) endif (NOT HAVOK_TPV) endif( LLPHYSICSEXTENSIONS_SRC_DIR ) +if (WINDOWS) + use_prebuilt_binary(squirrel) +endif() + include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}