Mercurial > mplayer.hg

comparison configure @ 30021:7f09bc7a4279

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Make the check for X11 and WIN32 backends for OpenGL separate. This fixes compilation on Windows with X11 but no GLX available.
author reimar
date Sat, 19 Dec 2009 10:52:32 +0000
parents 72279983abb0
children b7a703cf9178
comparison
equal deleted inserted replaced
30020:d652e17184f9 30021:7f09bc7a4279
4920 } 4920 }
4921 EOF 4921 EOF
4922 _gl=no 4922 _gl=no
4923 if cc_check -lGL $_ld_lm ; then 4923 if cc_check -lGL $_ld_lm ; then
4924 _gl=yes 4924 _gl=yes
4925 _gl_x11=yes
4925 libs_mplayer="$libs_mplayer -lGL $_ld_dl" 4926 libs_mplayer="$libs_mplayer -lGL $_ld_dl"
4926 elif cc_check -lGL $_ld_lm $_ld_pthread ; then 4927 elif cc_check -lGL $_ld_lm $_ld_pthread ; then
4927 _gl=yes 4928 _gl=yes
4929 _gl_x11=yes
4928 libs_mplayer="$libs_mplayer -lGL $_ld_pthread $_ld_dl" 4930 libs_mplayer="$libs_mplayer -lGL $_ld_pthread $_ld_dl"
4929 elif cc_check -DGL_WIN32 -lopengl32 ; then 4931 fi
4932 if cc_check -DGL_WIN32 -lopengl32 ; then
4930 _gl=yes 4933 _gl=yes
4931 _gl_win32=yes 4934 _gl_win32=yes
4932 libs_mplayer="$libs_mplayer -lopengl32 -lgdi32" 4935 libs_mplayer="$libs_mplayer -lopengl32 -lgdi32"
4933 fi 4936 fi
4934 else 4937 else
4935 _gl=no 4938 _gl=no
4936 fi 4939 fi
4937 if test "$_gl" = yes ; then 4940 if test "$_gl" = yes ; then
4938 def_gl='#define CONFIG_GL 1' 4941 def_gl='#define CONFIG_GL 1'
4942 _res_comment="backends:"
4939 if test "$_gl_win32" = yes ; then 4943 if test "$_gl_win32" = yes ; then
4940 def_gl_win32='#define GL_WIN32 1' 4944 def_gl_win32='#define GL_WIN32 1'
4941 _res_comment="win32 version" 4945 _res_comment="$_res_comment win32"
4946 fi
4947 if test "$_gl_x11" = yes ; then
4948 def_gl_x11='#define GL_X11 1'
4949 _res_comment="$_res_comment x11"
4942 fi 4950 fi
4943 _vomodules="opengl $_vomodules" 4951 _vomodules="opengl $_vomodules"
4944 else 4952 else
4945 def_gl='#undef CONFIG_GL' 4953 def_gl='#undef CONFIG_GL'
4946 def_gl_win32='#undef GL_WIN32' 4954 def_gl_win32='#undef GL_WIN32'
4955 def_gl_x11='#undef GL_X11'
4947 _novomodules="opengl $_novomodules" 4956 _novomodules="opengl $_novomodules"
4948 fi 4957 fi
4949 echores "$_gl" 4958 echores "$_gl"
4950 4959
4951 4960
8278 FTP = $_ftp 8287 FTP = $_ftp
8279 GIF = $_gif 8288 GIF = $_gif
8280 GGI = $_ggi 8289 GGI = $_ggi
8281 GL = $_gl 8290 GL = $_gl
8282 GL_WIN32 = $_gl_win32 8291 GL_WIN32 = $_gl_win32
8292 GL_X11 = $_gl_x11
8283 GUI = $_gui 8293 GUI = $_gui
8284 GUI_GTK = $_gui_gtk 8294 GUI_GTK = $_gui_gtk
8285 GUI_WIN32 = $_gui_win32 8295 GUI_WIN32 = $_gui_win32
8286 HAVE_POSIX_SELECT = $_posix_select 8296 HAVE_POSIX_SELECT = $_posix_select
8287 HAVE_SYS_MMAN_H = $_mman 8297 HAVE_SYS_MMAN_H = $_mman
8800 $def_gif 8810 $def_gif
8801 $def_gif_4 8811 $def_gif_4
8802 $def_gif_tvt_hack 8812 $def_gif_tvt_hack
8803 $def_gl 8813 $def_gl
8804 $def_gl_win32 8814 $def_gl_win32
8815 $def_gl_x11
8805 $def_ivtv 8816 $def_ivtv
8806 $def_jpeg 8817 $def_jpeg
8807 $def_kva 8818 $def_kva
8808 $def_md5sum 8819 $def_md5sum
8809 $def_mga 8820 $def_mga