Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Well this...compiles

Browse Source
This commit is contained in:
Drake Arconis
2017-12-31 09:42:16 -05:00
committed by Lirusaito
parent f9897b607b
commit 54fe7a8606
18 changed files with 131 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

178
autobuild.xml
View File

@@ -120,18 +120,18 @@
<key>archive</key>
<map>
<key>hash</key>
<string>586739a99e1366cd9e270dc7c9a4e519</string>
<string>1e7eb1da6e3e792db85f59012680a877</string>
<key>hash_algorithm</key>
<string>md5</string>
<key>url</key>
<string>http://depot.alchemyviewer.org/pub/windows64/lib-vc14/apr_suite-1.5.2-windows64-201603261452.tar.bz2</string>
<string>https://depot.alchemyviewer.org/pub/windows64/lib-vc142/apr_suite-1.6.3-1.6.1-1.2.2-windows64-201712260041.tar.bz2</string>
</map>
<key>name</key>
<string>windows64</string>
</map>
</map>
<key>version</key>
<string>1.5.2</string>
<string>1.6.3-1.6.1-1.2.2</string>
</map>
<key>ares</key>
<map>
@@ -292,18 +292,18 @@
<key>archive</key>
<map>
<key>hash</key>
<string>f2ff62721cffd4556d18cbec67152de1</string>
<string>6faba32dcfb80c26bafd4a3e06cff268</string>
<key>hash_algorithm</key>
<string>md5</string>
<key>url</key>
<string>http://depot.alchemyviewer.org/pub/windows64/lib-vc14/boost-1.60.0-windows64-201601160313.tar.bz2</string>
<string>https://depot.alchemyviewer.org/pub/windows64/lib-vc142/boost-1.66.0-windows64-201712260832.tar.bz2</string>
</map>
<key>name</key>
<string>windows64</string>
</map>
</map>
<key>version</key>
<string>1.60.0</string>
<string>1.66.0</string>
</map>
<key>colladadom</key>
<map>
@@ -376,11 +376,11 @@
<key>archive</key>
<map>
<key>hash</key>
<string>46e48bcb7643c4819bf6f35f518a0db7</string>
<string>65628150b732274f0bdd0fa33d6ca650</string>
<key>hash_algorithm</key>
<string>md5</string>
<key>url</key>
<string>http://depot.alchemyviewer.org/pub/windows64/lib-vc14/colladadom-2.3-windows64-201601160353.tar.bz2</string>
<string>https://depot.alchemyviewer.org/pub/windows64/lib-vc142/colladadom-2.3-windows64-201712260938.tar.bz2</string>
</map>
<key>name</key>
<string>windows64</string>
@@ -392,7 +392,7 @@
<key>curl</key>
<map>
<key>copyright</key>
<string>Copyright (c) 1996 - 2016, Daniel Stenberg, (daniel@haxx.se).</string>
<string>Copyright (c) 1996 - 2017, Daniel Stenberg,(daniel@haxx.se), and many contributors.</string>
<key>description</key>
<string>Library for transferring data specified with URL syntax</string>
<key>license</key>
@@ -462,18 +462,18 @@
<key>archive</key>
<map>
<key>hash</key>
<string>86feef4905c2e46a9cbdc7a1df23d83f</string>
<string>7b56b59c56389a8943a04b24bb22ada4</string>
<key>hash_algorithm</key>
<string>md5</string>
<key>url</key>
<string>http://depot.alchemyviewer.org/pub/windows64/lib-vc14/curl-7.48.0-windows64-201603231658.tar.bz2</string>
<string>https://depot.alchemyviewer.org/pub/windows64/lib-vc142/curl-7.57.0-windows64-201712260745.tar.bz2</string>
</map>
<key>name</key>
<string>windows64</string>
</map>
</map>
<key>version</key>
<string>7.48.0</string>
<string>7.57.0</string>
</map>
<key>dbus-glib</key>
<map>
@@ -510,7 +510,7 @@
<key>hash_algorithm</key>
<string>md5</string>
<key>url</key>
<string>http://depot.alchemyviewer.org/pub/linux64/lib/dbus_glib-0.76-linux64-201501030130.tar.bz2</string>
<string>https://depot.alchemyviewer.org/pub/linux64/lib/dbus_glib-0.76-linux64-201501030130.tar.bz2</string>
</map>
<key>name</key>
<string>linux64</string>
@@ -542,7 +542,7 @@
<key>hash_algorithm</key>
<string>md5</string>
<key>url</key>
<string>http://depot.alchemyviewer.org/pub/common/lib/dictionaries-1-common-201412301501.tar.bz2</string>
<string>https://depot.alchemyviewer.org/pub/common/lib/dictionaries-1-common-201412301501.tar.bz2</string>
</map>
<key>name</key>
<string>common</string>
@@ -554,7 +554,7 @@
<key>expat</key>
<map>
<key>copyright</key>
<string>Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd and Clark Cooper - Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006 Expat maintainers.</string>
<string>Copyright (c) 1998-2000 Thai Open Source Software Center Ltd and Clark Cooper - Copyright (c) 2001-2017 Expat maintainers</string>
<key>description</key>
<string>Expat is an XML parser library written in C</string>
<key>license</key>
@@ -624,18 +624,18 @@
<key>archive</key>
<map>
<key>hash</key>
<string>0cf6f4529ade22b7ae78da5d6303ed87</string>
<string>db56a24bbac59d9ad8b98d40b7140c29</string>
<key>hash_algorithm</key>
<string>md5</string>
<key>url</key>
<string>http://depot.alchemyviewer.org/pub/windows64/lib-vc14/expat-2.1.1-windows64-201603261406.tar.bz2</string>
<string>https://depot.alchemyviewer.org/pub/windows64/lib-vc142/expat-2.2.5-windows64-201712251923.tar.bz2</string>
</map>
<key>name</key>
<string>windows64</string>
</map>
</map>
<key>version</key>
<string>2.1.1</string>
<string>2.2.5</string>
</map>
<key>fmodstudio</key>
<map>
@@ -712,18 +712,18 @@
<key>archive</key>
<map>
<key>hash</key>
<string>13ac02d0444e46c17fa20c20a9828647</string>
<string>c2c45c2ebd9fd930098aa2a3b85bbe5f</string>
<key>hash_algorithm</key>
<string>md5</string>
<key>url</key>
<string>https://depot.alchemyviewer.org/pub/windows64/lib/fmodstudio-1.08.04-windows64-201605291157.tar.bz2</string>
<string>https://depot.alchemyviewer.org/pub/windows64/lib/fmodstudio-1.10.02-windows64-201712251435.tar.bz2</string>
</map>
<key>name</key>
<string>windows64</string>
</map>
</map>
<key>version</key>
<string>1.08.04</string>
<string>1.10.02</string>
</map>
<key>fontconfig</key>
<map>
@@ -818,7 +818,7 @@
<key>freetype</key>
<map>
<key>copyright</key>
<string>Copyright 2006-2016 by David Turner, Robert Wilhelm, and Werner Lemberg.</string>
<string>Copyright 2006-2017 by David Turner, Robert Wilhelm, and Werner Lemberg.</string>
<key>description</key>
<string>Font rendering library</string>
<key>license</key>
@@ -888,18 +888,18 @@
<key>archive</key>
<map>
<key>hash</key>
<string>e8c0acbe631d7a4cb1a2890b90e5bc8c</string>
<string>7c028ec152b1dee1313c084d96a5d276</string>
<key>hash_algorithm</key>
<string>md5</string>
<key>url</key>
<string>http://depot.alchemyviewer.org/pub/windows64/lib-vc14/freetype-2.6.3-windows64-201603011807.tar.bz2</string>
<string>https://depot.alchemyviewer.org/pub/windows64/lib-vc142/freetype-2.8.1-windows64-201712260751.tar.bz2</string>
</map>
<key>name</key>
<string>windows64</string>
</map>
</map>
<key>version</key>
<string>2.6.3</string>
<string>2.8.1</string>
</map>
<key>glext</key>
<map>
@@ -1038,11 +1038,11 @@
<key>archive</key>
<map>
<key>hash</key>
<string>2da9e546e4f574ec79ea8962f2c962da</string>
<string>c5c04c164ff057a43928de2f2b83470e</string>
<key>hash_algorithm</key>
<string>md5</string>
<key>url</key>
<string>http://depot.alchemyviewer.org/pub/windows64/lib-vc14/glod-1.0pre4-windows64-201512092328.tar.bz2</string>
<string>https://depot.alchemyviewer.org/pub/windows64/lib-vc142/glod-1.0pre4-windows64-201712251340.tar.bz2</string>
</map>
<key>name</key>
<string>windows64</string>
@@ -1124,11 +1124,11 @@
<key>archive</key>
<map>
<key>hash</key>
<string>e74e54c2042b1539a81012501e4b67af</string>
<string>71ffc5cae4da7e2e7aac856da44cb8c4</string>
<key>hash_algorithm</key>
<string>md5</string>
<key>url</key>
<string>http://depot.alchemyviewer.org/pub/windows64/lib-vc14/google_breakpad-9e60a27-windows64-201512101817.tar.bz2</string>
<string>https://depot.alchemyviewer.org/pub/windows64/lib-vc141/google_breakpad-7398ce15b79da-windows64-201703081616.tar.bz2</string>
</map>
<key>name</key>
<string>windows64</string>
@@ -1338,18 +1338,18 @@
<key>archive</key>
<map>
<key>hash</key>
<string>982395e50a36334899b900d563003b83</string>
<string>d60f195778344b88cc47dc5e19af2cf8</string>
<key>hash_algorithm</key>
<string>md5</string>
<key>url</key>
<string>http://depot.alchemyviewer.org/pub/windows64/lib-vc14/jpeglib-1.4.2-windows64-201512092307.tar.bz2</string>
<string>https://depot.alchemyviewer.org/pub/windows64/lib-vc142/jpeglib-1.5.3-windows64-201712251431.tar.bz2</string>
</map>
<key>name</key>
<string>windows64</string>
</map>
</map>
<key>version</key>
<string>1.4.2</string>
<string>1.5.3</string>
</map>
<key>jsoncpp</key>
<map>
@@ -1424,18 +1424,18 @@
<key>archive</key>
<map>
<key>hash</key>
<string>4cfc311430b84c8a9eba472fd4469f2e</string>
<string>592a4145fcc71be4ddae58b265885382</string>
<key>hash_algorithm</key>
<string>md5</string>
<key>url</key>
<string>http://depot.alchemyviewer.org/pub/windows64/lib-vc14/jsoncpp-1.6.5-windows64-201512092309.tar.bz2</string>
<string>https://depot.alchemyviewer.org/pub/windows64/lib-vc142/jsoncpp-1.8.4-windows64-201712251058.tar.bz2</string>
</map>
<key>name</key>
<string>windows64</string>
</map>
</map>
<key>version</key>
<string>1.6.5</string>
<string>1.8.4</string>
</map>
<key>libhunspell</key>
<map>
@@ -1510,11 +1510,11 @@
<key>archive</key>
<map>
<key>hash</key>
<string>202ec606e90c6a705bc075c334d76f86</string>
<string>46e0276052dc614fe890f2a5d6f814b9</string>
<key>hash_algorithm</key>
<string>md5</string>
<key>url</key>
<string>http://depot.alchemyviewer.org/pub/windows64/lib-vc14/libhunspell-1.3.3-windows64-201512100002.tar.bz2</string>
<string>https://depot.alchemyviewer.org/pub/windows64/lib-vc142/libhunspell-1.6.2-windows64-201712251236.tar.bz2</string>
</map>
<key>name</key>
<string>windows64</string>
@@ -1616,11 +1616,11 @@
<key>archive</key>
<map>
<key>hash</key>
<string>37da82fd6de8673a46c2c0860b54d6bf</string>
<string>3ac8047b38b617ad686591e00100d6af</string>
<key>hash_algorithm</key>
<string>md5</string>
<key>url</key>
<string>http://depot.alchemyviewer.org/pub/windows64/lib-vc14/libndofdev-0.1-windows64-201512122040.tar.bz2</string>
<string>https://depot.alchemyviewer.org/pub/windows64/lib-vc142/libndofdev-0.1-windows64-201712251124.tar.bz2</string>
</map>
<key>name</key>
<string>windows64</string>
@@ -1664,7 +1664,7 @@
<key>libpng</key>
<map>
<key>copyright</key>
<string>Copyright (c) 2004, 2006-2016 Glenn Randers-Pehrson</string>
<string>Copyright (c) 2000-2002, 2004, 2006-2017 Glenn Randers-Pehrson</string>
<key>description</key>
<string>PNG Reference library</string>
<key>license</key>
@@ -1734,18 +1734,18 @@
<key>archive</key>
<map>
<key>hash</key>
<string>b2f166e496fc19958777c92ffd032331</string>
<string>528889464c0766d762bd528cf82558db</string>
<key>hash_algorithm</key>
<string>md5</string>
<key>url</key>
<string>http://depot.alchemyviewer.org/pub/windows64/lib-vc14/libpng-1.6.21-windows64-201603011809.tar.bz2</string>
<string>https://depot.alchemyviewer.org/pub/windows64/lib-vc142/libpng-1.6.34-windows64-201712260746.tar.bz2</string>
</map>
<key>name</key>
<string>windows64</string>
</map>
</map>
<key>version</key>
<string>1.6.21</string>
<string>1.6.34</string>
</map>
<key>libxml2</key>
<map>
@@ -1820,11 +1820,11 @@
<key>archive</key>
<map>
<key>hash</key>
<string>4453be9f68208147e4a7d508db677583</string>
<string>f69b1d4ec7ffdeec4429413ea640583d</string>
<key>hash_algorithm</key>
<string>md5</string>
<key>url</key>
<string>http://depot.alchemyviewer.org/pub/windows64/lib-vc14/libxml2-2.9.3-windows64-201512122133.tar.bz2</string>
<string>https://depot.alchemyviewer.org/pub/windows64/lib-vc142/libxml2-2.9.7-windows64-201712260755.tar.bz2</string>
</map>
<key>name</key>
<string>windows64</string>
@@ -2044,18 +2044,18 @@
<key>archive</key>
<map>
<key>hash</key>
<string>3058f1de30b4738bb087a21561cdd9a8</string>
<string>619598988143e12ad0d1a271f881b3bd</string>
<key>hash_algorithm</key>
<string>md5</string>
<key>url</key>
<string>file:///c:/devel/secondlife/packages/windows64/nvapi-R361v2-windows64-201604020338.tar.bz2</string>
<string>file:///c:/devel/secondlife/packages/windows64/nvapi-R384-windows64-201712260642.tar.bz2</string>
</map>
<key>name</key>
<string>windows64</string>
</map>
</map>
<key>version</key>
<string>R361v2</string>
<string>R384</string>
</map>
<key>ogg_vorbis</key>
<map>
@@ -2130,11 +2130,11 @@
<key>archive</key>
<map>
<key>hash</key>
<string>c22591d8db9dc3353e4d3dc3d1a2b264</string>
<string>01ae2d298489ea66597c5e302e8e4525</string>
<key>hash_algorithm</key>
<string>md5</string>
<key>url</key>
<string>http://depot.alchemyviewer.org/pub/windows64/lib-vc14/ogg_vorbis-1.3.2-1.3.5-windows64-201512122053.tar.bz2</string>
<string>https://depot.alchemyviewer.org/pub/windows64/lib-vc142/ogg_vorbis-1.3.2-1.3.5-windows64-201712251411.tar.bz2</string>
</map>
<key>name</key>
<string>windows64</string>
@@ -2222,14 +2222,14 @@
<key>hash_algorithm</key>
<string>md5</string>
<key>url</key>
<string>http://depot.alchemyviewer.org/pub/windows64/lib/openal-1.16.0-1.1.0-windows64-201504270534.tar.bz2</string>
<string>https://depot.alchemyviewer.org/pub/windows64/lib/openal-1.16.0-1.1.0-windows64-201504270534.tar.bz2</string>
</map>
<key>name</key>
<string>windows64</string>
</map>
</map>
<key>version</key>
<string>1.16.0-1.1.0</string>
<string>1.17.2-1.1.0</string>
</map>
<key>openssl</key>
<map>
@@ -2304,18 +2304,18 @@
<key>archive</key>
<map>
<key>hash</key>
<string>ec86d96ffcbdc10e715e27b4b0bbda43</string>
<string>bd35903f309ccf026a2c448fd8613cc0</string>
<key>hash_algorithm</key>
<string>md5</string>
<key>url</key>
<string>http://depot.alchemyviewer.org/pub/windows64/lib-vc14/openssl-1.0.2g-windows64-201603011842.tar.bz2</string>
<string>https://depot.alchemyviewer.org/pub/windows64/lib-vc142/openssl-1.1.0g-windows64-201712260729.tar.bz2</string>
</map>
<key>name</key>
<string>windows64</string>
</map>
</map>
<key>version</key>
<string>1.0.2g</string>
<string>1.1.0g</string>
</map>
<key>quicktime</key>
<map>
@@ -2408,32 +2408,18 @@
<key>archive</key>
<map>
<key>hash</key>
<string>399afab7047e6fa62e7b2fb1768059ea</string>
<string>47a3316dae47cc4e7c1ea7b74ba8dd1e</string>
<key>hash_algorithm</key>
<string>md5</string>
<key>url</key>
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/slvoice_3p-update-slvoice/rev/298329/arch/CYGWIN/installer/slvoice-4.6.0017.21209.298329-windows-298329.tar.bz2</string>
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/vivox_3p-slvoice/rev/302004/arch/CYGWIN/installer/slvoice-4.6.0017.22050.302004-windows-302004.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>
</map>
<key>windows64</key>
<map>
<key>archive</key>
<map>
<key>hash</key>
<string>dabbc146137c13ec2ea026aa69e1f045</string>
<key>hash_algorithm</key>
<string>md5</string>
<key>url</key>
<string>http://depot.alchemyviewer.org/pub/windows64/lib/slvoice-4.6.0017.21209.298329-windows64-298329.tar.bz2</string>
</map>
<key>name</key>
<string>windows64</string>
</map>
</map>
<key>version</key>
<string>4.6.0017.21209.298329</string>
<string>4.6.0017.22050</string>
</map>
<key>tut</key>
<map>
@@ -2458,7 +2444,7 @@
<key>hash_algorithm</key>
<string>md5</string>
<key>url</key>
<string>http://depot.alchemyviewer.org/pub/common/lib/tut-2008.11.30-common-201504282317.tar.bz2</string>
<string>https://depot.alchemyviewer.org/pub/common/lib/tut-2008.11.30-common-201504282317.tar.bz2</string>
</map>
<key>name</key>
<string>common</string>
@@ -2540,11 +2526,11 @@
<key>archive</key>
<map>
<key>hash</key>
<string>dae3118551880f593f8ee907c122f097</string>
<string>ad1a435de73b7ee6d07f6c81a4cb1910</string>
<key>hash_algorithm</key>
<string>md5</string>
<key>url</key>
<string>http://depot.alchemyviewer.org/pub/windows64/lib-vc14/uriparser-0.8.4-windows64-201512081840.tar.bz2</string>
<string>https://depot.alchemyviewer.org/pub/windows64/lib-vc142/uriparser-0.8.4-windows64-201712251116.tar.bz2</string>
</map>
<key>name</key>
<string>windows64</string>
@@ -2572,11 +2558,11 @@
<key>archive</key>
<map>
<key>hash</key>
<string>a38ec464042e1d5e67231d9bcd181ae2</string>
<string>f193ec9e594d857d22c067c6e52622a9</string>
<key>hash_algorithm</key>
<string>md5</string>
<key>url</key>
<string>https://depot.alchemyviewer.org/pub/windows/lib-vc14/vcredist-14.0.23918.0-windows-201606250656.tar.bz2</string>
<string>https://depot.alchemyviewer.org/pub/windows/lib-vc141/vcredist-14.10.25017.0-windows-201705270440.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>
@@ -2586,18 +2572,18 @@
<key>archive</key>
<map>
<key>hash</key>
<string>0d688527ab7d08f6b7c7a5f73175e4f8</string>
<string>e895f4b5d24b372a360c3a8fe3bc0398</string>
<key>hash_algorithm</key>
<string>md5</string>
<key>url</key>
<string>https://depot.alchemyviewer.org/pub/windows64/lib-vc14/vcredist-14.0.23918.0-windows64-201606250656.tar.bz2</string>
<string>https://depot.alchemyviewer.org/pub/windows64/lib-vc142/vcredist-14.12.25810.0-windows64-201712251445.tar.bz2</string>
</map>
<key>name</key>
<string>windows64</string>
</map>
</map>
<key>version</key>
<string>14.0.23918.0</string>
<string>14.12.25810.0</string>
</map>
<key>xmlrpc-epi</key>
<map>
@@ -2672,11 +2658,11 @@
<key>archive</key>
<map>
<key>hash</key>
<string>1afa5a6bdbc5689e14120628dc0fc124</string>
<string>59f0be2732e93eceaa155d98c2fcee9c</string>
<key>hash_algorithm</key>
<string>md5</string>
<key>url</key>
<string>http://depot.alchemyviewer.org/pub/windows64/lib-vc14/xmlrpc_epi-0.54.2-windows64-201603261459.tar.bz2</string>
<string>https://depot.alchemyviewer.org/pub/windows64/lib-vc142/xmlrpc_epi-0.54.2-windows64-201712260035.tar.bz2</string>
</map>
<key>name</key>
<string>windows64</string>
@@ -2688,7 +2674,7 @@
<key>zlib</key>
<map>
<key>copyright</key>
<string>Copyright (C) 1995-2013 Jean-loup Gailly and Mark Adler</string>
<string>Copyright (C) 1995-2017 Jean-loup Gailly and Mark Adler</string>
<key>description</key>
<string>Zlib Data Compression Library</string>
<key>license</key>
@@ -2758,18 +2744,18 @@
<key>archive</key>
<map>
<key>hash</key>
<string>5b3a58a6a939e83f94137171b7f814de</string>
<string>ed6da4296e2fdfc132b4f12d35890ada</string>
<key>hash_algorithm</key>
<string>md5</string>
<key>url</key>
<string>http://depot.alchemyviewer.org/pub/windows64/lib-vc14/zlib-1.2.8-windows64-201512071625.tar.bz2</string>
<string>https://depot.alchemyviewer.org/pub/windows64/lib-vc142/zlib-1.2.11-windows64-201712260711.tar.bz2</string>
</map>
<key>name</key>
<string>windows64</string>
</map>
</map>
<key>version</key>
<string>1.2.8</string>
<string>1.2.11</string>
</map>
</map>
<key>package_description</key>
@@ -3013,7 +2999,7 @@
<key>windows</key>
<map>
<key>build_directory</key>
<string>build-vc140</string>
<string>build-vc141</string>
<key>configurations</key>
<map>
<key>RelWithDebInfo</key>
@@ -3053,8 +3039,8 @@
<key>options</key>
<array>
<string>-G</string>
<string>"Visual Studio 14"</string>
<string>-DCMAKE_SYSTEM_VERSION="10.0.10586.0"</string>
<string>"Visual Studio 15"</string>
<string>-DCMAKE_SYSTEM_VERSION="10.0.16299.0"</string>
<string>-DINSTALL_PROPRIETARY=FALSE</string>
</array>
</map>
@@ -3100,8 +3086,8 @@
<key>options</key>
<array>
<string>-G</string>
<string>"Visual Studio 14"</string>
<string>-DCMAKE_SYSTEM_VERSION="10.0.10586.0"</string>
<string>"Visual Studio 15"</string>
<string>-DCMAKE_SYSTEM_VERSION="10.0.16299.0"</string>
<string>-DINSTALL_PROPRIETARY=FALSE</string>
</array>
</map>
@@ -3115,7 +3101,7 @@
<key>windows64</key>
<map>
<key>build_directory</key>
<string>build-vc140-x86_64</string>
<string>build-vc141-x86_64</string>
<key>configurations</key>
<map>
<key>RelWithDebInfo</key>
@@ -3155,8 +3141,8 @@
<key>options</key>
<array>
<string>-G</string>
<string>"Visual Studio 14 Win64"</string>
<string>-DCMAKE_SYSTEM_VERSION="10.0.10586.0"</string>
<string>"Visual Studio 15 Win64"</string>
<string>-DCMAKE_SYSTEM_VERSION="10.0.16299.0"</string>
<string>-DWORD_SIZE:STRING=64</string>
<string>-DINSTALL_PROPRIETARY=FALSE</string>
</array>
@@ -3203,8 +3189,8 @@
<key>options</key>
<array>
<string>-G</string>
<string>"Visual Studio 14 Win64"</string>
<string>-DCMAKE_SYSTEM_VERSION="10.0.10586.0"</string>
<string>"Visual Studio 15 Win64"</string>
<string>-DCMAKE_SYSTEM_VERSION="10.0.16299.0"</string>
<string>-DWORD_SIZE:STRING=64</string>
<string>-DINSTALL_PROPRIETARY=FALSE</string>
</array>

