summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorStefano Pigozzi <stefano.pigozzi@gmail.com>2012-04-14 15:02:28 +0200
committerUoti Urpala <uau@mplayer2.org>2012-04-26 21:03:10 +0300
commitd3da92aea4e865b72194ecc76e0eab6e2a1179a3 (patch)
tree792420c1ef4bb57fa0b39eb6f3d61e32a7f47159 /configure
parent86790494d38c4f33f74875e1ab7a9dc1bdae1772 (diff)
downloadmpv-d3da92aea4e865b72194ecc76e0eab6e2a1179a3.tar.bz2
mpv-d3da92aea4e865b72194ecc76e0eab6e2a1179a3.tar.xz
cocoa_common, gl_common: add OSX specific getProcAddress
Run dlopen on the OpenGL dynamic library instead of on the binary. This should prevent crashes due to function conflicts when X11/lGL is linked. Remove mutual exclusion of the X11 and Cocoa backends.
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure2
1 files changed, 1 insertions, 1 deletions
diff --git a/configure b/configure
index 4a6e209d3a..7b99766d2d 100755
--- a/configure
+++ b/configure
@@ -4544,7 +4544,7 @@ int main(int argc, char *argv[]) {
EOF
_gl=no
for _ld_tmp in "" -lGL "-lGL -lXdamage" "-lGL $_ld_pthread" ; do
- if test "$_cocoa" != yes && cc_check $_ld_tmp $_ld_lm ; then
+ if cc_check $_ld_tmp $_ld_lm ; then
_gl=yes
_gl_x11=yes
libs_mplayer="$libs_mplayer $_ld_tmp $_ld_dl"