Mercurial > mplayer.hg
comparison configure @ 30184:9725a1980fc9
Move MatrixView video output check below OpenGL check, it depends on OpenGL.
patch by Francesco Lavra, francescolavra interfree it
| author | diego |
|---|---|
| date | Tue, 05 Jan 2010 10:54:41 +0000 |
| parents | 2dc4bcb2793a |
| children | 96e5d03cda1d |
comparison
equal
deleted
inserted
replaced
| 30183:53bd22d8b3f7 | 30184:9725a1980fc9 |
|---|---|
| 4605 def_mga='#undef CONFIG_MGA' | 4605 def_mga='#undef CONFIG_MGA' |
| 4606 _novomodules="mga $_novomodules" | 4606 _novomodules="mga $_novomodules" |
| 4607 fi | 4607 fi |
| 4608 echores "$_mga" | 4608 echores "$_mga" |
| 4609 | 4609 |
| 4610 echocheck "MatrixView" | |
| 4611 if test "$_gl" = no ; then | |
| 4612 matrixview=no | |
| 4613 fi | |
| 4614 if test "$matrixview" = yes ; then | |
| 4615 _vomodules="matrixview $_vomodules" | |
| 4616 def_matrixview='#define CONFIG_MATRIXVIEW 1' | |
| 4617 else | |
| 4618 _novomodules="matrixview $_novomodules" | |
| 4619 def_matrixview='#undef CONFIG_MATRIXVIEW' | |
| 4620 fi | |
| 4621 echores "$matrixview" | |
| 4622 | |
| 4623 echocheck "xmga" | 4610 echocheck "xmga" |
| 4624 if test "$_xmga" = auto ; then | 4611 if test "$_xmga" = auto ; then |
| 4625 _xmga=no | 4612 _xmga=no |
| 4626 test "$_x11" = yes && test "$_mga" = yes && _xmga=yes | 4613 test "$_x11" = yes && test "$_mga" = yes && _xmga=yes |
| 4627 fi | 4614 fi |
| 4979 def_gl_win32='#undef CONFIG_GL_WIN32' | 4966 def_gl_win32='#undef CONFIG_GL_WIN32' |
| 4980 def_gl_x11='#undef CONFIG_GL_X11' | 4967 def_gl_x11='#undef CONFIG_GL_X11' |
| 4981 _novomodules="opengl $_novomodules" | 4968 _novomodules="opengl $_novomodules" |
| 4982 fi | 4969 fi |
| 4983 echores "$_gl" | 4970 echores "$_gl" |
| 4971 | |
| 4972 | |
| 4973 echocheck "MatrixView" | |
| 4974 if test "$_gl" = no ; then | |
| 4975 matrixview=no | |
| 4976 fi | |
| 4977 if test "$matrixview" = yes ; then | |
| 4978 _vomodules="matrixview $_vomodules" | |
| 4979 def_matrixview='#define CONFIG_MATRIXVIEW 1' | |
| 4980 else | |
| 4981 _novomodules="matrixview $_novomodules" | |
| 4982 def_matrixview='#undef CONFIG_MATRIXVIEW' | |
| 4983 fi | |
| 4984 echores "$matrixview" | |
| 4984 | 4985 |
| 4985 | 4986 |
| 4986 echocheck "PNG support" | 4987 echocheck "PNG support" |
| 4987 if test "$_png" = auto ; then | 4988 if test "$_png" = auto ; then |
| 4988 _png=no | 4989 _png=no |