Updated configure based on recent configure.in changes
authorSam Lantinga <slouken@libsdl.org>
Wed, 15 Oct 2014 16:26:51 +0000
changeset 91659cd9e1491227
parent 9164 494876610c49
child 9166 e5a2e31d4bee
Updated configure based on recent configure.in changes
configure
     1.1 --- a/configure	Wed Oct 15 09:18:17 2014 -0700
     1.2 +++ b/configure	Wed Oct 15 16:26:51 2014 +0000
     1.3 @@ -832,7 +832,7 @@
     1.4  enable_video_x11_scrnsaver
     1.5  enable_video_x11_xshape
     1.6  enable_video_x11_vm
     1.7 -enable_video_mx6
     1.8 +enable_video_vivante
     1.9  enable_video_cocoa
    1.10  enable_video_directfb
    1.11  enable_directfb_shared
    1.12 @@ -841,6 +841,8 @@
    1.13  enable_video_dummy
    1.14  enable_video_opengl
    1.15  enable_video_opengles
    1.16 +enable_video_opengles1
    1.17 +enable_video_opengles2
    1.18  enable_libudev
    1.19  enable_dbus
    1.20  enable_ibus
    1.21 @@ -1562,7 +1564,7 @@
    1.22    --enable-video-x11-xshape
    1.23                            enable X11 XShape support [[default=yes]]
    1.24    --enable-video-x11-vm   use X11 VM extension for fullscreen [[default=yes]]
    1.25 -  --enable-video-mx6      use Freescale i.MX6 video driver [[default=no]]
    1.26 +  --enable-video-vivante  use Vivante EGL video driver [[default=yes]]
    1.27    --enable-video-cocoa    use Cocoa video driver [[default=yes]]
    1.28    --enable-video-directfb use DirectFB video driver [[default=no]]
    1.29    --enable-directfb-shared
    1.30 @@ -1574,6 +1576,10 @@
    1.31    --enable-video-dummy    use dummy video driver [[default=yes]]
    1.32    --enable-video-opengl   include OpenGL support [[default=yes]]
    1.33    --enable-video-opengles include OpenGL ES support [[default=yes]]
    1.34 +  --enable-video-opengles1
    1.35 +                          include OpenGL ES 1.1 support [[default=yes]]
    1.36 +  --enable-video-opengles2
    1.37 +                          include OpenGL ES 2.0 support [[default=yes]]
    1.38    --enable-libudev        enable libudev support [[default=yes]]
    1.39    --enable-dbus           enable D-Bus support [[default=yes]]
    1.40    --enable-ibus           enable IBus support [[default=yes]]
    1.41 @@ -20593,22 +20599,51 @@
    1.42      fi
    1.43  }
    1.44  
    1.45 -CheckMX6Video()
    1.46 -{
    1.47 -    # Check whether --enable-video-mx6 was given.
    1.48 -if test "${enable_video_mx6+set}" = set; then :
    1.49 -  enableval=$enable_video_mx6;
    1.50 -else
    1.51 -  enable_video_mx6=no
    1.52 -fi
    1.53 -
    1.54 -    if test x$enable_video = xyes -a x$enable_video_mx6 = xyes; then
    1.55 -        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Vivante GPU SDK" >&5
    1.56 -$as_echo_n "checking for Vivante GPU SDK... " >&6; }
    1.57 -        have_viv_sdk=no
    1.58 +CheckVivanteVideo()
    1.59 +{
    1.60 +    # Check whether --enable-video-vivante was given.
    1.61 +if test "${enable_video_vivante+set}" = set; then :
    1.62 +  enableval=$enable_video_vivante;
    1.63 +else
    1.64 +  enable_video_vivante=yes
    1.65 +fi
    1.66 +
    1.67 +    if test x$enable_video = xyes -a x$enable_video_vivante = xyes; then
    1.68 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Vivante VDK API" >&5
    1.69 +$as_echo_n "checking for Vivante VDK API... " >&6; }
    1.70 +        have_vivante_vdk=no
    1.71          cat confdefs.h - <<_ACEOF >conftest.$ac_ext
    1.72  /* end confdefs.h.  */
    1.73  
    1.74 +          #define LINUX
    1.75 +          #define EGL_API_FB
    1.76 +          #include <gc_vdk.h>
    1.77 +
    1.78 +int
    1.79 +main ()
    1.80 +{
    1.81 +
    1.82 +
    1.83 +  ;
    1.84 +  return 0;
    1.85 +}
    1.86 +_ACEOF
    1.87 +if ac_fn_c_try_compile "$LINENO"; then :
    1.88 +
    1.89 +        have_vivante_vdk=yes
    1.90 +
    1.91 +fi
    1.92 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    1.93 +        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_vivante_vdk" >&5
    1.94 +$as_echo "$have_vivante_vdk" >&6; }
    1.95 +
    1.96 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Vivante FB API" >&5
    1.97 +$as_echo_n "checking for Vivante FB API... " >&6; }
    1.98 +        have_vivante_egl=no
    1.99 +        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
   1.100 +/* end confdefs.h.  */
   1.101 +
   1.102 +          #define LINUX
   1.103            #define EGL_API_FB
   1.104            #include <EGL/eglvivante.h>
   1.105  
   1.106 @@ -20623,18 +20658,26 @@
   1.107  _ACEOF
   1.108  if ac_fn_c_try_compile "$LINENO"; then :
   1.109  
   1.110 -        have_viv_sdk=yes
   1.111 -
   1.112 -fi
   1.113 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   1.114 -        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_viv_sdk" >&5
   1.115 -$as_echo "$have_viv_sdk" >&6; }
   1.116 -        if test x$have_viv_sdk = xyes; then
   1.117 -
   1.118 -$as_echo "#define SDL_VIDEO_DRIVER_MX6 1" >>confdefs.h
   1.119 -
   1.120 -            SOURCES="$SOURCES $srcdir/src/video/mx6/*.c"
   1.121 -            SUMMARY_video="${SUMMARY_video} mx6"
   1.122 +        have_vivante_egl=yes
   1.123 +
   1.124 +fi
   1.125 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   1.126 +        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_vivante_egl" >&5
   1.127 +$as_echo "$have_vivante_egl" >&6; }
   1.128 +
   1.129 +        if test x$have_vivante_vdk = xyes -o x$have_vivante_egl = xyes; then
   1.130 +
   1.131 +$as_echo "#define SDL_VIDEO_DRIVER_VIVANTE 1" >>confdefs.h
   1.132 +
   1.133 +            EXTRA_CFLAGS="$EXTRA_CFLAGS -DLINUX -DEGL_API_FB"
   1.134 +            if test x$have_vivante_vdk = xyes; then
   1.135 +
   1.136 +$as_echo "#define SDL_VIDEO_DRIVER_VIVANTE_VDK 1" >>confdefs.h
   1.137 +
   1.138 +                EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lVDK"
   1.139 +            fi
   1.140 +            SOURCES="$SOURCES $srcdir/src/video/vivante/*.c"
   1.141 +            SUMMARY_video="${SUMMARY_video} vivante"
   1.142              have_video=yes
   1.143          fi
   1.144      fi
   1.145 @@ -21083,6 +21126,20 @@
   1.146    enable_video_opengles=yes
   1.147  fi
   1.148  
   1.149 +# Check whether --enable-video-opengles1 was given.
   1.150 +if test "${enable_video_opengles1+set}" = set; then :
   1.151 +  enableval=$enable_video_opengles1;
   1.152 +else
   1.153 +  enable_video_opengles1=yes
   1.154 +fi
   1.155 +
   1.156 +# Check whether --enable-video-opengles2 was given.
   1.157 +if test "${enable_video_opengles2+set}" = set; then :
   1.158 +  enableval=$enable_video_opengles2;
   1.159 +else
   1.160 +  enable_video_opengles2=yes
   1.161 +fi
   1.162 +
   1.163  
   1.164  CheckOpenGLESX11()
   1.165  {
   1.166 @@ -21093,9 +21150,10 @@
   1.167          cat confdefs.h - <<_ACEOF >conftest.$ac_ext
   1.168  /* end confdefs.h.  */
   1.169  
   1.170 -         #define EGL_API_FB
   1.171 -         #include <EGL/egl.h>
   1.172 -         #include <EGL/eglext.h>
   1.173 +          #define LINUX
   1.174 +          #define EGL_API_FB
   1.175 +          #include <EGL/egl.h>
   1.176 +          #include <EGL/eglext.h>
   1.177  
   1.178  int
   1.179  main ()
   1.180 @@ -21120,76 +21178,80 @@
   1.181  
   1.182          fi
   1.183  
   1.184 -        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OpenGL ES v1 headers" >&5
   1.185 +        if test x$enable_video_opengles1 = xyes; then
   1.186 +            { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OpenGL ES v1 headers" >&5
   1.187  $as_echo_n "checking for OpenGL ES v1 headers... " >&6; }
   1.188 -        video_opengles_v1=no
   1.189 -        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
   1.190 -/* end confdefs.h.  */
   1.191 -
   1.192 -         #include <GLES/gl.h>
   1.193 -         #include <GLES/glext.h>
   1.194 -
   1.195 -int
   1.196 -main ()
   1.197 -{
   1.198 -
   1.199 -
   1.200 -  ;
   1.201 -  return 0;
   1.202 -}
   1.203 -_ACEOF
   1.204 -if ac_fn_c_try_compile "$LINENO"; then :
   1.205 -
   1.206 -        video_opengles_v1=yes
   1.207 -
   1.208 -fi
   1.209 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   1.210 -        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $video_opengles_v1" >&5
   1.211 +            video_opengles_v1=no
   1.212 +            cat confdefs.h - <<_ACEOF >conftest.$ac_ext
   1.213 +/* end confdefs.h.  */
   1.214 +
   1.215 +             #include <GLES/gl.h>
   1.216 +             #include <GLES/glext.h>
   1.217 +
   1.218 +int
   1.219 +main ()
   1.220 +{
   1.221 +
   1.222 +
   1.223 +  ;
   1.224 +  return 0;
   1.225 +}
   1.226 +_ACEOF
   1.227 +if ac_fn_c_try_compile "$LINENO"; then :
   1.228 +
   1.229 +            video_opengles_v1=yes
   1.230 +
   1.231 +fi
   1.232 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   1.233 +            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $video_opengles_v1" >&5
   1.234  $as_echo "$video_opengles_v1" >&6; }
   1.235 -        if test x$video_opengles_v1 = xyes; then
   1.236 +            if test x$video_opengles_v1 = xyes; then
   1.237  
   1.238  $as_echo "#define SDL_VIDEO_OPENGL_ES 1" >>confdefs.h
   1.239  
   1.240  
   1.241  $as_echo "#define SDL_VIDEO_RENDER_OGL_ES 1" >>confdefs.h
   1.242  
   1.243 -            SUMMARY_video="${SUMMARY_video} opengl_es1"
   1.244 -        fi
   1.245 -
   1.246 -        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OpenGL ES v2 headers" >&5
   1.247 +                SUMMARY_video="${SUMMARY_video} opengl_es1"
   1.248 +            fi
   1.249 +        fi
   1.250 +
   1.251 +        if test x$enable_video_opengles2 = xyes; then
   1.252 +            { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OpenGL ES v2 headers" >&5
   1.253  $as_echo_n "checking for OpenGL ES v2 headers... " >&6; }
   1.254 -        video_opengles_v2=no
   1.255 -        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
   1.256 -/* end confdefs.h.  */
   1.257 -
   1.258 -         #include <GLES2/gl2.h>
   1.259 -         #include <GLES2/gl2ext.h>
   1.260 -
   1.261 -int
   1.262 -main ()
   1.263 -{
   1.264 -
   1.265 -
   1.266 -  ;
   1.267 -  return 0;
   1.268 -}
   1.269 -_ACEOF
   1.270 -if ac_fn_c_try_compile "$LINENO"; then :
   1.271 -
   1.272 -        video_opengles_v2=yes
   1.273 -
   1.274 -fi
   1.275 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   1.276 -        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $video_opengles_v2" >&5
   1.277 +            video_opengles_v2=no
   1.278 +            cat confdefs.h - <<_ACEOF >conftest.$ac_ext
   1.279 +/* end confdefs.h.  */
   1.280 +
   1.281 +             #include <GLES2/gl2.h>
   1.282 +             #include <GLES2/gl2ext.h>
   1.283 +
   1.284 +int
   1.285 +main ()
   1.286 +{
   1.287 +
   1.288 +
   1.289 +  ;
   1.290 +  return 0;
   1.291 +}
   1.292 +_ACEOF
   1.293 +if ac_fn_c_try_compile "$LINENO"; then :
   1.294 +
   1.295 +            video_opengles_v2=yes
   1.296 +
   1.297 +fi
   1.298 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   1.299 +            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $video_opengles_v2" >&5
   1.300  $as_echo "$video_opengles_v2" >&6; }
   1.301 -        if test x$video_opengles_v2 = xyes; then
   1.302 +            if test x$video_opengles_v2 = xyes; then
   1.303  
   1.304  $as_echo "#define SDL_VIDEO_OPENGL_ES2 1" >>confdefs.h
   1.305  
   1.306  
   1.307  $as_echo "#define SDL_VIDEO_RENDER_OGL_ES2 1" >>confdefs.h
   1.308  
   1.309 -            SUMMARY_video="${SUMMARY_video} opengl_es2"
   1.310 +                SUMMARY_video="${SUMMARY_video} opengl_es2"
   1.311 +            fi
   1.312          fi
   1.313      fi
   1.314  }
   1.315 @@ -21657,10 +21719,10 @@
   1.316  fi
   1.317  
   1.318      case "$host" in
   1.319 -	 *-*-androideabi*)
   1.320 +         *-*-androideabi*)
   1.321              pthread_cflags="-D_REENTRANT -D_THREAD_SAFE"
   1.322              pthread_lib=""
   1.323 -	    ;;
   1.324 +            ;;
   1.325          *-*-linux*|*-*-uclinux*)
   1.326              pthread_cflags="-D_REENTRANT"
   1.327              pthread_lib="-lpthread"
   1.328 @@ -22868,7 +22930,7 @@
   1.329          CheckClockGettime
   1.330          CheckLinuxVersion
   1.331          CheckRPATH
   1.332 -        CheckMX6Video
   1.333 +        CheckVivanteVideo
   1.334          # Set up files for the audio library
   1.335          if test x$enable_audio = xyes; then
   1.336            case $ARCH in