diff --git a/autobuild.xml b/autobuild.xml
index 89cf6aede41af2d1a65d18e16b51c47eebbad3fb..f3cded3389a7ef73256119f1672fa567e811aa91 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -102,9 +102,11 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>83b4a047db5f7ee462753d91e6277cba</string>
+ <string>03a9228600bc6aba6ee06f214ef3e64f</string>
+ <key>hash_algorithm</key>
+ <string>md5</string>
<key>url</key>
- <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/55143/512317/apr_suite-1.4.5.539073-windows-539073.tar.bz2</string>
+ <string>https://pkg.alchemyviewer.org/repository/autobuild-external/apr-suite/windows/apr_suite-1.4.5.328-windows-328.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>
@@ -114,16 +116,18 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>b3bbf168b39e25c08cc1febddeb33332</string>
+ <string>bcf0878344c1c9c6af51994d0e95fcf9</string>
+ <key>hash_algorithm</key>
+ <string>md5</string>
<key>url</key>
- <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/55139/512304/apr_suite-1.4.5.539073-windows64-539073.tar.bz2</string>
+ <string>https://pkg.alchemyviewer.org/repository/autobuild-external/apr-suite/windows64/apr_suite-1.4.5.328-windows64-328.tar.bz2</string>
</map>
<key>name</key>
<string>windows64</string>
</map>
</map>
<key>version</key>
- <string>1.4.5.539073</string>
+ <string>1.4.5.328</string>
</map>
<key>boost</key>
<map>
@@ -712,9 +716,11 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>c509f8afa1e02f4c16232cce7f6855f8</string>
+ <string>4f6ce988932eb420afdb4eacd75dbce8</string>
+ <key>hash_algorithm</key>
+ <string>md5</string>
<key>url</key>
- <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/55056/512080/expat-2.1.1.538990-windows-538990.tar.bz2</string>
+ <string>https://pkg.alchemyviewer.org/repository/autobuild-external/expat/windows/expat-2.2.9.323-windows-323.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>
@@ -724,16 +730,18 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>aba97cfdf44c04dbfcac89c7cb472580</string>
+ <string>49dc81485705a32d345b4af6dab4ac1c</string>
+ <key>hash_algorithm</key>
+ <string>md5</string>
<key>url</key>
- <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/55054/512068/expat-2.1.1.538990-windows64-538990.tar.bz2</string>
+ <string>https://pkg.alchemyviewer.org/repository/autobuild-external/expat/windows64/expat-2.2.9.323-windows64-323.tar.bz2</string>
</map>
<key>name</key>
<string>windows64</string>
</map>
</map>
<key>version</key>
- <string>2.1.1.538990</string>
+ <string>2.2.9.323</string>
</map>
<key>fmodstudio</key>
<map>
@@ -3094,9 +3102,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
<key>archive</key>
<map>
<key>hash</key>
- <string>94643b7cebb449f049fa9e32ae682bcd</string>
+ <string>eb26c5779a2bf53f2038a89282bed227</string>
+ <key>hash_algorithm</key>
+ <string>md5</string>
<key>url</key>
- <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/55138/512288/xmlrpc_epi-0.54.1.539072-windows-539072.tar.bz2</string>
+ <string>https://pkg.alchemyviewer.org/repository/autobuild-external/xmlrpc-epi/windows/xmlrpc_epi-0.54.1.326-windows-326.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>
@@ -3106,16 +3116,18 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
<key>archive</key>
<map>
<key>hash</key>
- <string>c409de1974a879291ce7daaf52348d85</string>
+ <string>e33a10439dbd430e158bdca16da2adc4</string>
+ <key>hash_algorithm</key>
+ <string>md5</string>
<key>url</key>
- <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/55137/512279/xmlrpc_epi-0.54.1.539072-windows64-539072.tar.bz2</string>
+ <string>https://pkg.alchemyviewer.org/repository/autobuild-external/xmlrpc-epi/windows64/xmlrpc_epi-0.54.1.326-windows64-326.tar.bz2</string>
</map>
<key>name</key>
<string>windows64</string>
</map>
</map>
<key>version</key>
- <string>0.54.1.539072</string>
+ <string>0.54.1.326</string>
</map>
<key>zlib</key>
<map>
diff --git a/indra/cmake/APR.cmake b/indra/cmake/APR.cmake
index 23559cd028aa457206854ca9e2c289adc80b0017..c0bd0dc31dac31f1e3cf05504d82ee3efa449f7c 100644
--- a/indra/cmake/APR.cmake
+++ b/indra/cmake/APR.cmake
@@ -12,11 +12,7 @@ if (USESYSTEMLIBS)
else (USESYSTEMLIBS)
use_prebuilt_binary(apr_suite)
if (WINDOWS)
- if (LLCOMMON_LINK_SHARED)
- set(APR_selector "lib")
- else (LLCOMMON_LINK_SHARED)
- set(APR_selector "")
- endif (LLCOMMON_LINK_SHARED)
+ set(APR_selector "lib")
set(APR_LIBRARIES
debug ${ARCH_PREBUILT_DIRS_DEBUG}/${APR_selector}apr-1.lib
optimized ${ARCH_PREBUILT_DIRS_RELEASE}/${APR_selector}apr-1.lib
diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake
index d27ae6480c139970d48b46439c7897b60105ac01..3f7cb8be5fb75a8b0f26da352bcff9f5e6f5e74b 100644
--- a/indra/cmake/Copy3rdPartyLibs.cmake
+++ b/indra/cmake/Copy3rdPartyLibs.cmake
@@ -62,6 +62,7 @@ if(WINDOWS)
boost_stacktrace_windbg-mt${addrsfx}.dll
boost_thread-mt${addrsfx}.dll
epoxy-0.dll
+ ${EXPAT_COPY}
freetype.dll
glod.dll
libapr-1.dll
@@ -79,6 +80,7 @@ if(WINDOWS)
openjpeg.dll
ssleay32.dll
uriparser.dll
+ xmlrpc-epi.dll
zlib1.dll
)
diff --git a/indra/cmake/EXPAT.cmake b/indra/cmake/EXPAT.cmake
index cddc71b227525f1d4f6b18879c92b59d2c371f33..9e1242b5998b00f26fc43fa34f354da502ebb437 100644
--- a/indra/cmake/EXPAT.cmake
+++ b/indra/cmake/EXPAT.cmake
@@ -9,8 +9,10 @@ if (USESYSTEMLIBS)
else (USESYSTEMLIBS)
use_prebuilt_binary(expat)
if (WINDOWS)
- set(EXPAT_LIBRARIES libexpatMT)
- set(EXPAT_COPY libexpatMT.dll)
+ set(EXPAT_LIBRARIES
+ debug libexpatd.lib
+ optimized libexpat.lib)
+ set(EXPAT_COPY libexpat.dll)
else (WINDOWS)
set(EXPAT_LIBRARIES expat)
if (DARWIN)
diff --git a/indra/llcommon/llpreprocessor.h b/indra/llcommon/llpreprocessor.h
index ba6e598382c55ecc511f09b8faeebac59d967b68..15689e8d398ea07cadb1b4ecb68a894e789bd78c 100644
--- a/indra/llcommon/llpreprocessor.h
+++ b/indra/llcommon/llpreprocessor.h
@@ -34,15 +34,6 @@
#include <endian.h>
#endif // LL_LINUX
-#if LL_SOLARIS
-# ifdef __sparc // Since we're talking Solaris 10 and up, only 64 bit is supported.
-# define LL_BIG_ENDIAN 1
-# define LL_SOLARIS_ALIGNED_CPU 1 // used to designate issues where SPARC alignment is addressed
-# define LL_SOLARIS_NON_MESA_GL 1 // The SPARC GL does not provide a MESA-based GL API
-# endif
-# include <sys/isa_defs.h> // ensure we know which end is up
-#endif // LL_SOLARIS
-
#if (defined(LL_WINDOWS) || (defined(LL_LINUX) && (__BYTE_ORDER == __LITTLE_ENDIAN)) || (defined(LL_DARWIN) && defined(__LITTLE_ENDIAN__)) || (defined(LL_SOLARIS) && defined(__i386)))
#define LL_LITTLE_ENDIAN 1
#else
@@ -110,23 +101,6 @@
# define LL_THREAD_LOCAL __thread
#endif
-// Static linking with apr on windows needs to be declared.
-#if LL_WINDOWS && !LL_COMMON_LINK_SHARED
-#ifndef APR_DECLARE_STATIC
-#define APR_DECLARE_STATIC // For APR on Windows
-#endif
-#ifndef APU_DECLARE_STATIC
-#define APU_DECLARE_STATIC // For APR util on Windows
-#endif
-#endif
-
-#if defined(LL_WINDOWS)
-#ifndef XML_STATIC
-#define XML_STATIC
-#endif
-#endif // LL_WINDOWS
-
-
// Deal with VC6 problems
#if LL_MSVC
#pragma warning( 3 : 4701 ) // "local variable used without being initialized" Treat this as level 3, not level 4.
diff --git a/indra/llxml/llxmlnode.h b/indra/llxml/llxmlnode.h
index f1c4075fe87fa21eb0e94b5da45bbb3b95b709a6..574dd77b57fbc0979a96d86253432a2e0668e2f6 100644
--- a/indra/llxml/llxmlnode.h
+++ b/indra/llxml/llxmlnode.h
@@ -27,9 +27,6 @@
#ifndef LL_LLXMLNODE_H
#define LL_LLXMLNODE_H
-#ifndef XML_STATIC
-#define XML_STATIC
-#endif
#ifdef LL_USESYSTEMLIBS
#include <expat.h>
#else
diff --git a/indra/llxml/llxmlparser.h b/indra/llxml/llxmlparser.h
index a5b210404f8d809383aea20b4583066795b37f65..54c4a838f38669c82bb36f6e4ce533e255e5156a 100644
--- a/indra/llxml/llxmlparser.h
+++ b/indra/llxml/llxmlparser.h
@@ -27,9 +27,6 @@
#ifndef LL_LLXMLPARSER_H
#define LL_LLXMLPARSER_H
-#ifndef XML_STATIC
-#define XML_STATIC
-#endif
#ifdef LL_USESYSTEMLIBS
#include <expat.h>
#else
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 13de9a92483baf1bffc7d5f02bdbf617f088e74f..4aee3af86305fc269b2e27daeaa5e8ffa35b418c 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -509,43 +509,63 @@ def construct(self):
# Get shared libs from the shared libs staging directory
with self.prefix(src=os.path.join(self.args['build'], os.pardir,
'sharedlibs', self.args['configuration'])):
+ # APR Libraries
+ self.path("libapr-1.dll")
+ self.path("libapriconv-1.dll")
+ self.path("libaprutil-1.dll")
+
+ # Boost Libraries
+ self.path("boost_context-mt*.dll")
+ self.path("boost_fiber-mt*.dll")
+ self.path("boost_filesystem-mt*.dll")
+ self.path("boost_program_options-mt*.dll")
+ self.path("boost_regex-mt*.dll")
+ self.path("boost_stacktrace_windbg-mt*.dll")
+ self.path("boost_thread-mt*.dll")
# Mesh 3rd party libs needed for auto LOD and collada reading
+ self.path("libcollada14dom23.dll")
+
try:
self.path("glod.dll")
except RuntimeError as err:
print err.message
print "Skipping GLOD library (assumming linked statically)"
- # Get fmodstudio dll, continue if missing
- if self.args['configuration'].lower() == 'debug':
- self.path("fmodL.dll")
- else:
- self.path("fmod.dll")
-
- # For textures
+ # For image support
+ self.path("libpng16*.dll")
+ self.path("libwebp.dll")
self.path("openjpeg.dll")
# For OpenGL extensions
self.path("epoxy-0.dll")
- self.path("boost_context-mt*.dll")
- self.path("boost_fiber-mt*.dll")
- self.path("boost_filesystem-mt*.dll")
- self.path("boost_program_options-mt*.dll")
- self.path("boost_regex-mt*.dll")
- self.path("boost_stacktrace_windbg-mt*.dll")
- self.path("boost_thread-mt*.dll")
- self.path("freetype.dll")
- self.path("libcollada14dom23.dll")
+ # Security
+ self.path("ssleay32.dll")
+ self.path("libeay32.dll")
+
+ # HTTP and Network
self.path("libcurl*.dll")
- self.path("libpng16*.dll")
- self.path("libwebp.dll")
+ self.path("nghttp2.dll")
+ self.path("xmlrpc-epi.dll")
+
+ # Hunspell
+ self.path("libhunspell.dll")
+
+ # Misc
+ self.path("libexpat.dll")
self.path("libxml2.dll")
self.path("minizip*.dll")
+ self.path("freetype.dll")
self.path("uriparser.dll")
self.path("zlib*1.dll")
+ # Get fmodstudio dll for audio engine, continue if missing
+ if self.args['configuration'].lower() == 'debug':
+ self.path("fmodL.dll")
+ else:
+ self.path("fmod.dll")
+
# SLVoice executable
with self.prefix(src=os.path.join(pkgdir, 'bin', 'release')):
self.path("SLVoice.exe")
@@ -557,16 +577,6 @@ def construct(self):
else:
self.path("vivoxsdk.dll")
self.path("ortp.dll")
-
- # Security
- self.path("ssleay32.dll")
- self.path("libeay32.dll")
-
- # HTTP/2
- self.path("nghttp2.dll")
-
- # Hunspell
- self.path("libhunspell.dll")
# BugSplat
if self.args.get('bugsplat'):