From cf7eb79fa7eadd6d76890d2a3f9da905de8f4691 Mon Sep 17 00:00:00 2001
From: Don Kjer <don@lindenlab.com>
Date: Sat, 8 Sep 2012 04:39:11 +0000
Subject: Removed most llappearance -> llui dependencies (LLTrans remains). 
 Moved LLInventoryIcon::EIconName into LLInventoryType.  Moved LLInventoryIcon
 back to newview.  Moved LLUI gl_* functions into llrender.

---
 indra/llui/CMakeLists.txt | 2 --
 1 file changed, 2 deletions(-)

(limited to 'indra/llui/CMakeLists.txt')

diff --git a/indra/llui/CMakeLists.txt b/indra/llui/CMakeLists.txt
index d92b6aa1c0..4d4b8edc37 100644
--- a/indra/llui/CMakeLists.txt
+++ b/indra/llui/CMakeLists.txt
@@ -109,7 +109,6 @@ set(llui_SOURCE_FILES
     lluicolortable.cpp
     lluictrl.cpp
     lluictrlfactory.cpp
-    lluiimage.cpp
     lluistring.cpp
     llundo.cpp
     llurlaction.cpp
@@ -219,7 +218,6 @@ set(llui_HEADER_FILES
     lluifwd.h
     llui.h
     lluicolor.h
-    lluiimage.h
     lluistring.h
     llundo.h
     llurlaction.h
-- 
cgit v1.2.3


From c06c35609c6683731eaea283468f6b32af18fea2 Mon Sep 17 00:00:00 2001
From: Don Kjer <don@lindenlab.com>
Date: Thu, 11 Oct 2012 00:09:04 +0000
Subject: Updating linux build to gcc4.6

---
 indra/llui/CMakeLists.txt | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'indra/llui/CMakeLists.txt')

diff --git a/indra/llui/CMakeLists.txt b/indra/llui/CMakeLists.txt
index 4d4b8edc37..cc76d53c96 100644
--- a/indra/llui/CMakeLists.txt
+++ b/indra/llui/CMakeLists.txt
@@ -25,6 +25,10 @@ include_directories(
     ${LLXML_INCLUDE_DIRS}
     ${LIBS_PREBUILD_DIR}/include/hunspell
     )
+include_directories(SYSTEM
+    ${LLCOMMON_SYSTEM_INCLUDE_DIRS}
+    ${LLXML_SYSTEM_INCLUDE_DIRS}
+    )
 
 set(llui_SOURCE_FILES
     llaccordionctrl.cpp
-- 
cgit v1.2.3