diff options
Diffstat (limited to 'linden/indra/cmake/UI.cmake')
-rw-r--r-- | linden/indra/cmake/UI.cmake | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/linden/indra/cmake/UI.cmake b/linden/indra/cmake/UI.cmake index f529f5b..b70a531 100644 --- a/linden/indra/cmake/UI.cmake +++ b/linden/indra/cmake/UI.cmake | |||
@@ -31,13 +31,13 @@ if (STANDALONE) | |||
31 | add_definitions(${${pkg}_CFLAGS_OTHERS}) | 31 | add_definitions(${${pkg}_CFLAGS_OTHERS}) |
32 | endforeach(pkg) | 32 | endforeach(pkg) |
33 | else (STANDALONE) | 33 | else (STANDALONE) |
34 | use_prebuilt_binary(gtk-atk-pango-glib) | 34 | use_prebuilt_binary(gtk-etc) |
35 | if (LINUX) | 35 | if (LINUX) |
36 | set(UI_LIBRARIES | 36 | set(UI_LIBRARIES |
37 | atk-1.0 | 37 | atk-1.0 |
38 | cairo | ||
38 | gdk-x11-2.0 | 39 | gdk-x11-2.0 |
39 | gdk_pixbuf-2.0 | 40 | gdk_pixbuf-2.0 |
40 | Xinerama | ||
41 | glib-2.0 | 41 | glib-2.0 |
42 | gmodule-2.0 | 42 | gmodule-2.0 |
43 | gobject-2.0 | 43 | gobject-2.0 |
@@ -47,11 +47,14 @@ else (STANDALONE) | |||
47 | pangoft2-1.0 | 47 | pangoft2-1.0 |
48 | pangox-1.0 | 48 | pangox-1.0 |
49 | pangoxft-1.0 | 49 | pangoxft-1.0 |
50 | pixman-1 | ||
50 | ) | 51 | ) |
51 | endif (LINUX) | 52 | endif (LINUX) |
52 | 53 | ||
53 | include_directories ( | 54 | include_directories ( |
54 | ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include | 55 | ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include |
56 | ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/cairo | ||
57 | ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/pixman-1 | ||
55 | ${LIBS_PREBUILT_DIR}/include | 58 | ${LIBS_PREBUILT_DIR}/include |
56 | ) | 59 | ) |
57 | foreach(include ${${LL_ARCH}_INCLUDES}) | 60 | foreach(include ${${LL_ARCH}_INCLUDES}) |