Merge remote-tracking branch 'siana/master'

2012-02-19 23:54:59 +01:00
parent 66ccff964b c3aa321d51
commit 39f8deb498
40 changed files with 243 additions and 314 deletions
--- a/indra/cmake/UI.cmake
+++ b/indra/cmake/UI.cmake
@@ -38,6 +38,7 @@ else (STANDALONE)
  if (LINUX)
    set(UI_LIBRARIES
        atk-1.0
+        X11
        gdk-x11-2.0
        gdk_pixbuf-2.0
        Xinerama
--- a/indra/cmake/WebKitLibPlugin.cmake
+++ b/indra/cmake/WebKitLibPlugin.cmake
@@ -67,6 +67,10 @@ elseif (LINUX)
        QtNetwork
        QtGui
        QtCore
+        crypto
+        ssl
+#       qgif
+#       qjpeg
        jscore
        jpeg
        fontconfig