configure
changeset 8752 44d31ae3d104
parent 8704 2732c28ca4db
child 8774 3e2b3019a879
     1.1 --- a/configure	Tue May 06 00:13:07 2014 -0400
     1.2 +++ b/configure	Tue May 06 00:20:34 2014 -0400
     1.3 @@ -18953,7 +18953,6 @@
     1.4                  EXTRA_LDFLAGS="$EXTRA_LDFLAGS $MIR_LIBS"
     1.5                  SUMMARY_video="${SUMMARY_video} mir"
     1.6              fi
     1.7 -            SDL_CFLAGS="$SDL_CFLAGS $MIR_CFLAGS"
     1.8              have_video=yes
     1.9          fi
    1.10      fi
    1.11 @@ -21405,6 +21404,10 @@
    1.12  fi
    1.13  
    1.14      case "$host" in
    1.15 +	 *-*-androideabi*)
    1.16 +            pthread_cflags="-D_REENTRANT -D_THREAD_SAFE"
    1.17 +            pthread_lib=""
    1.18 +	    ;;
    1.19          *-*-linux*|*-*-uclinux*)
    1.20              pthread_cflags="-D_REENTRANT"
    1.21              pthread_lib="-lpthread"
    1.22 @@ -21912,6 +21915,12 @@
    1.23  fi
    1.24  
    1.25  
    1.26 +        ac_fn_c_check_header_mongrel "$LINENO" "dxgi.h" "ac_cv_header_dxgi_h" "$ac_includes_default"
    1.27 +if test "x$ac_cv_header_dxgi_h" = xyes; then :
    1.28 +  have_dxgi=yes
    1.29 +fi
    1.30 +
    1.31 +
    1.32  
    1.33          SUMMARY_video="${SUMMARY_video} directx"
    1.34          SUMMARY_audio="${SUMMARY_audio} directx"
    1.35 @@ -22549,6 +22558,20 @@
    1.36                      $as_echo "#define SDL_VIDEO_DRIVER_RPI 1" >>confdefs.h
    1.37                  fi
    1.38                  ;;
    1.39 +            *-*-androideabi*)
    1.40 +                # Android
    1.41 +                ARCH=android
    1.42 +                ANDROID_CFLAGS="-DGL_GLEXT_PROTOTYPES"
    1.43 +                CFLAGS="$CFLAGS $ANDROID_CFLAGS"
    1.44 +                SDL_CFLAGS="$SDL_CFLAGS $ANDROID_CFLAGS"
    1.45 +                EXTRA_CFLAGS="$EXTRA_CFLAGS $ANDROID_CFLAGS"
    1.46 +                EXTRA_LDFLAGS="$EXTRA_LDFLAGS -ldl -lGLESv1_CM -lGLESv2 -llog -landroid"
    1.47 +
    1.48 +                if test x$enable_video = xyes; then
    1.49 +                    SOURCES="$SOURCES $srcdir/src/core/android/*.c $srcdir/src/video/android/*.c"
    1.50 +                    $as_echo "#define SDL_VIDEO_DRIVER_ANDROID 1" >>confdefs.h
    1.51 +                fi
    1.52 +                ;;
    1.53              *-*-linux*)         ARCH=linux ;;
    1.54              *-*-uclinux*)       ARCH=linux ;;
    1.55              *-*-kfreebsd*-gnu)  ARCH=kfreebsd-gnu ;;
    1.56 @@ -22619,6 +22642,13 @@
    1.57                  SOURCES="$SOURCES $srcdir/src/audio/paudio/*.c"
    1.58                  have_audio=yes
    1.59              ;;
    1.60 +            android)
    1.61 +
    1.62 +$as_echo "#define SDL_AUDIO_DRIVER_ANDROID 1" >>confdefs.h
    1.63 +
    1.64 +                SOURCES="$SOURCES $srcdir/src/audio/android/*.c"
    1.65 +                have_audio=yes
    1.66 +            ;;
    1.67            esac
    1.68          fi
    1.69          # Set up files for the joystick library
    1.70 @@ -22631,6 +22661,13 @@
    1.71                  SOURCES="$SOURCES $srcdir/src/joystick/linux/*.c"
    1.72                  have_joystick=yes
    1.73              ;;
    1.74 +            android)
    1.75 +
    1.76 +$as_echo "#define SDL_JOYSTICK_ANDROID 1" >>confdefs.h
    1.77 +
    1.78 +                SOURCES="$SOURCES $srcdir/src/joystick/android/*.c"
    1.79 +                have_joystick=yes
    1.80 +            ;;
    1.81            esac
    1.82          fi
    1.83          # Set up files for the haptic library
    1.84 @@ -22657,6 +22694,13 @@
    1.85                     SOURCES="$SOURCES $srcdir/src/power/linux/*.c"
    1.86                     have_power=yes
    1.87                 ;;
    1.88 +               android)
    1.89 +
    1.90 +$as_echo "#define SDL_POWER_ANDROID 1" >>confdefs.h
    1.91 +
    1.92 +                   SOURCES="$SOURCES $srcdir/src/power/android/*.c"
    1.93 +                   have_power=yes
    1.94 +               ;;
    1.95               esac
    1.96          fi
    1.97          # Set up files for the filesystem library
    1.98 @@ -22731,6 +22775,11 @@
    1.99  
   1.100              fi
   1.101          fi
   1.102 +        if test x$have_dxgi = xyes; then
   1.103 +
   1.104 +$as_echo "#define HAVE_DXGI_H 1" >>confdefs.h
   1.105 +
   1.106 +        fi
   1.107          # Set up files for the audio library
   1.108          if test x$enable_audio = xyes; then
   1.109  
   1.110 @@ -23155,7 +23204,7 @@
   1.111      OBJECTS=`echo "$OBJECTS" | sed 's,[^ ]*/\([^ ]*\)\.'$EXT',$(objects)/\1.lo,g'`
   1.112      DEPENDS=`echo "$DEPENDS" | sed "s,^\\([^ ]*\\)/\\([^ ]*\\)\\.$EXT\\$,\\\\
   1.113  \\$(objects)/\\2.lo: \\1/\\2.$EXT\\\\
   1.114 -	\\$(LIBTOOL) --mode=compile \\$(CC) \\$(CFLAGS) \\$(EXTRA_CFLAGS) $DEPENDENCY_TRACKING_OPTIONS -c \\$< -o \\$@,g"`
   1.115 +	\\$(LIBTOOL) --tag=CC --mode=compile \\$(CC) \\$(CFLAGS) \\$(EXTRA_CFLAGS) $DEPENDENCY_TRACKING_OPTIONS -c \\$< -o \\$@,g"`
   1.116  done
   1.117  
   1.118  VERSION_OBJECTS=`echo $VERSION_SOURCES`
   1.119 @@ -23170,14 +23219,14 @@
   1.120  SDLMAIN_OBJECTS=`echo "$SDLMAIN_OBJECTS" | sed 's,[^ ]*/\([^ ]*\)\.c,$(objects)/\1.o,g'`
   1.121  SDLMAIN_DEPENDS=`echo "$SDLMAIN_DEPENDS" | sed "s,\\([^ ]*\\)/\\([^ ]*\\)\\.c,\\\\
   1.122  \\$(objects)/\\2.o: \\1/\\2.c\\\\
   1.123 -	\\$(LIBTOOL) --mode=compile \\$(CC) \\$(CFLAGS) \\$(EXTRA_CFLAGS) $DEPENDENCY_TRACKING_OPTIONS -c \\$< -o \\$@,g"`
   1.124 +	\\$(LIBTOOL) --tag=CC --mode=compile \\$(CC) \\$(CFLAGS) \\$(EXTRA_CFLAGS) $DEPENDENCY_TRACKING_OPTIONS -c \\$< -o \\$@,g"`
   1.125  
   1.126  SDLTEST_OBJECTS=`echo $SDLTEST_SOURCES`
   1.127  SDLTEST_DEPENDS=`echo $SDLTEST_SOURCES`
   1.128  SDLTEST_OBJECTS=`echo "$SDLTEST_OBJECTS" | sed 's,[^ ]*/\([^ ]*\)\.c,$(objects)/\1.o,g'`
   1.129  SDLTEST_DEPENDS=`echo "$SDLTEST_DEPENDS" | sed "s,\\([^ ]*\\)/\\([^ ]*\\)\\.c,\\\\
   1.130  \\$(objects)/\\2.o: \\1/\\2.c\\\\
   1.131 -	\\$(LIBTOOL) --mode=compile \\$(CC) \\$(CFLAGS) \\$(EXTRA_CFLAGS) $DEPENDENCY_TRACKING_OPTIONS -c \\$< -o \\$@,g"`
   1.132 +	\\$(LIBTOOL) --tag=CC --mode=compile \\$(CC) \\$(CFLAGS) \\$(EXTRA_CFLAGS) $DEPENDENCY_TRACKING_OPTIONS -c \\$< -o \\$@,g"`
   1.133  
   1.134  # Set runtime shared library paths as needed
   1.135