Mercurial > mplayer.hg
comparison configure @ 34834:2292b00862af
Only try to build vo gl with X11/win32 backends if these were detected.
Fixes compilation with --disable-x11 or when X11 headers
are available but not the libraries.
| author | reimar |
|---|---|
| date | Fri, 18 May 2012 18:34:26 +0000 |
| parents | 1e764ecad726 |
| children | a8b2db27349e |
comparison
equal
deleted
inserted
replaced
| 34833:1e764ecad726 | 34834:2292b00862af |
|---|---|
| 5145 return 0; | 5145 return 0; |
| 5146 } | 5146 } |
| 5147 EOF | 5147 EOF |
| 5148 _gl=no | 5148 _gl=no |
| 5149 for ld_tmp in "" -lGL "-lGL -lXdamage" "-lGL $ld_pthread" ; do | 5149 for ld_tmp in "" -lGL "-lGL -lXdamage" "-lGL $ld_pthread" ; do |
| 5150 if cc_check $ld_tmp ; then | 5150 if test "$_x11" = yes && cc_check $ld_tmp ; then |
| 5151 _gl=yes | 5151 _gl=yes |
| 5152 _gl_x11=yes | 5152 _gl_x11=yes |
| 5153 libs_mplayer="$libs_mplayer $ld_tmp $ld_dl" | 5153 libs_mplayer="$libs_mplayer $ld_tmp $ld_dl" |
| 5154 break | 5154 break |
| 5155 fi | 5155 fi |
| 5156 done | 5156 done |
| 5157 if cc_check -DGL_EGL_X11 -lEGL ; then | 5157 if test "$_x11" = yes && cc_check -DGL_EGL_X11 -lEGL ; then |
| 5158 _gl=yes | 5158 _gl=yes |
| 5159 _gl_egl_x11=yes | 5159 _gl_egl_x11=yes |
| 5160 libs_mplayer="$libs_mplayer -lEGL $ld_dl" | 5160 libs_mplayer="$libs_mplayer -lEGL $ld_dl" |
| 5161 fi | 5161 fi |
| 5162 if cc_check -DGL_WIN32 -lopengl32 ; then | 5162 if win32 && cc_check -DGL_WIN32 -lopengl32 ; then |
| 5163 _gl=yes | 5163 _gl=yes |
| 5164 _gl_win32=yes | 5164 _gl_win32=yes |
| 5165 libs_mplayer="$libs_mplayer -lopengl32 -lgdi32" | 5165 libs_mplayer="$libs_mplayer -lopengl32 -lgdi32" |
| 5166 fi | 5166 fi |
| 5167 # last so it can reuse any linker etc. flags detected before | 5167 # last so it can reuse any linker etc. flags detected before |