configure
changeset 10904 4dbd025c4eb9
parent 10850 c9dc0068b0e7
child 10918 377c52085fef
     1.1 --- a/configure	Mon Feb 20 10:55:33 2017 -0800
     1.2 +++ b/configure	Mon Feb 20 10:55:49 2017 -0800
     1.3 @@ -23671,9 +23671,7 @@
     1.4          SOURCES="$srcdir/src/main/haiku/*.cc $SOURCES"
     1.5          EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lroot -lbe -lmedia -lgame -ldevice -ltextencoding"
     1.6          ;;
     1.7 -    arm*-apple-darwin*)
     1.8 -        # iOS - We are not writing anything to confdefs.h because you have to replace
     1.9 -        # SDL_config.h for SDL_config_iphoneos.h anyway
    1.10 +    arm*-apple-darwin*|*-ios-*)
    1.11          ARCH=ios
    1.12  
    1.13          CheckVisibilityHidden
    1.14 @@ -23682,18 +23680,22 @@
    1.15          CheckDiskAudio
    1.16          CheckDummyAudio
    1.17          CheckDLOPEN
    1.18 -        CheckCOCOA
    1.19          CheckPTHREAD
    1.20  
    1.21 -
    1.22          # Set up files for the audio library
    1.23          if test x$enable_audio = xyes; then
    1.24 +
    1.25 +$as_echo "#define SDL_AUDIO_DRIVER_COREAUDIO 1" >>confdefs.h
    1.26 +
    1.27              SOURCES="$SOURCES $srcdir/src/audio/coreaudio/*.m"
    1.28              SUMMARY_audio="${SUMMARY_audio} coreaudio"
    1.29              have_audio=yes
    1.30          fi
    1.31          # Set up files for the joystick library
    1.32          if test x$enable_joystick = xyes; then
    1.33 +
    1.34 +$as_echo "#define SDL_JOYSTICK_MFI 1" >>confdefs.h
    1.35 +
    1.36              SOURCES="$SOURCES $srcdir/src/joystick/iphoneos/*.m"
    1.37              have_joystick=yes
    1.38          fi
    1.39 @@ -23705,6 +23707,9 @@
    1.40          #fi
    1.41          # Set up files for the power library
    1.42          if test x$enable_power = xyes; then
    1.43 +
    1.44 +$as_echo "#define SDL_POWER_UIKIT 1" >>confdefs.h
    1.45 +
    1.46              SOURCES="$SOURCES $srcdir/src/power/uikit/*.m"
    1.47              have_power=yes
    1.48          fi
    1.49 @@ -23713,28 +23718,50 @@
    1.50              SOURCES="$SOURCES $srcdir/src/filesystem/cocoa/*.m"
    1.51              have_filesystem=yes
    1.52          fi
    1.53 +        # Set up additional files for the file library
    1.54 +        if test x$enable_file = xyes; then
    1.55 +
    1.56 +$as_echo "#define SDL_FILESYSTEM_COCOA 1" >>confdefs.h
    1.57 +
    1.58 +            SOURCES="$SOURCES $srcdir/src/file/cocoa/*.m"
    1.59 +        fi
    1.60          # Set up files for the timer library
    1.61          if test x$enable_timers = xyes; then
    1.62 +
    1.63 +$as_echo "#define SDL_TIMER_UNIX 1" >>confdefs.h
    1.64 +
    1.65              SOURCES="$SOURCES $srcdir/src/timer/unix/*.c"
    1.66              have_timers=yes
    1.67          fi
    1.68 -        # Set up additional files for the file library
    1.69 -        if test x$enable_file = xyes; then
    1.70 -            SOURCES="$SOURCES $srcdir/src/file/cocoa/*.m"
    1.71 -        fi
    1.72          # The iOS platform requires special setup.
    1.73 +
    1.74 +$as_echo "#define SDL_VIDEO_DRIVER_UIKIT 1" >>confdefs.h
    1.75 +
    1.76 +
    1.77 +$as_echo "#define SDL_VIDEO_OPENGL_ES2 1" >>confdefs.h
    1.78 +
    1.79 +
    1.80 +$as_echo "#define SDL_VIDEO_OPENGL_ES 1" >>confdefs.h
    1.81 +
    1.82 +
    1.83 +$as_echo "#define SDL_VIDEO_RENDER_OGL_ES 1" >>confdefs.h
    1.84 +
    1.85 +
    1.86 +$as_echo "#define SDL_VIDEO_RENDER_OGL_ES2 1" >>confdefs.h
    1.87 +
    1.88          SOURCES="$SOURCES $srcdir/src/video/uikit/*.m"
    1.89          EXTRA_CFLAGS="$EXTRA_CFLAGS -fpascal-strings"
    1.90          EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lm -liconv -lobjc"
    1.91 +        EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,AVFoundation"
    1.92 +        EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,AudioToolbox"
    1.93 +        EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,CoreAudio"
    1.94 +        EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,CoreGraphics"
    1.95 +        EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,CoreMotion"
    1.96          EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,Foundation"
    1.97 -        EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,UIKit"
    1.98 +        EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,GameController"
    1.99          EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,OpenGLES"
   1.100          EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,QuartzCore"
   1.101 -        EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,CoreAudio"
   1.102 -        EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,AudioToolbox"
   1.103 -        EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,CoreGraphics"
   1.104 -        EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,CoreMotion"
   1.105 -        EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,GameController"
   1.106 +        EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,UIKit"
   1.107          ;;
   1.108      *-*-darwin* )
   1.109          # This could be either full "Mac OS X", or plain "Darwin" which is