4
indra/cmake/CURL.cmake
View File

@@ -10,8 +10,8 @@ else (STANDALONE)
use_prebuilt_binary(curl)
if (WINDOWS)
set(CURL_LIBRARIES
debug libcurld
optimized libcurl)
debug libcurl_a_debug
optimized libcurl_a)
else (WINDOWS)
use_prebuilt_binary(libidn)
set(CURL_LIBRARIES curl idn)

26
indra/cmake/Copy3rdPartyLibs.cmake
View File

@@ -22,10 +22,8 @@ if(WINDOWS)
SLVoice.exe
ca-bundle.crt
libsndfile-1.dll
vivoxplatform.dll
vivoxsdk.dll
ortp.dll
zlib1.dll
vivoxoal.dll
)
@@ -37,8 +35,6 @@ if(WINDOWS)
libapr-1.dll
libaprutil-1.dll
libapriconv-1.dll
ssleay32.dll
libeay32.dll
glod.dll
libhunspell.dll
)
@@ -48,12 +44,30 @@ if(WINDOWS)
libapr-1.dll
libaprutil-1.dll
libapriconv-1.dll
ssleay32.dll
libeay32.dll
glod.dll
libhunspell.dll
)
if(WORD_SIZE STREQUAL 64)
list(APPEND debug_files
libcrypto-1_1-x64.dll
libssl-1_1-x64.dll
)
list(APPEND release_files
libcrypto-1_1-x64.dll
libssl-1_1-x64.dll
)
else(WORD_SIZE STREQUAL 64)
list(APPEND debug_files
libcrypto-1_1.dll
libssl-1_1.dll
)
list(APPEND release_files
libcrypto-1_1.dll
libssl-1_1.dll
)
endif(WORD_SIZE STREQUAL 64)
if(NOT DISABLE_TCMALLOC)
set(debug_files ${debug_files} libtcmalloc_minimal-debug.dll)
set(release_files ${release_files} libtcmalloc_minimal.dll)

