configure.in
changeset 5150 1435f8a6425c
parent 5139 57851a238c8f
child 5154 fb424691cfc7
     1.1 --- a/configure.in	Tue Feb 01 21:23:43 2011 -0800
     1.2 +++ b/configure.in	Tue Feb 01 21:40:03 2011 -0800
     1.3 @@ -1326,70 +1326,6 @@
     1.4      fi
     1.5  }
     1.6  
     1.7 -dnl Check for QNX photon video driver
     1.8 -CheckPHOTON()
     1.9 -{
    1.10 -    AC_ARG_ENABLE(video-photon,
    1.11 -AC_HELP_STRING([--enable-video-photon], [use QNX Photon video driver [[default=yes]]]),
    1.12 -                  , enable_video_photon=yes)
    1.13 -    if test x$enable_video = xyes -a x$enable_video_photon = xyes; then
    1.14 -        AC_MSG_CHECKING(for QNX Photon support)
    1.15 -        video_photon=no
    1.16 -        AC_TRY_COMPILE([
    1.17 -          #include <Ph.h>
    1.18 -          #include <Pt.h>
    1.19 -          #include <photon/Pg.h>
    1.20 -          #include <photon/PdDirect.h>
    1.21 -        ],[
    1.22 -         PgDisplaySettings_t *visual;
    1.23 -        ],[
    1.24 -        video_photon=yes
    1.25 -        ])
    1.26 -        AC_MSG_RESULT($video_photon)
    1.27 -        if test x$video_photon = xyes; then
    1.28 -            AC_DEFINE(SDL_VIDEO_DRIVER_PHOTON)
    1.29 -            SOURCES="$SOURCES $srcdir/src/video/photon/*.c"
    1.30 -            EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lph -lphrender"
    1.31 -            have_video=yes
    1.32 -
    1.33 -            CheckOpenGLQNX
    1.34 -        fi
    1.35 -    fi
    1.36 -}
    1.37 -
    1.38 -dnl Check for QNX photon video driver
    1.39 -CheckQNXGF()
    1.40 -{
    1.41 -    AC_ARG_ENABLE(video-qnxgf,
    1.42 -                  AC_HELP_STRING([--enable-video-qnxgf], [use QNX GF video driver [[default=yes]]]),
    1.43 -                  , enable_video_qnxgf=yes)
    1.44 -    if test x$enable_video = xyes -a x$enable_video_qnxgf = xyes; then
    1.45 -        AC_MSG_CHECKING(for QNX GF support)
    1.46 -        video_qnxgf=no
    1.47 -        AC_TRY_COMPILE([
    1.48 -          #include <gf/gf.h>
    1.49 -          #include <gf/gf3d.h>
    1.50 -        ],[
    1.51 -         gf_3d_config_info_t* gfinfo;
    1.52 -        ],[
    1.53 -        video_qnxgf=yes
    1.54 -        ])
    1.55 -        AC_MSG_RESULT($video_qnxgf)
    1.56 -        if test x$video_qnxgf = xyes; then
    1.57 -            AC_DEFINE(SDL_VIDEO_DRIVER_QNXGF)
    1.58 -            SOURCES="$SOURCES $srcdir/src/video/qnxgf/*.c"
    1.59 -            EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lgf"
    1.60 -
    1.61 -            # Add HIDDI library for HID support using GF
    1.62 -            EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lhiddi"
    1.63 -
    1.64 -            have_video=yes
    1.65 -
    1.66 -            CheckOpenGLESQNX
    1.67 -        fi
    1.68 -    fi
    1.69 -}
    1.70 -
    1.71  dnl Set up the BWindow video driver if enabled
    1.72  CheckBWINDOW()
    1.73  {
    1.74 @@ -1594,65 +1530,6 @@
    1.75      fi
    1.76  }
    1.77  
    1.78 -dnl Find QNX 6.x Software OpenGL
    1.79 -CheckOpenGLQNX()
    1.80 -{
    1.81 -    if test x$enable_video = xyes -a x$enable_video_opengl = xyes; then
    1.82 -        AC_MSG_CHECKING(for QNX 6.x Photon OpenGL support)
    1.83 -        video_opengl=no
    1.84 -        AC_TRY_COMPILE([
    1.85 -         #include <GL/gl.h>
    1.86 -        ],[
    1.87 -        ],[
    1.88 -        video_opengl=yes
    1.89 -        ])
    1.90 -        AC_MSG_RESULT($video_opengl)
    1.91 -        if test x$video_opengl = xyes; then
    1.92 -            AC_DEFINE(SDL_VIDEO_OPENGL)
    1.93 -            AC_DEFINE(SDL_VIDEO_RENDER_OGL)
    1.94 -            EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lGL"
    1.95 -        fi
    1.96 -    fi
    1.97 -}
    1.98 -
    1.99 -dnl Find QNX 6.3 and above OpenGL ES implementation
   1.100 -CheckOpenGLESQNX()
   1.101 -{
   1.102 -    if test x$enable_video = xyes -a x$enable_video_opengl = xyes; then
   1.103 -        AC_MSG_CHECKING(for QNX OpenGL ES (CM) support)
   1.104 -        video_opengl=no
   1.105 -        AC_TRY_COMPILE([
   1.106 -         #include <GLES/egl.h>
   1.107 -        ],[
   1.108 -        ],[
   1.109 -        video_opengl=yes
   1.110 -        ])
   1.111 -        AC_MSG_RESULT($video_opengl)
   1.112 -        if test x$video_opengl = xyes; then
   1.113 -            AC_DEFINE(SDL_VIDEO_OPENGL_ES)
   1.114 -            AC_DEFINE(SDL_VIDEO_RENDER_OGL_ES)
   1.115 -            EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lGLES_CM"
   1.116 -        else
   1.117 -            AC_MSG_CHECKING(for QNX OpenGL ES (CL) support)
   1.118 -            video_opengl=no
   1.119 -            AC_TRY_COMPILE([
   1.120 -             #define COMMON_LITE
   1.121 -             #include <GLES/egl.h>
   1.122 -            ],[
   1.123 -            ],[
   1.124 -            video_opengl=yes
   1.125 -            ])
   1.126 -            AC_MSG_RESULT($video_opengl)
   1.127 -            if test x$video_opengl = xyes; then
   1.128 -                AC_DEFINE(SDL_VIDEO_OPENGL_ES)
   1.129 -                AC_DEFINE(SDL_VIDEO_RENDER_OGL_ES)
   1.130 -                EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lGLES_CLS"
   1.131 -            fi
   1.132 -        fi
   1.133 -    fi
   1.134 -}
   1.135 -
   1.136 -
   1.137  dnl Check for Windows OpenGL
   1.138  CheckWINDOWSGL()
   1.139  {
   1.140 @@ -1796,10 +1673,6 @@
   1.141              pthread_cflags="-D_REENTRANT"
   1.142              pthread_lib="-L/usr/lib -lpthread"
   1.143              ;;
   1.144 -        *-*-qnx*)
   1.145 -            pthread_cflags=""
   1.146 -            pthread_lib=""
   1.147 -            ;;
   1.148          *-*-osf*)
   1.149              pthread_cflags="-D_REENTRANT"
   1.150              if test x$ac_cv_prog_gcc = xyes; then
   1.151 @@ -2287,54 +2160,6 @@
   1.152              have_timers=yes
   1.153          fi
   1.154          ;;
   1.155 -    *-*-qnx*)
   1.156 -
   1.157 -        EXTRA_CFLAGS="-I/usr/include $CFLAGS"
   1.158 -        EXTRA_LDLAGS="-L/usr/lib $LDFLAGS"
   1.159 -
   1.160 -        ARCH=qnx
   1.161 -        CheckVisibilityHidden
   1.162 -        CheckDummyVideo
   1.163 -        CheckDiskAudio
   1.164 -        CheckDummyAudio
   1.165 -        CheckDLOPEN
   1.166 -        CheckPulseAudio
   1.167 -        CheckESD
   1.168 -        CheckNAS
   1.169 -        CheckPHOTON
   1.170 -        CheckQNXGF
   1.171 -        CheckX11
   1.172 -        CheckOpenGLX11
   1.173 -        CheckPTHREAD
   1.174 -        CheckClockGettime
   1.175 -
   1.176 -
   1.177 -        # Set up files for the audio library
   1.178 -        if test x$enable_audio = xyes; then
   1.179 -            AC_DEFINE(SDL_AUDIO_DRIVER_QSA)
   1.180 -            SOURCES="$SOURCES $srcdir/src/audio/qsa/*.c"
   1.181 -            EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lasound"
   1.182 -            have_audio=yes
   1.183 -        fi
   1.184 -        # Set up files for the timer library
   1.185 -        if test x$enable_timers = xyes; then
   1.186 -            AC_DEFINE(SDL_TIMER_UNIX)
   1.187 -            SOURCES="$SOURCES $srcdir/src/timer/unix/*.c"
   1.188 -            have_timers=yes
   1.189 -        fi
   1.190 -        # Set up dummy files for the joystick for now
   1.191 -        if test x$enable_joystick = xyes; then
   1.192 -            AC_DEFINE(SDL_JOYSTICK_DUMMY)
   1.193 -            SOURCES="$SOURCES $srcdir/src/joystick/dummy/*.c"
   1.194 -            have_joystick=yes
   1.195 -        fi
   1.196 -        # Set up dummy files for the haptic for now
   1.197 -        if test x$enable_haptic = xyes; then
   1.198 -            AC_DEFINE(SDL_HAPTIC_DUMMY)
   1.199 -            SOURCES="$SOURCES $srcdir/src/haptic/dummy/*.c"
   1.200 -            have_haptic=yes
   1.201 -        fi
   1.202 -        ;;
   1.203      *-wince* | *-mingw32ce)
   1.204          ARCH=win32
   1.205          CheckDummyVideo