diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-11-22 19:16:43 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-11-22 19:16:43 +0200 |
| commit | 6cbca28085f1698bc7c6537631d5efbadf64abf1 (patch) | |
| tree | 13a3ad21a732b168399ce9b34bbb0a57784dd54e /configure | |
| parent | 1715c2a33632b333f8e8e581ef23ea5fe0234edd (diff) | |
| parent | a83e00009000c4907254daa141d491d0479e961d (diff) | |
| download | mpv-6cbca28085f1698bc7c6537631d5efbadf64abf1.tar.bz2 mpv-6cbca28085f1698bc7c6537631d5efbadf64abf1.tar.xz | |
Merge svn changes up to r27979
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 28 |
1 files changed, 27 insertions, 1 deletions
@@ -369,6 +369,7 @@ Video output: --enable-caca enable CACA video output [autodetect] --enable-ggi enable GGI video output [autodetect] --enable-ggiwmh enable GGI libggiwmh extension [autodetect] + --enable-direct3d enable Direct3D video output [autodetect] --enable-directx enable DirectX video output [autodetect] --enable-dxr2 enable DXR2 video output [autodetect] --enable-dxr3 enable DXR3/H+ video output [autodetect] @@ -547,6 +548,7 @@ _dga2=auto _xv=auto _xvmc=no #auto when complete _sdl=auto +_direct3d=auto _directx=auto _win32waveout=auto _nas=auto @@ -867,6 +869,8 @@ for ac_option do --disable-xvmc) _xvmc=no ;; --enable-sdl) _sdl=yes ;; --disable-sdl) _sdl=no ;; + --enable-direct3d) _direct3d=yes ;; + --disable-direct3d) _direct3d=no ;; --enable-directx) _directx=yes ;; --disable-directx) _directx=no ;; --enable-win32waveout) _win32waveout=yes ;; @@ -2894,7 +2898,7 @@ fi echocheck "socklen_t" _socklen_t=no -for header in "sys/socket.h" "ws2tcpip.h" ; do +for header in "sys/socket.h" "ws2tcpip.h" "sys/types.h" ; do cat > $TMPC << EOF #include <$header> int main(void) { socklen_t v = 0; return v; } @@ -4900,6 +4904,27 @@ else fi echores "$_win32waveout" +echocheck "Direct3D" +if test "$_direct3d" = auto ; then + cat > $TMPC << EOF +#include <windows.h> +#include <d3d9.h> +int main(void) { return 0; } +EOF + _direct3d=no + cc_check -ld3d9 && _direct3d=yes +fi +if test "$_direct3d" = yes ; then + _def_direct3d='#define CONFIG_DIRECT3D 1' + _libs_mplayer="$_libs_mplayer -ld3d9" + _vosrc="$_vosrc vo_direct3d.c" + _vomodules="direct3d $_vomodules" +else + _def_direct3d='#undef CONFIG_DIRECT3D' + _novomodules="direct3d $_novomodules" +fi +echores "$_direct3d" + echocheck "Directx" if test "$_directx" = auto ; then cat > $TMPC << EOF @@ -8380,6 +8405,7 @@ $_def_dfbmga $_def_dga $_def_dga1 $_def_dga2 +$_def_direct3d $_def_directfb $_def_directfb_version $_def_directx |