2
indra/cmake/OpenSSL.cmake
View File

@@ -9,7 +9,7 @@ if (STANDALONE OR USE_SYSTEM_OPENSSL)
else (STANDALONE OR USE_SYSTEM_OPENSSL)
use_prebuilt_binary(openssl)
if (WINDOWS)
set(OPENSSL_LIBRARIES ssleay32 libeay32)
set(OPENSSL_LIBRARIES libssl libcrypto)
else (WINDOWS)
set(OPENSSL_LIBRARIES ssl)
endif (WINDOWS)

2
indra/llcommon/llapp.cpp
View File

@@ -53,7 +53,7 @@
// Windows uses structured exceptions, so it's handled a bit differently.
//
#if LL_WINDOWS
#include "windows.h"
#include <windows.h>
LONG WINAPI default_windows_exception_handler(struct _EXCEPTION_POINTERS *exception_infop);
BOOL ConsoleCtrlHandler(DWORD fdwCtrlType);

2
indra/llcommon/llapr.h
View File

@@ -33,6 +33,8 @@
#include <sys/param.h> // Need PATH_MAX in APR headers...
#endif
#include "llwin32headerslean.h"
#include <boost/noncopyable.hpp>
#include "apr_thread_proc.h"

4
indra/llcommon/llprocesslauncher.h
View File

