diff --git a/autobuild.xml b/autobuild.xml index 9f3567918..1baeb9625 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -120,18 +120,18 @@ archive hash - 586739a99e1366cd9e270dc7c9a4e519 + 1e7eb1da6e3e792db85f59012680a877 hash_algorithm md5 url - http://depot.alchemyviewer.org/pub/windows64/lib-vc14/apr_suite-1.5.2-windows64-201603261452.tar.bz2 + https://depot.alchemyviewer.org/pub/windows64/lib-vc142/apr_suite-1.6.3-1.6.1-1.2.2-windows64-201712260041.tar.bz2 name windows64 version - 1.5.2 + 1.6.3-1.6.1-1.2.2 ares @@ -292,18 +292,18 @@ archive hash - f2ff62721cffd4556d18cbec67152de1 + 6faba32dcfb80c26bafd4a3e06cff268 hash_algorithm md5 url - http://depot.alchemyviewer.org/pub/windows64/lib-vc14/boost-1.60.0-windows64-201601160313.tar.bz2 + https://depot.alchemyviewer.org/pub/windows64/lib-vc142/boost-1.66.0-windows64-201712260832.tar.bz2 name windows64 version - 1.60.0 + 1.66.0 colladadom @@ -376,11 +376,11 @@ archive hash - 46e48bcb7643c4819bf6f35f518a0db7 + 65628150b732274f0bdd0fa33d6ca650 hash_algorithm md5 url - http://depot.alchemyviewer.org/pub/windows64/lib-vc14/colladadom-2.3-windows64-201601160353.tar.bz2 + https://depot.alchemyviewer.org/pub/windows64/lib-vc142/colladadom-2.3-windows64-201712260938.tar.bz2 name windows64 @@ -392,7 +392,7 @@ curl copyright - Copyright (c) 1996 - 2016, Daniel Stenberg, (daniel@haxx.se). + Copyright (c) 1996 - 2017, Daniel Stenberg,(daniel@haxx.se), and many contributors. description Library for transferring data specified with URL syntax license @@ -462,18 +462,18 @@ archive hash - 86feef4905c2e46a9cbdc7a1df23d83f + 7b56b59c56389a8943a04b24bb22ada4 hash_algorithm md5 url - http://depot.alchemyviewer.org/pub/windows64/lib-vc14/curl-7.48.0-windows64-201603231658.tar.bz2 + https://depot.alchemyviewer.org/pub/windows64/lib-vc142/curl-7.57.0-windows64-201712260745.tar.bz2 name windows64 version - 7.48.0 + 7.57.0 dbus-glib @@ -510,7 +510,7 @@ hash_algorithm md5 url - http://depot.alchemyviewer.org/pub/linux64/lib/dbus_glib-0.76-linux64-201501030130.tar.bz2 + https://depot.alchemyviewer.org/pub/linux64/lib/dbus_glib-0.76-linux64-201501030130.tar.bz2 name linux64 @@ -542,7 +542,7 @@ hash_algorithm md5 url - http://depot.alchemyviewer.org/pub/common/lib/dictionaries-1-common-201412301501.tar.bz2 + https://depot.alchemyviewer.org/pub/common/lib/dictionaries-1-common-201412301501.tar.bz2 name common @@ -554,7 +554,7 @@ expat copyright - Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd and Clark Cooper - Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006 Expat maintainers. + Copyright (c) 1998-2000 Thai Open Source Software Center Ltd and Clark Cooper - Copyright (c) 2001-2017 Expat maintainers description Expat is an XML parser library written in C license @@ -624,18 +624,18 @@ archive hash - 0cf6f4529ade22b7ae78da5d6303ed87 + db56a24bbac59d9ad8b98d40b7140c29 hash_algorithm md5 url - http://depot.alchemyviewer.org/pub/windows64/lib-vc14/expat-2.1.1-windows64-201603261406.tar.bz2 + https://depot.alchemyviewer.org/pub/windows64/lib-vc142/expat-2.2.5-windows64-201712251923.tar.bz2 name windows64 version - 2.1.1 + 2.2.5 fmodstudio @@ -712,18 +712,18 @@ archive hash - 13ac02d0444e46c17fa20c20a9828647 + c2c45c2ebd9fd930098aa2a3b85bbe5f hash_algorithm md5 url - https://depot.alchemyviewer.org/pub/windows64/lib/fmodstudio-1.08.04-windows64-201605291157.tar.bz2 + https://depot.alchemyviewer.org/pub/windows64/lib/fmodstudio-1.10.02-windows64-201712251435.tar.bz2 name windows64 version - 1.08.04 + 1.10.02 fontconfig @@ -818,7 +818,7 @@ freetype copyright - Copyright 2006-2016 by David Turner, Robert Wilhelm, and Werner Lemberg. + Copyright 2006-2017 by David Turner, Robert Wilhelm, and Werner Lemberg. description Font rendering library license @@ -888,18 +888,18 @@ archive hash - e8c0acbe631d7a4cb1a2890b90e5bc8c + 7c028ec152b1dee1313c084d96a5d276 hash_algorithm md5 url - http://depot.alchemyviewer.org/pub/windows64/lib-vc14/freetype-2.6.3-windows64-201603011807.tar.bz2 + https://depot.alchemyviewer.org/pub/windows64/lib-vc142/freetype-2.8.1-windows64-201712260751.tar.bz2 name windows64 version - 2.6.3 + 2.8.1 glext @@ -1038,11 +1038,11 @@ archive hash - 2da9e546e4f574ec79ea8962f2c962da + c5c04c164ff057a43928de2f2b83470e hash_algorithm md5 url - http://depot.alchemyviewer.org/pub/windows64/lib-vc14/glod-1.0pre4-windows64-201512092328.tar.bz2 + https://depot.alchemyviewer.org/pub/windows64/lib-vc142/glod-1.0pre4-windows64-201712251340.tar.bz2 name windows64 @@ -1124,11 +1124,11 @@ archive hash - e74e54c2042b1539a81012501e4b67af + 71ffc5cae4da7e2e7aac856da44cb8c4 hash_algorithm md5 url - http://depot.alchemyviewer.org/pub/windows64/lib-vc14/google_breakpad-9e60a27-windows64-201512101817.tar.bz2 + https://depot.alchemyviewer.org/pub/windows64/lib-vc141/google_breakpad-7398ce15b79da-windows64-201703081616.tar.bz2 name windows64 @@ -1338,18 +1338,18 @@ archive hash - 982395e50a36334899b900d563003b83 + d60f195778344b88cc47dc5e19af2cf8 hash_algorithm md5 url - http://depot.alchemyviewer.org/pub/windows64/lib-vc14/jpeglib-1.4.2-windows64-201512092307.tar.bz2 + https://depot.alchemyviewer.org/pub/windows64/lib-vc142/jpeglib-1.5.3-windows64-201712251431.tar.bz2 name windows64 version - 1.4.2 + 1.5.3 jsoncpp @@ -1424,18 +1424,18 @@ archive hash - 4cfc311430b84c8a9eba472fd4469f2e + 592a4145fcc71be4ddae58b265885382 hash_algorithm md5 url - http://depot.alchemyviewer.org/pub/windows64/lib-vc14/jsoncpp-1.6.5-windows64-201512092309.tar.bz2 + https://depot.alchemyviewer.org/pub/windows64/lib-vc142/jsoncpp-1.8.4-windows64-201712251058.tar.bz2 name windows64 version - 1.6.5 + 1.8.4 libhunspell @@ -1510,11 +1510,11 @@ archive hash - 202ec606e90c6a705bc075c334d76f86 + 46e0276052dc614fe890f2a5d6f814b9 hash_algorithm md5 url - http://depot.alchemyviewer.org/pub/windows64/lib-vc14/libhunspell-1.3.3-windows64-201512100002.tar.bz2 + https://depot.alchemyviewer.org/pub/windows64/lib-vc142/libhunspell-1.6.2-windows64-201712251236.tar.bz2 name windows64 @@ -1616,11 +1616,11 @@ archive hash - 37da82fd6de8673a46c2c0860b54d6bf + 3ac8047b38b617ad686591e00100d6af hash_algorithm md5 url - http://depot.alchemyviewer.org/pub/windows64/lib-vc14/libndofdev-0.1-windows64-201512122040.tar.bz2 + https://depot.alchemyviewer.org/pub/windows64/lib-vc142/libndofdev-0.1-windows64-201712251124.tar.bz2 name windows64 @@ -1664,7 +1664,7 @@ libpng copyright - Copyright (c) 2004, 2006-2016 Glenn Randers-Pehrson + Copyright (c) 2000-2002, 2004, 2006-2017 Glenn Randers-Pehrson description PNG Reference library license @@ -1734,18 +1734,18 @@ archive hash - b2f166e496fc19958777c92ffd032331 + 528889464c0766d762bd528cf82558db hash_algorithm md5 url - http://depot.alchemyviewer.org/pub/windows64/lib-vc14/libpng-1.6.21-windows64-201603011809.tar.bz2 + https://depot.alchemyviewer.org/pub/windows64/lib-vc142/libpng-1.6.34-windows64-201712260746.tar.bz2 name windows64 version - 1.6.21 + 1.6.34 libxml2 @@ -1820,11 +1820,11 @@ archive hash - 4453be9f68208147e4a7d508db677583 + f69b1d4ec7ffdeec4429413ea640583d hash_algorithm md5 url - http://depot.alchemyviewer.org/pub/windows64/lib-vc14/libxml2-2.9.3-windows64-201512122133.tar.bz2 + https://depot.alchemyviewer.org/pub/windows64/lib-vc142/libxml2-2.9.7-windows64-201712260755.tar.bz2 name windows64 @@ -2044,18 +2044,18 @@ archive hash - 3058f1de30b4738bb087a21561cdd9a8 + 619598988143e12ad0d1a271f881b3bd hash_algorithm md5 url - file:///c:/devel/secondlife/packages/windows64/nvapi-R361v2-windows64-201604020338.tar.bz2 + file:///c:/devel/secondlife/packages/windows64/nvapi-R384-windows64-201712260642.tar.bz2 name windows64 version - R361v2 + R384 ogg_vorbis @@ -2130,11 +2130,11 @@ archive hash - c22591d8db9dc3353e4d3dc3d1a2b264 + 01ae2d298489ea66597c5e302e8e4525 hash_algorithm md5 url - http://depot.alchemyviewer.org/pub/windows64/lib-vc14/ogg_vorbis-1.3.2-1.3.5-windows64-201512122053.tar.bz2 + https://depot.alchemyviewer.org/pub/windows64/lib-vc142/ogg_vorbis-1.3.2-1.3.5-windows64-201712251411.tar.bz2 name windows64 @@ -2222,14 +2222,14 @@ hash_algorithm md5 url - http://depot.alchemyviewer.org/pub/windows64/lib/openal-1.16.0-1.1.0-windows64-201504270534.tar.bz2 + https://depot.alchemyviewer.org/pub/windows64/lib/openal-1.16.0-1.1.0-windows64-201504270534.tar.bz2 name windows64 version - 1.16.0-1.1.0 + 1.17.2-1.1.0 openssl @@ -2304,18 +2304,18 @@ archive hash - ec86d96ffcbdc10e715e27b4b0bbda43 + bd35903f309ccf026a2c448fd8613cc0 hash_algorithm md5 url - http://depot.alchemyviewer.org/pub/windows64/lib-vc14/openssl-1.0.2g-windows64-201603011842.tar.bz2 + https://depot.alchemyviewer.org/pub/windows64/lib-vc142/openssl-1.1.0g-windows64-201712260729.tar.bz2 name windows64 version - 1.0.2g + 1.1.0g quicktime @@ -2408,32 +2408,18 @@ archive hash - 399afab7047e6fa62e7b2fb1768059ea + 47a3316dae47cc4e7c1ea7b74ba8dd1e hash_algorithm md5 url - 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 + 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 name windows - windows64 - - archive - - hash - dabbc146137c13ec2ea026aa69e1f045 - hash_algorithm - md5 - url - http://depot.alchemyviewer.org/pub/windows64/lib/slvoice-4.6.0017.21209.298329-windows64-298329.tar.bz2 - - name - windows64 - version - 4.6.0017.21209.298329 + 4.6.0017.22050 tut @@ -2458,7 +2444,7 @@ hash_algorithm md5 url - http://depot.alchemyviewer.org/pub/common/lib/tut-2008.11.30-common-201504282317.tar.bz2 + https://depot.alchemyviewer.org/pub/common/lib/tut-2008.11.30-common-201504282317.tar.bz2 name common @@ -2540,11 +2526,11 @@ archive hash - dae3118551880f593f8ee907c122f097 + ad1a435de73b7ee6d07f6c81a4cb1910 hash_algorithm md5 url - http://depot.alchemyviewer.org/pub/windows64/lib-vc14/uriparser-0.8.4-windows64-201512081840.tar.bz2 + https://depot.alchemyviewer.org/pub/windows64/lib-vc142/uriparser-0.8.4-windows64-201712251116.tar.bz2 name windows64 @@ -2572,11 +2558,11 @@ archive hash - a38ec464042e1d5e67231d9bcd181ae2 + f193ec9e594d857d22c067c6e52622a9 hash_algorithm md5 url - https://depot.alchemyviewer.org/pub/windows/lib-vc14/vcredist-14.0.23918.0-windows-201606250656.tar.bz2 + https://depot.alchemyviewer.org/pub/windows/lib-vc141/vcredist-14.10.25017.0-windows-201705270440.tar.bz2 name windows @@ -2586,18 +2572,18 @@ archive hash - 0d688527ab7d08f6b7c7a5f73175e4f8 + e895f4b5d24b372a360c3a8fe3bc0398 hash_algorithm md5 url - https://depot.alchemyviewer.org/pub/windows64/lib-vc14/vcredist-14.0.23918.0-windows64-201606250656.tar.bz2 + https://depot.alchemyviewer.org/pub/windows64/lib-vc142/vcredist-14.12.25810.0-windows64-201712251445.tar.bz2 name windows64 version - 14.0.23918.0 + 14.12.25810.0 xmlrpc-epi @@ -2672,11 +2658,11 @@ archive hash - 1afa5a6bdbc5689e14120628dc0fc124 + 59f0be2732e93eceaa155d98c2fcee9c hash_algorithm md5 url - http://depot.alchemyviewer.org/pub/windows64/lib-vc14/xmlrpc_epi-0.54.2-windows64-201603261459.tar.bz2 + https://depot.alchemyviewer.org/pub/windows64/lib-vc142/xmlrpc_epi-0.54.2-windows64-201712260035.tar.bz2 name windows64 @@ -2688,7 +2674,7 @@ zlib copyright - Copyright (C) 1995-2013 Jean-loup Gailly and Mark Adler + Copyright (C) 1995-2017 Jean-loup Gailly and Mark Adler description Zlib Data Compression Library license @@ -2758,18 +2744,18 @@ archive hash - 5b3a58a6a939e83f94137171b7f814de + ed6da4296e2fdfc132b4f12d35890ada hash_algorithm md5 url - http://depot.alchemyviewer.org/pub/windows64/lib-vc14/zlib-1.2.8-windows64-201512071625.tar.bz2 + https://depot.alchemyviewer.org/pub/windows64/lib-vc142/zlib-1.2.11-windows64-201712260711.tar.bz2 name windows64 version - 1.2.8 + 1.2.11 package_description @@ -3013,7 +2999,7 @@ windows build_directory - build-vc140 + build-vc141 configurations RelWithDebInfo @@ -3053,8 +3039,8 @@ options -G - "Visual Studio 14" - -DCMAKE_SYSTEM_VERSION="10.0.10586.0" + "Visual Studio 15" + -DCMAKE_SYSTEM_VERSION="10.0.16299.0" -DINSTALL_PROPRIETARY=FALSE @@ -3100,8 +3086,8 @@ options -G - "Visual Studio 14" - -DCMAKE_SYSTEM_VERSION="10.0.10586.0" + "Visual Studio 15" + -DCMAKE_SYSTEM_VERSION="10.0.16299.0" -DINSTALL_PROPRIETARY=FALSE @@ -3115,7 +3101,7 @@ windows64 build_directory - build-vc140-x86_64 + build-vc141-x86_64 configurations RelWithDebInfo @@ -3155,8 +3141,8 @@ options -G - "Visual Studio 14 Win64" - -DCMAKE_SYSTEM_VERSION="10.0.10586.0" + "Visual Studio 15 Win64" + -DCMAKE_SYSTEM_VERSION="10.0.16299.0" -DWORD_SIZE:STRING=64 -DINSTALL_PROPRIETARY=FALSE @@ -3203,8 +3189,8 @@ options -G - "Visual Studio 14 Win64" - -DCMAKE_SYSTEM_VERSION="10.0.10586.0" + "Visual Studio 15 Win64" + -DCMAKE_SYSTEM_VERSION="10.0.16299.0" -DWORD_SIZE:STRING=64 -DINSTALL_PROPRIETARY=FALSE diff --git a/indra/cmake/CURL.cmake b/indra/cmake/CURL.cmake index 557436cb7..aed230279 100644 --- a/indra/cmake/CURL.cmake +++ b/indra/cmake/CURL.cmake @@ -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) diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake index 0f3c98785..e500ac753 100644 --- a/indra/cmake/Copy3rdPartyLibs.cmake +++ b/indra/cmake/Copy3rdPartyLibs.cmake @@ -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) diff --git a/indra/cmake/OpenSSL.cmake b/indra/cmake/OpenSSL.cmake index 2860a800e..8456fc1d7 100644 --- a/indra/cmake/OpenSSL.cmake +++ b/indra/cmake/OpenSSL.cmake @@ -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) diff --git a/indra/llcommon/llapp.cpp b/indra/llcommon/llapp.cpp index 69f26a253..b6498ffbf 100644 --- a/indra/llcommon/llapp.cpp +++ b/indra/llcommon/llapp.cpp @@ -53,7 +53,7 @@ // Windows uses structured exceptions, so it's handled a bit differently. // #if LL_WINDOWS -#include "windows.h" +#include LONG WINAPI default_windows_exception_handler(struct _EXCEPTION_POINTERS *exception_infop); BOOL ConsoleCtrlHandler(DWORD fdwCtrlType); diff --git a/indra/llcommon/llapr.h b/indra/llcommon/llapr.h index 9baddef5f..9cfa9f7b4 100644 --- a/indra/llcommon/llapr.h +++ b/indra/llcommon/llapr.h @@ -33,6 +33,8 @@ #include // Need PATH_MAX in APR headers... #endif +#include "llwin32headerslean.h" + #include #include "apr_thread_proc.h" diff --git a/indra/llcommon/llprocesslauncher.h b/indra/llcommon/llprocesslauncher.h index 0b96f3f7b..f9b15858f 100644 --- a/indra/llcommon/llprocesslauncher.h +++ b/indra/llcommon/llprocesslauncher.h @@ -33,9 +33,7 @@ #ifndef LL_LLPROCESSLAUNCHER_H #define LL_LLPROCESSLAUNCHER_H -#if LL_WINDOWS -#include -#endif +#include "llwin32headerslean.h" /* diff --git a/indra/llcommon/llwin32headers.h b/indra/llcommon/llwin32headers.h index 8cfa40ada..9d1e40d8c 100644 --- a/indra/llcommon/llwin32headers.h +++ b/indra/llcommon/llwin32headers.h @@ -33,6 +33,7 @@ #endif #undef WIN32_LEAN_AND_MEAN #include +#include #include // reset to default, which is lean #define WIN32_LEAN_AND_MEAN diff --git a/indra/llcommon/llwin32headerslean.h b/indra/llcommon/llwin32headerslean.h index 314e7a85d..d64c307cc 100644 --- a/indra/llcommon/llwin32headerslean.h +++ b/indra/llcommon/llwin32headerslean.h @@ -33,6 +33,7 @@ #endif #define WIN32_LEAN_AND_MEAN #include +#include #include #undef NOMINMAX #endif diff --git a/indra/llmessage/CMakeLists.txt b/indra/llmessage/CMakeLists.txt index abce10bbe..84308e2ba 100644 --- a/indra/llmessage/CMakeLists.txt +++ b/indra/llmessage/CMakeLists.txt @@ -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 diff --git a/indra/llrender/llglheaders.h b/indra/llrender/llglheaders.h index 7801b6c58..044c4f1f6 100644 --- a/indra/llrender/llglheaders.h +++ b/indra/llrender/llglheaders.h @@ -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 -#include +#include "llwin32headerslean.h" //---------------------------------------------------------------------------- #include diff --git a/indra/llwindow/llkeyboardwin32.cpp b/indra/llwindow/llkeyboardwin32.cpp index a06d5ec1d..47992c0e7 100644 --- a/indra/llwindow/llkeyboardwin32.cpp +++ b/indra/llwindow/llkeyboardwin32.cpp @@ -28,9 +28,7 @@ #include "linden_common.h" -#define WIN32_LEAN_AND_MEAN -#include -#include +#include "llwin32headerslean.h" #include "llkeyboardwin32.h" diff --git a/indra/llwindow/llwindowwin32.h b/indra/llwindow/llwindowwin32.h index 6b100fd9a..46f2200f7 100644 --- a/indra/llwindow/llwindowwin32.h +++ b/indra/llwindow/llwindowwin32.h @@ -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 -#include +#include "llwin32headerslean.h" #include "llwindow.h" #include "llwindowcallbacks.h" diff --git a/indra/newview/NACLantispam.cpp b/indra/newview/NACLantispam.cpp index bcdab0869..dfeb7a5c9 100644 --- a/indra/newview/NACLantispam.cpp +++ b/indra/newview/NACLantispam.cpp @@ -35,8 +35,8 @@ U32 NACLAntiSpamRegistry::globalAmount; U32 NACLAntiSpamRegistry::globalTime; bool NACLAntiSpamRegistry::bGlobalQueue; NACLAntiSpamQueue* NACLAntiSpamRegistry::queues[NACLAntiSpamRegistry::QUEUE_MAX] = {0}; -std::tr1::unordered_map NACLAntiSpamRegistry::globalEntries; -std::tr1::unordered_map::iterator NACLAntiSpamRegistry::it2; +boost::unordered_map NACLAntiSpamRegistry::globalEntries; +boost::unordered_map::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"}; diff --git a/indra/newview/NACLantispam.h b/indra/newview/NACLantispam.h index e0476e267..321bbde72 100644 --- a/indra/newview/NACLantispam.h +++ b/indra/newview/NACLantispam.h @@ -15,7 +15,7 @@ #ifndef NACLANTISPAM_H #define NACLANTISPAM_H -#include +#include #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 entries; - std::tr1::unordered_map::iterator it; + boost::unordered_map entries; + boost::unordered_map::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 globalEntries; - static std::tr1::unordered_map::iterator it2; + static boost::unordered_map globalEntries; + static boost::unordered_map::iterator it2; static U32 globalTime; static U32 globalAmount; static bool bGlobalQueue; diff --git a/indra/newview/lgghunspell_wrapper.h b/indra/newview/lgghunspell_wrapper.h index e89b49af2..df55ece36 100644 --- a/indra/newview/lgghunspell_wrapper.h +++ b/indra/newview/lgghunspell_wrapper.h @@ -23,7 +23,7 @@ #ifdef near #undef near #endif -#include +#include #pragma pop_macro("near") #else #include diff --git a/indra/newview/llviewerprecompiledheaders.h b/indra/newview/llviewerprecompiledheaders.h index 466c69b28..44d52371f 100644 --- a/indra/newview/llviewerprecompiledheaders.h +++ b/indra/newview/llviewerprecompiledheaders.h @@ -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 -#include -#endif +#include "llwin32headerslean.h" #include #include diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index b979b10b0..30ae395d8 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -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':