diff options
| author | Armin Weatherwax | 2010-03-03 19:44:59 +0100 |
|---|---|---|
| committer | Armin Weatherwax | 2010-03-04 22:43:04 +0100 |
| commit | e417a8dad62c484ffbc961727ca43870e3510529 (patch) | |
| tree | 7790f80d09322d655a5bc87dc150606e93e00778 /linden/indra/cmake | |
| parent | Robin Cornelius: SNOW-485 Fix deadlock in LLTextureFetchWorker. (diff) | |
| download | meta-impy-e417a8dad62c484ffbc961727ca43870e3510529.zip meta-impy-e417a8dad62c484ffbc961727ca43870e3510529.tar.gz meta-impy-e417a8dad62c484ffbc961727ca43870e3510529.tar.bz2 meta-impy-e417a8dad62c484ffbc961727ca43870e3510529.tar.xz | |
Linux: de-obfuscate dbus handling; better handle_secondlifeprotocol.sh.
Diffstat (limited to '')
| -rw-r--r-- | linden/indra/cmake/DBusGlib.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/linden/indra/cmake/DBusGlib.cmake b/linden/indra/cmake/DBusGlib.cmake index cfc4ccd..dfda0ad 100644 --- a/linden/indra/cmake/DBusGlib.cmake +++ b/linden/indra/cmake/DBusGlib.cmake | |||
| @@ -12,9 +12,9 @@ elseif (LINUX) | |||
| 12 | set(DBUSGLIB_INCLUDE_DIRS | 12 | set(DBUSGLIB_INCLUDE_DIRS |
| 13 | ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/glib-2.0 | 13 | ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/glib-2.0 |
| 14 | ) | 14 | ) |
| 15 | # We don't need to explicitly link against dbus-glib itself, because | 15 | |
| 16 | # the viewer probes for the system's copy at runtime. | ||
| 17 | set(DBUSGLIB_LIBRARIES | 16 | set(DBUSGLIB_LIBRARIES |
| 17 | dbus-glib-1 | ||
| 18 | gobject-2.0 | 18 | gobject-2.0 |
| 19 | glib-2.0 | 19 | glib-2.0 |
| 20 | ) | 20 | ) |