configure.in
changeset 5150 1435f8a6425c
parent 5139 57851a238c8f
child 5154 fb424691cfc7
--- a/configure.in	Tue Feb 01 21:23:43 2011 -0800
+++ b/configure.in	Tue Feb 01 21:40:03 2011 -0800
@@ -1326,70 +1326,6 @@
     fi
 }
 
-dnl Check for QNX photon video driver
-CheckPHOTON()
-{
-    AC_ARG_ENABLE(video-photon,
-AC_HELP_STRING([--enable-video-photon], [use QNX Photon video driver [[default=yes]]]),
-                  , enable_video_photon=yes)
-    if test x$enable_video = xyes -a x$enable_video_photon = xyes; then
-        AC_MSG_CHECKING(for QNX Photon support)
-        video_photon=no
-        AC_TRY_COMPILE([
-          #include <Ph.h>
-          #include <Pt.h>
-          #include <photon/Pg.h>
-          #include <photon/PdDirect.h>
-        ],[
-         PgDisplaySettings_t *visual;
-        ],[
-        video_photon=yes
-        ])
-        AC_MSG_RESULT($video_photon)
-        if test x$video_photon = xyes; then
-            AC_DEFINE(SDL_VIDEO_DRIVER_PHOTON)
-            SOURCES="$SOURCES $srcdir/src/video/photon/*.c"
-            EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lph -lphrender"
-            have_video=yes
-
-            CheckOpenGLQNX
-        fi
-    fi
-}
-
-dnl Check for QNX photon video driver
-CheckQNXGF()
-{
-    AC_ARG_ENABLE(video-qnxgf,
-                  AC_HELP_STRING([--enable-video-qnxgf], [use QNX GF video driver [[default=yes]]]),
-                  , enable_video_qnxgf=yes)
-    if test x$enable_video = xyes -a x$enable_video_qnxgf = xyes; then
-        AC_MSG_CHECKING(for QNX GF support)
-        video_qnxgf=no
-        AC_TRY_COMPILE([
-          #include <gf/gf.h>
-          #include <gf/gf3d.h>
-        ],[
-         gf_3d_config_info_t* gfinfo;
-        ],[
-        video_qnxgf=yes
-        ])
-        AC_MSG_RESULT($video_qnxgf)
-        if test x$video_qnxgf = xyes; then
-            AC_DEFINE(SDL_VIDEO_DRIVER_QNXGF)
-            SOURCES="$SOURCES $srcdir/src/video/qnxgf/*.c"
-            EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lgf"
-
-            # Add HIDDI library for HID support using GF
-            EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lhiddi"
-
-            have_video=yes
-
-            CheckOpenGLESQNX
-        fi
-    fi
-}
-
 dnl Set up the BWindow video driver if enabled
 CheckBWINDOW()
 {
@@ -1594,65 +1530,6 @@
     fi
 }
 
-dnl Find QNX 6.x Software OpenGL
-CheckOpenGLQNX()
-{
-    if test x$enable_video = xyes -a x$enable_video_opengl = xyes; then
-        AC_MSG_CHECKING(for QNX 6.x Photon OpenGL support)
-        video_opengl=no
-        AC_TRY_COMPILE([
-         #include <GL/gl.h>
-        ],[
-        ],[
-        video_opengl=yes
-        ])
-        AC_MSG_RESULT($video_opengl)
-        if test x$video_opengl = xyes; then
-            AC_DEFINE(SDL_VIDEO_OPENGL)
-            AC_DEFINE(SDL_VIDEO_RENDER_OGL)
-            EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lGL"
-        fi
-    fi
-}
-
-dnl Find QNX 6.3 and above OpenGL ES implementation
-CheckOpenGLESQNX()
-{
-    if test x$enable_video = xyes -a x$enable_video_opengl = xyes; then
-        AC_MSG_CHECKING(for QNX OpenGL ES (CM) support)
-        video_opengl=no
-        AC_TRY_COMPILE([
-         #include <GLES/egl.h>
-        ],[
-        ],[
-        video_opengl=yes
-        ])
-        AC_MSG_RESULT($video_opengl)
-        if test x$video_opengl = xyes; then
-            AC_DEFINE(SDL_VIDEO_OPENGL_ES)
-            AC_DEFINE(SDL_VIDEO_RENDER_OGL_ES)
-            EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lGLES_CM"
-        else
-            AC_MSG_CHECKING(for QNX OpenGL ES (CL) support)
-            video_opengl=no
-            AC_TRY_COMPILE([
-             #define COMMON_LITE
-             #include <GLES/egl.h>
-            ],[
-            ],[
-            video_opengl=yes
-            ])
-            AC_MSG_RESULT($video_opengl)
-            if test x$video_opengl = xyes; then
-                AC_DEFINE(SDL_VIDEO_OPENGL_ES)
-                AC_DEFINE(SDL_VIDEO_RENDER_OGL_ES)
-                EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lGLES_CLS"
-            fi
-        fi
-    fi
-}
-
-
 dnl Check for Windows OpenGL
 CheckWINDOWSGL()
 {
@@ -1796,10 +1673,6 @@
             pthread_cflags="-D_REENTRANT"
             pthread_lib="-L/usr/lib -lpthread"
             ;;
-        *-*-qnx*)
-            pthread_cflags=""
-            pthread_lib=""
-            ;;
         *-*-osf*)
             pthread_cflags="-D_REENTRANT"
             if test x$ac_cv_prog_gcc = xyes; then
@@ -2287,54 +2160,6 @@
             have_timers=yes
         fi
         ;;
-    *-*-qnx*)
-
-        EXTRA_CFLAGS="-I/usr/include $CFLAGS"
-        EXTRA_LDLAGS="-L/usr/lib $LDFLAGS"
-
-        ARCH=qnx
-        CheckVisibilityHidden
-        CheckDummyVideo
-        CheckDiskAudio
-        CheckDummyAudio
-        CheckDLOPEN
-        CheckPulseAudio
-        CheckESD
-        CheckNAS
-        CheckPHOTON
-        CheckQNXGF
-        CheckX11
-        CheckOpenGLX11
-        CheckPTHREAD
-        CheckClockGettime
-
-
-        # Set up files for the audio library
-        if test x$enable_audio = xyes; then
-            AC_DEFINE(SDL_AUDIO_DRIVER_QSA)
-            SOURCES="$SOURCES $srcdir/src/audio/qsa/*.c"
-            EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lasound"
-            have_audio=yes
-        fi
-        # Set up files for the timer library
-        if test x$enable_timers = xyes; then
-            AC_DEFINE(SDL_TIMER_UNIX)
-            SOURCES="$SOURCES $srcdir/src/timer/unix/*.c"
-            have_timers=yes
-        fi
-        # Set up dummy files for the joystick for now
-        if test x$enable_joystick = xyes; then
-            AC_DEFINE(SDL_JOYSTICK_DUMMY)
-            SOURCES="$SOURCES $srcdir/src/joystick/dummy/*.c"
-            have_joystick=yes
-        fi
-        # Set up dummy files for the haptic for now
-        if test x$enable_haptic = xyes; then
-            AC_DEFINE(SDL_HAPTIC_DUMMY)
-            SOURCES="$SOURCES $srcdir/src/haptic/dummy/*.c"
-            have_haptic=yes
-        fi
-        ;;
     *-wince* | *-mingw32ce)
         ARCH=win32
         CheckDummyVideo