VC10 fixes

indra/cmake/00-Common.cmake

@@ -99,7 +99,7 @@ if (WINDOWS)
     elseif (MSVC90)
 	    set(MSVC_DIR 9.0)
 	    set(MSVC_SUFFIX 90)
-    elseif (MSVC100)
+    elseif (MSVC10)
 	    set(MSVC_DIR 10.0)
 	    set(MSVC_SUFFIX 100)
     endif (MSVC71)

indra/cmake/CopyWinLibs.cmake

@@ -41,7 +41,7 @@ set(all_targets ${all_targets} ${out_targets})
 # Debug config runtime files required for the plugin test mule
 set(plugintest_debug_src_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/debug")
 set(plugintest_debug_files
-    #libeay32.dll
+    libeay32.dll
     libglib-2.0-0.dll
     libgmodule-2.0-0.dll
     libgobject-2.0-0.dll
@@ -51,7 +51,7 @@ set(plugintest_debug_files
     qtnetworkd4.dll
     qtopengld4.dll
     qtwebkitd4.dll
-    #ssleay32.dll
+    ssleay32.dll
     )
 copy_if_different(
     ${plugintest_debug_src_dir}
@@ -90,7 +90,7 @@ set(all_targets ${all_targets} ${out_targets})
 # Release & ReleaseDebInfo config runtime files required for the plugin test mule
 set(plugintest_release_src_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release")
 set(plugintest_release_files
-    #libeay32.dll
+    libeay32.dll
     libglib-2.0-0.dll
     libgmodule-2.0-0.dll
     libgobject-2.0-0.dll
@@ -101,7 +101,7 @@ set(plugintest_release_files
     qtnetwork4.dll
     qtopengl4.dll
     qtwebkit4.dll
-    #ssleay32.dll
+    ssleay32.dll
     )
 copy_if_different(
     ${plugintest_release_src_dir}
@@ -188,13 +188,13 @@ set(all_targets ${all_targets} ${out_targets})
 # Debug config runtime files required for the plugins
 set(plugins_debug_src_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/debug")
 set(plugins_debug_files
-    #libeay32.dll
+    libeay32.dll
     qtcored4.dll
     qtguid4.dll
     qtnetworkd4.dll
     qtopengld4.dll
     qtwebkitd4.dll
-    #ssleay32.dll
+    ssleay32.dll
     )
 copy_if_different(
     ${plugins_debug_src_dir}
@@ -207,13 +207,13 @@ set(all_targets ${all_targets} ${out_targets})
 # Release & ReleaseDebInfo config runtime files required for the plugins
 set(plugins_release_src_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release")
 set(plugins_release_files
-    #libeay32.dll
+    libeay32.dll
     qtcore4.dll
     qtgui4.dll
     qtnetwork4.dll
     qtopengl4.dll
     qtwebkit4.dll
-    #ssleay32.dll
+    ssleay32.dll
     )
 copy_if_different(
     ${plugins_release_src_dir}

indra/cmake/JsonCpp.cmake

@@ -1,22 +1,22 @@
-# -*- cmake -*-
-
-include(Prebuilt)
-
-set(JSONCPP_FIND_QUIETLY ON)
-set(JSONCPP_FIND_REQUIRED ON)
-
-if (STANDALONE)
-  include(FindJsonCpp)
-else (STANDALONE)
-  use_prebuilt_binary(jsoncpp)
-  if (WINDOWS)
-    set(JSONCPP_LIBRARIES 
-      debug json_vc${MSVC_SUFFIX}d
-      optimized json_vc${MSVC_SUFFIX})
-  elseif (DARWIN)
-    set(JSONCPP_LIBRARIES json_mac-universal-gcc_libmt)
-  elseif (LINUX)
-    set(JSONCPP_LIBRARIES jsoncpp)
-  endif (WINDOWS)
-  set(JSONCPP_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/jsoncpp)
-endif (STANDALONE)
+# -*- cmake -*-
+
+include(Prebuilt)
+
+set(JSONCPP_FIND_QUIETLY ON)
+set(JSONCPP_FIND_REQUIRED ON)
+
+if (STANDALONE)
+  include(FindJsonCpp)
+else (STANDALONE)
+  use_prebuilt_binary(jsoncpp)
+  if (WINDOWS)
+    set(JSONCPP_LIBRARIES 
+      debug json_vc${MSVC_SUFFIX}d
+      optimized json_vc${MSVC_SUFFIX})
+  elseif (DARWIN)
+    set(JSONCPP_LIBRARIES json_mac-universal-gcc_libmt)
+  elseif (LINUX)
+    set(JSONCPP_LIBRARIES jsoncpp)
+  endif (WINDOWS)
+  set(JSONCPP_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/json)
+endif (STANDALONE)

indra/newview/viewer_manifest.py

@@ -223,14 +223,14 @@ class WindowsManifest(ViewerManifest):
             
         # For WebKit/Qt plugin runtimes
         if self.prefix(src="../../libraries/i686-win32/lib/release", dst="llplugin"):
-            #self.path("libeay32.dll")
+            self.path("libeay32.dll")
             self.path("qtcore4.dll")
             self.path("qtgui4.dll")
             self.path("qtnetwork4.dll")
             self.path("qtopengl4.dll")
             self.path("qtwebkit4.dll")
             self.path("qtxmlpatterns4.dll")
-            #self.path("ssleay32.dll")
+            self.path("ssleay32.dll")
             self.end_prefix()
 
         # For WebKit/Qt plugin runtimes (image format plugins)

install.xml

@@ -936,9 +936,9 @@ anguage Infrstructure (CLI) international standard</string>
           <key>windows</key>
           <map>
             <key>md5sum</key>
-            <string>a3e926b2dee29bbddfeff907102ca2b7</string>
+            <string>999b265a3af47eb13e9a380d042a1763</string>
             <key>url</key>
-            <uri>https://github.com/downloads/siana/SingularityViewer/llqtwebkit-4.7.1-windows-20110317.tar.bz2</uri>
+            <uri>https://github.com/downloads/siana/SingularityViewer/llqtwebkit-4.7.1-windows-20110320.tar.bz2</uri>
           </map>
         </map>
       </map>