configure.in
branchSDL-1.3
changeset 1712 931d111e737a
parent 1711 865ba39fc96d
child 1714 b025e419d344
     1.1 --- a/configure.in	Mon Jun 26 05:27:34 2006 +0000
     1.2 +++ b/configure.in	Mon Jun 26 13:56:56 2006 +0000
     1.3 @@ -1861,9 +1861,8 @@
     1.4      fi
     1.5  
     1.6      if test x$enable_video = xyes; then
     1.7 -        AC_DEFINE(SDL_VIDEO_DRIVER_WINDIB)
     1.8 -        SOURCES="$SOURCES $srcdir/src/video/wincommon/*.c"
     1.9 -        SOURCES="$SOURCES $srcdir/src/video/windib/*.c"
    1.10 +        AC_DEFINE(SDL_VIDEO_DRIVER_WIN32)
    1.11 +        SOURCES="$SOURCES $srcdir/src/video/win32/*.c"
    1.12          have_video=yes
    1.13      fi
    1.14  }
    1.15 @@ -1875,18 +1874,8 @@
    1.16  AC_HELP_STRING([--enable-directx], [use DirectX for Win32 audio/video [[default=yes]]]),
    1.17                    , enable_directx=yes)
    1.18      if test x$enable_directx = xyes; then
    1.19 -        have_directx=no
    1.20 -        AC_CHECK_HEADER(ddraw.h, have_ddraw=yes)
    1.21          AC_CHECK_HEADER(dsound.h, have_dsound=yes)
    1.22          AC_CHECK_HEADER(dinput.h, use_dinput=yes)
    1.23 -        if test x$have_ddraw = xyes -a x$have_dsound = xyes -a x$use_dinput = xyes; then
    1.24 -            have_directx=yes
    1.25 -        fi
    1.26 -        if test x$enable_video = xyes -a x$have_directx = xyes; then
    1.27 -            AC_DEFINE(SDL_VIDEO_DRIVER_DDRAW)
    1.28 -            SOURCES="$SOURCES $srcdir/src/video/windx5/*.c"
    1.29 -            have_video=yes
    1.30 -        fi
    1.31      fi
    1.32  }
    1.33  
    1.34 @@ -2311,7 +2300,7 @@
    1.35          if test x$enable_audio = xyes; then
    1.36              AC_DEFINE(SDL_AUDIO_DRIVER_WAVEOUT)
    1.37              SOURCES="$SOURCES $srcdir/src/audio/windib/*.c"
    1.38 -            if test x$have_directx = xyes; then
    1.39 +            if test x$have_dsound = xyes; then
    1.40                  AC_DEFINE(SDL_AUDIO_DRIVER_DSOUND)
    1.41                  SOURCES="$SOURCES $srcdir/src/audio/windx5/*.c"
    1.42              fi
    1.43 @@ -2319,7 +2308,7 @@
    1.44          fi
    1.45          # Set up files for the joystick library
    1.46          if test x$enable_joystick = xyes; then
    1.47 -            if test x$have_directx = xyes; then
    1.48 +            if test x$have_dinput = xyes; then
    1.49                  AC_DEFINE(SDL_JOYSTICK_DINPUT)
    1.50                  SOURCES="$SOURCES $srcdir/src/joystick/win32/SDL_dxjoystick.c"
    1.51              else
    1.52 @@ -2357,9 +2346,6 @@
    1.53          fi
    1.54          # Set up the system libraries we need
    1.55          EXTRA_LDFLAGS="$EXTRA_LDFLAGS -luser32 -lgdi32 -lwinmm"
    1.56 -        if test x$have_directx = xyes; then
    1.57 -            EXTRA_LDFLAGS="$EXTRA_LDFLAGS -ldxguid"
    1.58 -        fi
    1.59          # The Win32 platform requires special setup
    1.60          SDLMAIN_SOURCES="$srcdir/src/main/win32/*.c"
    1.61          SDL_CFLAGS="$SDL_CFLAGS -Dmain=SDL_main"