diff options
author | Armin Weatherwax | 2010-08-07 19:17:13 +0200 |
---|---|---|
committer | Armin Weatherwax | 2010-09-23 15:42:40 +0200 |
commit | 70800de39a3d942d2120abd926fbdb24577fb0f6 (patch) | |
tree | efeb12456e1a8ee7182656dc7503dc9b89a07a63 /linden/indra/cmake | |
parent | fix some mime type issues (diff) | |
download | meta-impy-70800de39a3d942d2120abd926fbdb24577fb0f6.zip meta-impy-70800de39a3d942d2120abd926fbdb24577fb0f6.tar.gz meta-impy-70800de39a3d942d2120abd926fbdb24577fb0f6.tar.bz2 meta-impy-70800de39a3d942d2120abd926fbdb24577fb0f6.tar.xz |
update to viewer-external SLPlugin + webkit. Fixes (lots of) webpages not loading.
Issue: llqtwebkit needs update for Linux 64bit
Diffstat (limited to 'linden/indra/cmake')
-rw-r--r-- | linden/indra/cmake/PulseAudio.cmake | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/linden/indra/cmake/PulseAudio.cmake b/linden/indra/cmake/PulseAudio.cmake new file mode 100644 index 0000000..f8087a8 --- /dev/null +++ b/linden/indra/cmake/PulseAudio.cmake | |||
@@ -0,0 +1,28 @@ | |||
1 | # -*- cmake -*- | ||
2 | include(Prebuilt) | ||
3 | |||
4 | if (STANDALONE) | ||
5 | include(FindPkgConfig) | ||
6 | |||
7 | pkg_check_modules(PULSEAUDIO REQUIRED libpulse-mainloop-glib) | ||
8 | |||
9 | elseif (LINUX) | ||
10 | use_prebuilt_binary(pulseaudio) | ||
11 | set(PULSEAUDIO_FOUND ON FORCE BOOL) | ||
12 | set(PULSEAUDIO_INCLUDE_DIRS | ||
13 | ${LIBS_PREBUILT_DIR}/include | ||
14 | ) | ||
15 | # We don't need to explicitly link against pulseaudio itself, because | ||
16 | # the viewer probes for the system's copy at runtime. | ||
17 | set(PULSEAUDIO_LIBRARIES | ||
18 | # none needed! | ||
19 | ) | ||
20 | endif (STANDALONE) | ||
21 | |||
22 | if (PULSEAUDIO_FOUND) | ||
23 | set(PULSEAUDIO ON CACHE BOOL "Build with PulseAudio support, if available.") | ||
24 | endif (PULSEAUDIO_FOUND) | ||
25 | |||
26 | if (PULSEAUDIO) | ||
27 | add_definitions(-DLL_PULSEAUDIO_ENABLED=1) | ||
28 | endif (PULSEAUDIO) | ||