Merge remote-tracking branch 'siana/AltCompilers' into AltCompilers

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)

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)

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

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')