summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuigi Rizzo <rizzo@icir.org>2007-11-20 17:11:12 +0000
committerLuigi Rizzo <rizzo@icir.org>2007-11-20 17:11:12 +0000
commit6abfd9ac9bdd8acb34557ee6aac73d3d0c964aab (patch)
tree73c754d37c7bda66cb73bb8d5720e5b4960e74b0
parent6938f4b2b002accd9c86e5cc63cfe31d0fe10e47 (diff)
prepare to support console_video
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@89455 65c4cc65-6c06-0410-ace0-fbb531ad65f3
-rw-r--r--makeopts.in7
1 files changed, 5 insertions, 2 deletions
diff --git a/makeopts.in b/makeopts.in
index 70c4846d5..fd22a52b9 100644
--- a/makeopts.in
+++ b/makeopts.in
@@ -120,8 +120,11 @@ OGG_LIB=@OGG_LIB@
OSPTK_INCLUDE=@OSPTK_INCLUDE@
OSPTK_LIB=@OSPTK_LIB@
-OSSAUDIO_INCLUDE=@OSS_INCLUDE@
-OSSAUDIO_LIB=@OSS_LIB@
+# ossaudio can optionally use ffmpeg, x11, sdl and sdl_image
+# because sdl_image in turn depends on sdl, we don't duplicate the include
+# XXX x11 not yet integrated.
+OSSAUDIO_INCLUDE=@OSS_INCLUDE@ @FFMPEG_INCLUDE@ @SDL_INCLUDE@
+OSSAUDIO_LIB=@OSS_LIB@ @FFMPEG_LIB@ @SDL_LIB@ @SDL_IMAGE_LIB@
PGSQL_INCLUDE=@PGSQL_INCLUDE@
PGSQL_LIB=@PGSQL_LIB@