diff -r 4fd635362e14 -r 87edb7aa263b configure --- a/configure vie feb 24 17:01:58 2012 -0300 +++ b/configure jue may 10 20:24:12 2012 -0300 @@ -27702,6 +27702,63 @@ SOURCES="$srcdir/src/main/beos/*.cc $SOURCES" EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lroot -lbe -lmedia -lgame -ldevice -ltextencoding" ;; + arm*-apple-darwin* ) + # iOS - We are not writing anything to confdefs.h because you have to replace + # SDL_config.h for SDL_config_iphoneos.h anyway + ARCH=ios + + SOURCES="$SOURCES $srcdir/src/video/uikit/*.m" + SOURCES="$SOURCES $srcdir/src/video/uikit/*.c" + + CheckVisibilityHidden + CheckDummyVideo + CheckDiskAudio + CheckDummyAudio + CheckDLOPEN + CheckCOCOA + CheckPTHREAD + + # Set up files for the audio library + if test x$enable_audio = xyes; then + SOURCES="$SOURCES $srcdir/src/audio/coreaudio/*.c" + have_audio=yes + fi + # Set up files for the joystick library + if test x$enable_joystick = xyes; then + SOURCES="$SOURCES $srcdir/src/joystick/iphoneos/*.m" + have_joystick=yes + fi + # Set up files for the haptic library + #if test x$enable_haptic = xyes; then + # SOURCES="$SOURCES $srcdir/src/haptic/darwin/*.c" + # have_haptic=yes + # EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,ForceFeedback" + #fi + # Set up files for the power library + if test x$enable_power = xyes; then + SOURCES="$SOURCES $srcdir/src/power/uikit/*.m" + have_power=yes + fi + # Set up files for the timer library + if test x$enable_timers = xyes; then + SOURCES="$SOURCES $srcdir/src/timer/unix/*.c" + have_timers=yes + fi + # Set up additional files for the file library + if test x$enable_file = xyes; then + SOURCES="$SOURCES $srcdir/src/file/cocoa/*.m" + fi + # The Mac OS X platform requires special setup. + EXTRA_CFLAGS="$EXTRA_CFLAGS -fpascal-strings" + EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lm -liconv -lobjc" + EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,Foundation" + EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,UIKit" + EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,OpenGLES" + EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,QuartzCore" + EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,CoreAudio" + EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,AudioToolbox" + EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,CoreGraphics" + ;; *-*-darwin* ) # This could be either full "Mac OS X", or plain "Darwin" which is # just the OS X kernel sans upper layers like Carbon and Cocoa. diff -r 4fd635362e14 -r 87edb7aa263b configure.in --- a/configure.in vie feb 24 17:01:58 2012 -0300 +++ b/configure.in jue may 10 20:24:12 2012 -0300 @@ -2404,6 +2404,63 @@ SOURCES="$srcdir/src/main/beos/*.cc $SOURCES" EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lroot -lbe -lmedia -lgame -ldevice -ltextencoding" ;; + arm*-apple-darwin* ) + # iOS - We are not writing anything to confdefs.h because you have to replace + # SDL_config.h for SDL_config_iphoneos.h anyway + ARCH=ios + + SOURCES="$SOURCES $srcdir/src/video/uikit/*.m" + SOURCES="$SOURCES $srcdir/src/video/uikit/*.c" + CheckVisibilityHidden + CheckDummyVideo + CheckDiskAudio + CheckDummyAudio + CheckDLOPEN + CheckCOCOA + CheckPTHREAD + + + # Set up files for the audio library + if test x$enable_audio = xyes; then + SOURCES="$SOURCES $srcdir/src/audio/coreaudio/*.c" + have_audio=yes + fi + # Set up files for the joystick library + if test x$enable_joystick = xyes; then + SOURCES="$SOURCES $srcdir/src/joystick/iphoneos/*.m" + have_joystick=yes + fi + # Set up files for the haptic library + #if test x$enable_haptic = xyes; then + # SOURCES="$SOURCES $srcdir/src/haptic/darwin/*.c" + # have_haptic=yes + # EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,ForceFeedback" + #fi + # Set up files for the power library + if test x$enable_power = xyes; then + SOURCES="$SOURCES $srcdir/src/power/uikit/*.m" + have_power=yes + fi + # Set up files for the timer library + if test x$enable_timers = xyes; then + SOURCES="$SOURCES $srcdir/src/timer/unix/*.c" + have_timers=yes + fi + # Set up additional files for the file library + if test x$enable_file = xyes; then + SOURCES="$SOURCES $srcdir/src/file/cocoa/*.m" + fi + # The Mac OS X platform requires special setup. + EXTRA_CFLAGS="$EXTRA_CFLAGS -fpascal-strings" + EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lm -liconv -lobjc" + EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,Foundation" + EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,UIKit" + EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,OpenGLES" + EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,QuartzCore" + EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,CoreAudio" + EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,AudioToolbox" + EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,CoreGraphics" + ;; *-*-darwin* ) # This could be either full "Mac OS X", or plain "Darwin" which is # just the OS X kernel sans upper layers like Carbon and Cocoa. diff -r 4fd635362e14 -r 87edb7aa263b src/video/uikit/SDL_uikitappdelegate.m --- a/src/video/uikit/SDL_uikitappdelegate.m vie feb 24 17:01:58 2012 -0300 +++ b/src/video/uikit/SDL_uikitappdelegate.m jue may 10 20:24:12 2012 -0300 @@ -29,7 +29,7 @@ #import "SDL_uikitappdelegate.h" #import "SDL_uikitopenglview.h" -#import "SDL_events_c.h" +#import "../../events/SDL_events_c.h" #import "jumphack.h" #ifdef main diff -r 4fd635362e14 -r 87edb7aa263b src/video/uikit/SDL_uikitopengles.m --- a/src/video/uikit/SDL_uikitopengles.m vie feb 24 17:01:58 2012 -0300 +++ b/src/video/uikit/SDL_uikitopengles.m jue may 10 20:24:12 2012 -0300 @@ -27,7 +27,7 @@ #include "SDL_uikitappdelegate.h" #include "SDL_uikitwindow.h" #include "jumphack.h" -#include "SDL_sysvideo.h" +#include "../SDL_sysvideo.h" #include "../../events/SDL_keyboard_c.h" #include "../../events/SDL_mouse_c.h" #include "../../power/uikit/SDL_syspower.h"