@@ -33,9 +33,7 @@
#ifndef LL_LLPROCESSLAUNCHER_H
#define LL_LLPROCESSLAUNCHER_H
#if LL_WINDOWS
#include <windows.h>
#endif
#include "llwin32headerslean.h"
/*

1
indra/llcommon/llwin32headers.h
View File

@@ -33,6 +33,7 @@
#endif
#undef WIN32_LEAN_AND_MEAN
#include <winsock2.h>
#include <Ws2ipdef.h>
#include <windows.h>
// reset to default, which is lean
#define WIN32_LEAN_AND_MEAN

1
indra/llcommon/llwin32headerslean.h
View File

@@ -33,6 +33,7 @@
#endif
#define WIN32_LEAN_AND_MEAN
#include <winsock2.h>
#include <Ws2ipdef.h>
#include <windows.h>
#undef NOMINMAX
#endif

4
indra/llmessage/CMakeLists.txt
View File

@@ -37,7 +37,6 @@ set(llmessage_SOURCE_FILES
llassetstorage.cpp
llavatarname.cpp
llavatarnamecache.cpp
llblowfishcipher.cpp
llbuffer.cpp
llbufferstream.cpp
llcachename.cpp
@@ -57,7 +56,6 @@ set(llmessage_SOURCE_FILES
lliopipe.cpp
lliosocket.cpp
llioutil.cpp
llmail.cpp
llmessagebuilder.cpp
llmessageconfig.cpp
llmessagelog.cpp
@@ -128,7 +126,6 @@ set(llmessage_HEADER_FILES
llassetstorage.h
llavatarname.h
llavatarnamecache.h
llblowfishcipher.h
llbuffer.h
llbufferstream.h
llcachename.h
@@ -156,7 +153,6 @@ set(llmessage_HEADER_FILES
lliosocket.h
llioutil.h
llloginflags.h
llmail.h
llmessagebuilder.h
llmessageconfig.h
llmessagelog.h

5
indra/llrender/llglheaders.h
View File

@@ -543,10 +543,7 @@ extern PFNGLBINDBUFFERRANGEPROC glBindBufferRange;
//----------------------------------------------------------------------------
// LL_WINDOWS
// windows gl headers depend on things like APIENTRY, so include windows.
#define WIN32_LEAN_AND_MEAN
#include <winsock2.h>
#include <windows.h>
#include "llwin32headerslean.h"
//----------------------------------------------------------------------------
#include <GL/gl.h>

4
indra/llwindow/llkeyboardwin32.cpp
View File

@@ -28,9 +28,7 @@
#include "linden_common.h"
#define WIN32_LEAN_AND_MEAN
#include <winsock2.h>
#include <windows.h>
#include "llwin32headerslean.h"
#include "llkeyboardwin32.h"

5
indra/llwindow/llwindowwin32.h
View File

@@ -27,10 +27,7 @@
#ifndef LL_LLWINDOWWIN32_H
#define LL_LLWINDOWWIN32_H
// Limit Windows API to small and manageable set.
#define WIN32_LEAN_AND_MEAN
#include <winsock2.h>
#include <windows.h>
#include "llwin32headerslean.h"
#include "llwindow.h"
#include "llwindowcallbacks.h"

4
indra/newview/NACLantispam.cpp
View File

@@ -35,8 +35,8 @@ U32 NACLAntiSpamRegistry::globalAmount;
U32 NACLAntiSpamRegistry::globalTime;
bool NACLAntiSpamRegistry::bGlobalQueue;
NACLAntiSpamQueue* NACLAntiSpamRegistry::queues[NACLAntiSpamRegistry::QUEUE_MAX] = {0};
std::tr1::unordered_map<std::string,NACLAntiSpamQueueEntry*> NACLAntiSpamRegistry::globalEntries;
std::tr1::unordered_map<std::string,NACLAntiSpamQueueEntry*>::iterator NACLAntiSpamRegistry::it2;
boost::unordered_map<std::string,NACLAntiSpamQueueEntry*> NACLAntiSpamRegistry::globalEntries;
boost::unordered_map<std::string,NACLAntiSpamQueueEntry*>::iterator NACLAntiSpamRegistry::it2;
// The following sounds will be ignored for purposes of spam protection. They have been gathered from wiki documentation of frequent official sounds.
const std::string COLLISION_SOUNDS[] ={"dce5fdd4-afe4-4ea1-822f-dd52cac46b08","51011582-fbca-4580-ae9e-1a5593f094ec","68d62208-e257-4d0c-bbe2-20c9ea9760bb","75872e8c-bc39-451b-9b0b-042d7ba36cba","6a45ba0b-5775-4ea8-8513-26008a17f873","992a6d1b-8c77-40e0-9495-4098ce539694","2de4da5a-faf8-46be-bac6-c4d74f1e5767","6e3fb0f7-6d9c-42ca-b86b-1122ff562d7d","14209133-4961-4acc-9649-53fc38ee1667","bc4a4348-cfcc-4e5e-908e-8a52a8915fe6","9e5c1297-6eed-40c0-825a-d9bcd86e3193","e534761c-1894-4b61-b20c-658a6fb68157","8761f73f-6cf9-4186-8aaa-0948ed002db1","874a26fd-142f-4173-8c5b-890cd846c74d","0e24a717-b97e-4b77-9c94-b59a5a88b2da","75cf3ade-9a5b-4c4d-bb35-f9799bda7fb2","153c8bf7-fb89-4d89-b263-47e58b1b4774","55c3e0ce-275a-46fa-82ff-e0465f5e8703","24babf58-7156-4841-9a3f-761bdbb8e237","aca261d8-e145-4610-9e20-9eff990f2c12","0642fba6-5dcf-4d62-8e7b-94dbb529d117","25a863e8-dc42-4e8a-a357-e76422ace9b5","9538f37c-456e-4047-81be-6435045608d4","8c0f84c3-9afd-4396-b5f5-9bca2c911c20","be582e5d-b123-41a2-a150-454c39e961c8","c70141d4-ba06-41ea-bcbc-35ea81cb8335","7d1826f4-24c4-4aac-8c2e-eff45df37783","063c97d3-033a-4e9b-98d8-05c8074922cb","00000000-0000-0000-0000-000000000120"};

10
indra/newview/NACLantispam.h
View File

@@ -15,7 +15,7 @@
#ifndef NACLANTISPAM_H
#define NACLANTISPAM_H
#include <boost/tr1/unordered_map.hpp>
#include <boost/unordered/unordered_map.hpp>
#include "stdtypes.h"
#include "lluuid.h"
class NACLAntiSpamQueueEntry
@@ -51,8 +51,8 @@ protected:
void blockEntry(LLUUID& source);
int checkEntry(LLUUID& source, U32 multiplier);
private:
std::tr1::unordered_map<std::string,NACLAntiSpamQueueEntry*> entries;
std::tr1::unordered_map<std::string,NACLAntiSpamQueueEntry*>::iterator it;
boost::unordered_map<std::string,NACLAntiSpamQueueEntry*> entries;
boost::unordered_map<std::string,NACLAntiSpamQueueEntry*>::iterator it;
U32 queueAmount;
U32 queueTime;
};
@@ -92,8 +92,8 @@ public:
private:
static const char* getQueueName(U32 queue_id);
static NACLAntiSpamQueue* queues[QUEUE_MAX];
static std::tr1::unordered_map<std::string,NACLAntiSpamQueueEntry*> globalEntries;
static std::tr1::unordered_map<std::string,NACLAntiSpamQueueEntry*>::iterator it2;
static boost::unordered_map<std::string,NACLAntiSpamQueueEntry*> globalEntries;
static boost::unordered_map<std::string,NACLAntiSpamQueueEntry*>::iterator it2;
static U32 globalTime;
static U32 globalAmount;
static bool bGlobalQueue;

2
indra/newview/lgghunspell_wrapper.h
View File

@@ -23,7 +23,7 @@
#ifdef near
#undef near
#endif
#include <hunspell/hunspelldll.h>
#include <hunspell/hunspell.hxx>
#pragma pop_macro("near")
#else
#include <hunspell/hunspell.hxx>

11
indra/newview/llviewerprecompiledheaders.h
View File

@@ -41,16 +41,7 @@
#include "linden_common.h"
// We may want to take the windows.h include out, but it used to be in
// linden_common.h, and hence in all the libraries. This is better. JC
#if LL_WINDOWS
// Limit Windows API to small and manageable set.
// If you get undefined symbols, find the appropriate
// Windows header file and include that in your .cpp file.
#define WIN32_LEAN_AND_MEAN
#include <winsock2.h>
#include <windows.h>
#endif
#include "llwin32headerslean.h"
#include <algorithm>
#include <deque>

14
indra/newview/viewer_manifest.py
View File

@@ -334,15 +334,9 @@ class WindowsManifest(ViewerManifest):
self.path("vivoxsdk.dll")
self.path("ortp.dll")
self.path("libsndfile-1.dll")
self.path("zlib1.dll")
self.path("vivoxplatform.dll")
self.path("vivoxoal.dll")
self.path("ca-bundle.crt")
# Security
self.path("ssleay32.dll")
self.path("libeay32.dll")
# Hunspell
self.path("libhunspell.dll")
@@ -621,6 +615,10 @@ class Windows_i686_Manifest(WindowsManifest):
if self.prefix(src=os.path.join(os.pardir, 'sharedlibs', self.args['configuration']),
dst=""):
# Security
self.path("libcrypto-1_1.dll")
self.path("libssl-1_1.dll")
# Get fmod studio dll, continue if missing
try:
if self.args['configuration'].lower() == 'debug':
@@ -645,6 +643,10 @@ class Windows_x86_64_Manifest(WindowsManifest):
if self.prefix(src=os.path.join(os.pardir, 'sharedlibs', self.args['configuration']),
dst=""):
# Security
self.path("libcrypto-1_1-x64.dll")
self.path("libssl-1_1-x64.dll")
# Get fmodstudio dll, continue if missing
try:
if self.args['configuration'].lower() == 'debug':