Webp as dll

autobuild.xml

@@ -1946,11 +1946,11 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>3de8bf840cde51ec061ae1c12e39b620</string>
+              <string>9a13d5b3d5a4a038175461defb801963</string>
               <key>hash_algorithm</key>
               <string>md5</string>
               <key>url</key>
-              <string>https://pkg.alchemyviewer.org/repository/autobuild-external/tmpanext/libwebp-1.1.0.200900053-windows-200900053.tar.bz2</string>
+              <string>https://pkg.alchemyviewer.org/repository/autobuild-external/libwebp/windows/libwebp-1.1.0.304-windows-304.tar.bz2</string>
             </map>
             <key>name</key>
             <string>windows</string>
@@ -1960,18 +1960,18 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>0063c0a3053b222014b6bec37a1311d4</string>
+              <string>85c1623e1d7bdf36cc3c7eb937749ea7</string>
               <key>hash_algorithm</key>
               <string>md5</string>
               <key>url</key>
-              <string>https://pkg.alchemyviewer.org/repository/autobuild-external/tmpanext/libwebp-1.1.0.200900052-windows64-200900052.tar.bz2</string>
+              <string>https://pkg.alchemyviewer.org/repository/autobuild-external/libwebp/windows64/libwebp-1.1.0.304-windows64-304.tar.bz2</string>
             </map>
             <key>name</key>
             <string>windows64</string>
           </map>
         </map>
         <key>version</key>
-        <string>1.1.0.200900052</string>
+        <string>1.1.0.304</string>
       </map>
       <key>libxml2</key>
       <map>

indra/cmake/00-Common.cmake

@@ -179,6 +179,11 @@ if (WINDOWS)
       /DBOOST_CONFIG_SUPPRESS_OUTDATED_MESSAGE
       )
 
+  # library linkage defines
+  add_definitions(
+      /DWEBP_DLL
+  )
+
   if("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
     add_definitions(-DBOOST_USE_WINDOWS_H)
   endif()

indra/cmake/Copy3rdPartyLibs.cmake

@@ -62,6 +62,7 @@ if(WINDOWS)
         glod.dll
         libhunspell.dll
         epoxy-0.dll
+        libwebp.dll
         )
 
     # Filenames are different for 32/64 bit BugSplat file and we don't

indra/cmake/WebP.cmake

@@ -9,7 +9,10 @@ if (USESYSTEMLIBS)
 else (USESYSTEMLIBS)
   use_prebuilt_binary(libwebp)
   if (WINDOWS)
-    set(WEBP_LIBRARIES libwebp)
+    set(WEBP_LIBRARIES 
+        debug libwebp_debug_dll
+        optimized libwebp_dll
+        )
     set(WEBP_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/webp)
   elseif(DARWIN)
     set(WEBP_LIBRARIES webp)

indra/newview/viewer_manifest.py

@@ -529,6 +529,8 @@ def construct(self):
             # For OpenGL extensions
             self.path("epoxy-0.dll")
 
+            self.path("libwebp.dll")
+
             # SLVoice executable
             with self.prefix(src=os.path.join(pkgdir, 'bin', 'release')):
                 self.path("SLVoice.exe")