configure
changeset 8972 dfc759d7486f
parent 8962 c593cbef6d7d
child 8976 1a5d959d7b32
     1.1 --- a/configure	Thu Jul 03 17:36:08 2014 -0300
     1.2 +++ b/configure	Thu Jul 03 15:39:55 2014 -0700
     1.3 @@ -22112,18 +22112,50 @@
     1.4  fi
     1.5  
     1.6  
     1.7 +        ac_fn_c_check_header_mongrel "$LINENO" "dxgi.h" "ac_cv_header_dxgi_h" "$ac_includes_default"
     1.8 +if test "x$ac_cv_header_dxgi_h" = xyes; then :
     1.9 +  have_dxgi=yes
    1.10 +fi
    1.11 +
    1.12 +
    1.13          ac_fn_c_check_header_mongrel "$LINENO" "xaudio2.h" "ac_cv_header_xaudio2_h" "$ac_includes_default"
    1.14  if test "x$ac_cv_header_xaudio2_h" = xyes; then :
    1.15    have_xaudio2=yes
    1.16  fi
    1.17  
    1.18  
    1.19 -        ac_fn_c_check_header_mongrel "$LINENO" "dxgi.h" "ac_cv_header_dxgi_h" "$ac_includes_default"
    1.20 -if test "x$ac_cv_header_dxgi_h" = xyes; then :
    1.21 -  have_dxgi=yes
    1.22 -fi
    1.23 -
    1.24 -
    1.25 +        ac_fn_c_check_header_mongrel "$LINENO" "xinput.h" "ac_cv_header_xinput_h" "$ac_includes_default"
    1.26 +if test "x$ac_cv_header_xinput_h" = xyes; then :
    1.27 +  have_xinput=yes
    1.28 +fi
    1.29 +
    1.30 +
    1.31 +
    1.32 +        if test x$have_ddraw = xyes; then
    1.33 +
    1.34 +$as_echo "#define HAVE_DDRAW_H 1" >>confdefs.h
    1.35 +
    1.36 +        fi
    1.37 +        if test x$have_dinput = xyes; then
    1.38 +
    1.39 +$as_echo "#define HAVE_DINPUT_H 1" >>confdefs.h
    1.40 +
    1.41 +        fi
    1.42 +        if test x$have_dsound = xyes; then
    1.43 +
    1.44 +$as_echo "#define HAVE_DSOUND_H 1" >>confdefs.h
    1.45 +
    1.46 +        fi
    1.47 +        if test x$have_dxgi = xyes; then
    1.48 +
    1.49 +$as_echo "#define HAVE_DXGI_H 1" >>confdefs.h
    1.50 +
    1.51 +        fi
    1.52 +        if test x$have_xinput = xyes; then
    1.53 +
    1.54 +$as_echo "#define HAVE_XINPUT_H 1" >>confdefs.h
    1.55 +
    1.56 +        fi
    1.57  
    1.58          SUMMARY_video="${SUMMARY_video} directx"
    1.59          SUMMARY_audio="${SUMMARY_audio} directx"
    1.60 @@ -22981,11 +23013,6 @@
    1.61  
    1.62              fi
    1.63          fi
    1.64 -        if test x$have_dxgi = xyes; then
    1.65 -
    1.66 -$as_echo "#define HAVE_DXGI_H 1" >>confdefs.h
    1.67 -
    1.68 -        fi
    1.69          # Set up files for the audio library
    1.70          if test x$enable_audio = xyes; then
    1.71  
    1.72 @@ -23008,25 +23035,38 @@
    1.73          fi
    1.74          # Set up files for the joystick library
    1.75          if test x$enable_joystick = xyes; then
    1.76 -            if test x$have_dinput = xyes; then
    1.77 +            if test x$have_dinput = xyes -o x$have_xinput = xyes; then
    1.78 +                if test x$have_xinput = xyes; then
    1.79 +
    1.80 +$as_echo "#define SDL_JOYSTICK_XINPUT 1" >>confdefs.h
    1.81 +
    1.82 +                fi
    1.83 +                if test x$have_dinput = xyes; then
    1.84  
    1.85  $as_echo "#define SDL_JOYSTICK_DINPUT 1" >>confdefs.h
    1.86  
    1.87 -                SOURCES="$SOURCES $srcdir/src/joystick/windows/SDL_dxjoystick.c"
    1.88 -                EXTRA_LDFLAGS="$EXTRA_LDFLAGS -ldinput8 -ldxguid -ldxerr8"
    1.89 +                    EXTRA_LDFLAGS="$EXTRA_LDFLAGS -ldinput8 -ldxguid -ldxerr8"
    1.90 +                fi
    1.91              else
    1.92  
    1.93  $as_echo "#define SDL_JOYSTICK_WINMM 1" >>confdefs.h
    1.94  
    1.95 -                SOURCES="$SOURCES $srcdir/src/joystick/windows/SDL_mmjoystick.c"
    1.96 -            fi
    1.97 +            fi
    1.98 +            SOURCES="$SOURCES $srcdir/src/joystick/windows/*.c"
    1.99              have_joystick=yes
   1.100          fi
   1.101          if test x$enable_haptic = xyes; then
   1.102 -            if test x$have_dinput = xyes; then
   1.103 +            if test x$have_dinput = xyes -o x$have_xinput = xyes; then
   1.104 +                if test x$have_xinput = xyes; then
   1.105 +
   1.106 +$as_echo "#define SDL_HAPTIC_XINPUT 1" >>confdefs.h
   1.107 +
   1.108 +                fi
   1.109 +                if test x$have_dinput = xyes; then
   1.110  
   1.111  $as_echo "#define SDL_HAPTIC_DINPUT 1" >>confdefs.h
   1.112  
   1.113 +                fi
   1.114                  SOURCES="$SOURCES $srcdir/src/haptic/windows/SDL_syshaptic.c"
   1.115                  have_haptic=yes
   1.116              fi