From d1b6b78206f0cd1d8f4a5cbae4b99425b43d5fc8 Mon Sep 17 00:00:00 2001
From: Siana Gearz <siana.sg@live.de>
Date: Thu, 5 Jul 2012 22:38:24 +0200
Subject: [PATCH] Fixing windows build

---
 indra/cmake/CopyWinLibs.cmake    | 4 ++++
 indra/cmake/LLWindow.cmake       | 6 ++----
 indra/cmake/UI.cmake             | 4 +---
 indra/newview/viewer_manifest.py | 2 ++
 install.xml                      | 4 ++--
 5 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/indra/cmake/CopyWinLibs.cmake b/indra/cmake/CopyWinLibs.cmake
index f9b6dd5ce..aa345e9cc 100644
--- a/indra/cmake/CopyWinLibs.cmake
+++ b/indra/cmake/CopyWinLibs.cmake
@@ -29,6 +29,8 @@ set(debug_files
     libapr-1.dll
     libaprutil-1.dll
     libapriconv-1.dll
+    libeay32.dll
+    ssleay32.dll
     )
 
 copy_if_different(
@@ -206,6 +208,8 @@ set(release_files
     libapr-1.dll
     libaprutil-1.dll
     libapriconv-1.dll
+    libeay32.dll
+    ssleay32.dll
     )
 
 if(FMODEX)
diff --git a/indra/cmake/LLWindow.cmake b/indra/cmake/LLWindow.cmake
index e32409020..f8d2a2902 100644
--- a/indra/cmake/LLWindow.cmake
+++ b/indra/cmake/LLWindow.cmake
@@ -13,15 +13,13 @@ if (STANDALONE)
       SDL_LIBRARY
       )
 else (STANDALONE)
-  if (NOT DARWIN)
+  if (LINUX)
     use_prebuilt_binary(mesa)
-  endif (NOT DARWIN)
-  if (LINUX AND VIEWER)
     use_prebuilt_binary(SDL)
     set (SDL_FOUND TRUE)
     set (SDL_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR})
     set (SDL_LIBRARY SDL directfb fusion direct)
-  endif (LINUX AND VIEWER)
+  endif (LINUX)
 endif (STANDALONE)
 
 if (SDL_FOUND)
diff --git a/indra/cmake/UI.cmake b/indra/cmake/UI.cmake
index b0609b652..679b5bf3a 100644
--- a/indra/cmake/UI.cmake
+++ b/indra/cmake/UI.cmake
@@ -31,11 +31,9 @@ if (STANDALONE)
     add_definitions(${${pkg}_CFLAGS_OTHERS})
   endforeach(pkg)
 else (STANDALONE)
-  if (NOT DARWIN)
+  if (LINUX)
     use_prebuilt_binary(glib)		# gtk-etc needs glib
     use_prebuilt_binary(gtk-atk-pango-glib)
-  endif (NOT DARWIN)
-  if (LINUX)
     set(UI_LIBRARIES
         atk-1.0
         X11
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 402fb836d..8e037e4e5 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -275,6 +275,8 @@ class WindowsManifest(ViewerManifest):
             print "Skipping llcommon.dll (assuming llcommon was linked statically)"
           self.end_prefix()
         if self.prefix(src="../../libraries/i686-win32/lib/release", dst=""):
+          self.path("libeay32.dll")
+          self.path("ssleay32.dll")
           try:
             self.path('libapr-1.dll')
             self.path('libaprutil-1.dll')
diff --git a/install.xml b/install.xml
index c421cae79..296fb48e2 100644
--- a/install.xml
+++ b/install.xml
@@ -951,9 +951,9 @@
           <key>windows</key>
           <map>
             <key>md5sum</key>
-            <string>dd85209081b832e836de6e1538541d89</string>
+            <string>30062b843657b745ab297bb674ac0b6e</string>
             <key>url</key>
-            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/openSSL-0.9.8j-windows-20090129.tar.bz2</uri>
+            <uri>https://github.com/downloads/LightDrake/Public-Libraries/openssl-1.0.0g-windows-20120207.tar.bz2</uri>
           </map>
         </map>
       </map>