complete support for X11
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@89469 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
parent
1688610395
commit
dd9eedf286
12
makeopts.in
12
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@
|
||||
|
||||
|
|
Reference in New Issue