diff options
| author | rizzo <rizzo@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-11-21 00:20:08 +0000 |
|---|---|---|
| committer | rizzo <rizzo@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-11-21 00:20:08 +0000 |
| commit | dd9eedf2862225713ee4c879b17b91e3677d8aa5 (patch) | |
| tree | b90797cbcfe8372b09a6fe1459bbdf39cda49008 /makeopts.in | |
| parent | 1688610395fc52a4ed3d5c75985b9d3186dff030 (diff) | |
complete support for X11
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@89469 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'makeopts.in')
| -rw-r--r-- | makeopts.in | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/makeopts.in b/makeopts.in index fd22a52b9..945424286 100644 --- a/makeopts.in +++ b/makeopts.in @@ -120,11 +120,10 @@ OGG_LIB=@OGG_LIB@ OSPTK_INCLUDE=@OSPTK_INCLUDE@ OSPTK_LIB=@OSPTK_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@ +# ossaudio can optionally use ffmpeg, x11, sdl and sdl_image. +# Because sdl_image in turn depends on sdl, we don't duplicate the include +OSSAUDIO_INCLUDE=@OSS_INCLUDE@ @FFMPEG_INCLUDE@ @SDL_INCLUDE@ @X11_INCLUDE@ +OSSAUDIO_LIB=@OSS_LIB@ @FFMPEG_LIB@ @SDL_LIB@ @SDL_IMAGE_LIB@ @X11_LIB@ PGSQL_INCLUDE=@PGSQL_INCLUDE@ PGSQL_LIB=@PGSQL_LIB@ @@ -150,6 +149,9 @@ RADIUS_LIB=@RADIUS_LIB@ FFMPEG_INCLUDE=@FFMPEG_INCLUDE@ FFMPEG_LIB=@FFMPEG_LIB@ +X11_INCLUDE=@X11_INCLUDE@ +X11_LIB=@X11_LIB@ + SDL_INCLUDE=@SDL_INCLUDE@ SDL_LIB=@SDL_LIB@ |