livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

DRTVWR-568: Pull in new 3p-colladadom build, tweak to VSVER number hardcoded into autobuild.xml for VS 2022 and update cmake script to copy the MSVC runtime (proper fix coming

master
Callum Linden 2022-08-30 15:20:04 -07:00
parent a3f7f7d8c0
commit ef58b9751a
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
autobuild.xml
View File

@ -236,9 +236,9 @@
<key>archive</key>
<map>
<key>hash</key>
<string>4699b8389dfb754da0393ddb5d325722</string>
<string>a880dfc15fcb330baf548a85324cd88a</string>
<key>url</key>
<string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/95882/856117/colladadom-2.3.569219-darwin64-569219.tar.bz2</string>
<string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/104133/913090/colladadom-2.3.574693-darwin64-574693.tar.bz2</string>
</map>
<key>name</key>
<string>darwin64</string>
@ -260,9 +260,9 @@
<key>archive</key>
<map>
<key>hash</key>
<string>343e46ea49a08ad6596d3dc702d5b812</string>
<string>7e84441d9c7cf019a7bdc7b818b16c27</string>
<key>url</key>
<string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/95883/856128/colladadom-2.3.569219-windows-569219.tar.bz2</string>
<string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/104112/912957/colladadom-2.3.574693-windows-574693.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>
@ -272,16 +272,16 @@
<key>archive</key>
<map>
<key>hash</key>
<string>de5bdfb61b31db56c5fe7d0962ad11e2</string>
<string>2eaffbb8a93b03a732d3c47055a8efcb</string>
<key>url</key>
<string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/95884/856129/colladadom-2.3.569219-windows64-569219.tar.bz2</string>
<string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/104135/913103/colladadom-2.3.574693-windows64-574693.tar.bz2</string>
</map>
<key>name</key>
<string>windows64</string>
</map>
</map>
<key>version</key>
<string>2.3.569219</string>
<string>2.3.574693</string>
</map>
<key>cubemaptoequirectangular</key>
<map>
@ -3114,7 +3114,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
<key>windows</key>
<map>
<key>build_directory</key>
<string>build-vc${AUTOBUILD_VSVER|160}-$AUTOBUILD_ADDRSIZE</string>
<string>build-vc${AUTOBUILD_VSVER|170}-$AUTOBUILD_ADDRSIZE</string>
<key>configurations</key>
<map>
<key>RelWithDebInfo</key>

2
indra/cmake/Copy3rdPartyLibs.cmake
View File

@ -105,6 +105,8 @@ if(WINDOWS)
set(MSVC_VER 140)
elseif (MSVC_VERSION GREATER_EQUAL 1920 AND MSVC_VERSION LESS 1930) # Visual Studio 2019
set(MSVC_VER 140)
elseif (MSVC_VERSION GREATER_EQUAL 1930 AND MSVC_VERSION LESS 1940) # Visual Studio 2022
set(MSVC_VER 140)
else (MSVC80)
MESSAGE(WARNING "New MSVC_VERSION ${MSVC_VERSION} of MSVC: adapt Copy3rdPartyLibs.cmake")
endif (MSVC80)