aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden
diff options
context:
space:
mode:
authorJacek Antonelli2009-02-27 21:05:41 -0600
committerJacek Antonelli2009-02-27 21:05:41 -0600
commit67569e56262cd62760a4a10faeeb7190c5a88e50 (patch)
treeb53a5e23ada771024332638fb8aa89c73a9e48ef /linden
parentMerge commit 'mccabe/next' into next (diff)
downloadmeta-impy-67569e56262cd62760a4a10faeeb7190c5a88e50.zip
meta-impy-67569e56262cd62760a4a10faeeb7190c5a88e50.tar.gz
meta-impy-67569e56262cd62760a4a10faeeb7190c5a88e50.tar.bz2
meta-impy-67569e56262cd62760a4a10faeeb7190c5a88e50.tar.xz
LLUI's CMakeList needs LLMedia cmake stuff.
Diffstat (limited to 'linden')
-rw-r--r--linden/indra/llui/CMakeLists.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/linden/indra/llui/CMakeLists.txt b/linden/indra/llui/CMakeLists.txt
index 77efec5..b6de3d1 100644
--- a/linden/indra/llui/CMakeLists.txt
+++ b/linden/indra/llui/CMakeLists.txt
@@ -7,6 +7,7 @@ include(LLAudio)
7include(LLCommon) 7include(LLCommon)
8include(LLImage) 8include(LLImage)
9include(LLMath) 9include(LLMath)
10include(LLMedia)
10include(LLMessage) 11include(LLMessage)
11include(LLRender) 12include(LLRender)
12include(LLWindow) 13include(LLWindow)
@@ -18,6 +19,7 @@ include_directories(
18 ${LLCOMMON_INCLUDE_DIRS} 19 ${LLCOMMON_INCLUDE_DIRS}
19 ${LLIMAGE_INCLUDE_DIRS} 20 ${LLIMAGE_INCLUDE_DIRS}
20 ${LLMATH_INCLUDE_DIRS} 21 ${LLMATH_INCLUDE_DIRS}
22 ${LLMEDIA_INCLUDE_DIRS}
21 ${LLMESSAGE_INCLUDE_DIRS} 23 ${LLMESSAGE_INCLUDE_DIRS}
22 ${LLRENDER_INCLUDE_DIRS} 24 ${LLRENDER_INCLUDE_DIRS}
23 ${LLWINDOW_INCLUDE_DIRS} 25 ${LLWINDOW_INCLUDE_DIRS}