浏览代码

iOS support.

woollybah 10 年之前
父节点
当前提交
60d125f131

+ 2 - 0
sdl.mod/common.bmx

@@ -27,6 +27,8 @@ Import BRL.Stream
 Import "source.bmx"
 ?emscripten
 Import "source.bmx"
+?ios
+Import "source.bmx"
 ?raspberrypi
 Import "-lrt"
 ?

+ 7 - 3
sdl.mod/sdl.bmx

@@ -40,7 +40,7 @@ Import "include/win32x86/*.h"
 ModuleInfo "LD_OPTS: -L%PWD%/lib/win32x64"
 Import "include/win32x64/*.h"
 
-?macos
+?osx
 ModuleInfo "LD_OPTS: -F%PWD%/lib/macos"
 ModuleInfo "LD_OPTS: -Xlinker -rpath -Xlinker @loader_path/../Frameworks"
 Import "include/macos/*.h"
@@ -67,7 +67,11 @@ ModuleInfo "CC_OPTS: -DUSING_GENERATED_CONFIG_H"
 
 Import "include/emscripten/*.h"
 Import "SDL/include/*.h"
-?
+?ios
+ModuleInfo "CC_OPTS: -fobjc-arc"
+
+Import "include/ios/*.h"
+Import "SDL/include/*.h"
 
 ?Not android
 Import "include/*.h"
@@ -87,7 +91,7 @@ Import "-lSDL2"
 Import "-lSDL2"
 ?raspberrypi
 Import "-lSDL2"
-?macos
+?osx
 Import "-framework SDL2"
 ?linux
 Import "-ldl"

+ 95 - 0
sdl.mod/source.bmx

@@ -230,4 +230,99 @@ Import "SDL/src/thread/generic/SDL_syssem.c"
 Import "SDL/src/thread/generic/SDL_systhread.c"
 Import "SDL/src/thread/generic/SDL_systls.c"
 
+?ios
+
+Import "SDL/src/atomic/SDL_atomic.c"
+Import "SDL/src/atomic/SDL_spinlock.c"
+Import "SDL/src/audio/coreaudio/SDL_coreaudio.c"
+Import "SDL/src/audio/dummy/SDL_dummyaudio.c"
+Import "SDL/src/audio/SDL_audio.c"
+Import "SDL/src/audio/SDL_audiocvt.c"
+Import "SDL/src/audio/SDL_audiotypecvt.c"
+Import "SDL/src/audio/SDL_mixer.c"
+Import "SDL/src/audio/SDL_wave.c"
+Import "SDL/src/cpuinfo/SDL_cpuinfo.c"
+Import "SDL/src/events/SDL_clipboardevents.c"
+Import "SDL/src/events/SDL_dropevents.c"
+Import "SDL/src/events/SDL_events.c"
+Import "SDL/src/events/SDL_gesture.c"
+Import "SDL/src/events/SDL_keyboard.c"
+Import "SDL/src/events/SDL_mouse.c"
+Import "SDL/src/events/SDL_quit.c"
+Import "SDL/src/events/SDL_touch.c"
+Import "SDL/src/events/SDL_windowevents.c"
+Import "SDL/src/file/cocoa/SDL_rwopsbundlesupport.m"
+Import "SDL/src/file/SDL_rwops.c"
+Import "SDL/src/filesystem/cocoa/SDL_sysfilesystem.m"
+Import "SDL/src/haptic/dummy/SDL_syshaptic.c"
+Import "SDL/src/haptic/SDL_haptic.c"
+Import "SDL/src/joystick/iphoneos/SDL_sysjoystick.m"
+Import "SDL/src/joystick/SDL_gamecontroller.c"
+Import "SDL/src/joystick/SDL_joystick.c"
+Import "SDL/src/loadso/dummy/SDL_sysloadso.c"
+Import "SDL/src/power/SDL_power.c"
+Import "SDL/src/power/uikit/SDL_syspower.m"
+Import "SDL/src/render/opengles/SDL_render_gles.c"
+Import "SDL/src/render/opengles2/SDL_render_gles2.c"
+Import "SDL/src/render/opengles2/SDL_shaders_gles2.c"
+Import "SDL/src/render/SDL_render.c"
+Import "SDL/src/render/SDL_yuv_sw.c"
+Import "SDL/src/render/software/SDL_blendfillrect.c"
+Import "SDL/src/render/software/SDL_blendline.c"
+Import "SDL/src/render/software/SDL_blendpoint.c"
+Import "SDL/src/render/software/SDL_drawline.c"
+Import "SDL/src/render/software/SDL_drawpoint.c"
+Import "SDL/src/render/software/SDL_render_sw.c"
+Import "SDL/src/render/software/SDL_rotate.c"
+Import "SDL/src/SDL_assert.c"
+Import "SDL/src/SDL_error.c"
+Import "SDL/src/SDL_hints.c"
+Import "SDL/src/SDL_log.c"
+Import "SDL/src/SDL.c"
+Import "SDL/src/stdlib/SDL_getenv.c"
+Import "SDL/src/stdlib/SDL_iconv.c"
+Import "SDL/src/stdlib/SDL_malloc.c"
+Import "SDL/src/stdlib/SDL_qsort.c"
+Import "SDL/src/stdlib/SDL_stdlib.c"
+Import "SDL/src/stdlib/SDL_string.c"
+Import "SDL/src/thread/pthread/SDL_syscond.c"
+Import "SDL/src/thread/pthread/SDL_sysmutex.c"
+Import "SDL/src/thread/pthread/SDL_syssem.c"
+Import "SDL/src/thread/pthread/SDL_systhread.c"
+Import "SDL/src/thread/pthread/SDL_systls.c"
+Import "SDL/src/thread/SDL_thread.c"
+Import "SDL/src/timer/SDL_timer.c"
+Import "SDL/src/timer/unix/SDL_systimer.c"
+Import "SDL/src/video/dummy/SDL_nullevents.c"
+Import "SDL/src/video/dummy/SDL_nullframebuffer.c"
+Import "SDL/src/video/dummy/SDL_nullvideo.c"
+Import "SDL/src/video/SDL_blit_0.c"
+Import "SDL/src/video/SDL_blit_1.c"
+Import "SDL/src/video/SDL_blit_A.c"
+Import "SDL/src/video/SDL_blit_auto.c"
+Import "SDL/src/video/SDL_blit_copy.c"
+Import "SDL/src/video/SDL_blit_N.c"
+Import "SDL/src/video/SDL_blit_slow.c"
+Import "SDL/src/video/SDL_blit.c"
+Import "SDL/src/video/SDL_bmp.c"
+Import "SDL/src/video/SDL_clipboard.c"
+Import "SDL/src/video/SDL_fillrect.c"
+Import "SDL/src/video/SDL_pixels.c"
+Import "SDL/src/video/SDL_rect.c"
+Import "SDL/src/video/SDL_RLEaccel.c"
+Import "SDL/src/video/SDL_stretch.c"
+Import "SDL/src/video/SDL_surface.c"
+Import "SDL/src/video/SDL_video.c"
+Import "SDL/src/video/uikit/SDL_uikitappdelegate.m"
+Import "SDL/src/video/uikit/SDL_uikitevents.m"
+Import "SDL/src/video/uikit/SDL_uikitmessagebox.m"
+Import "SDL/src/video/uikit/SDL_uikitmodes.m"
+Import "SDL/src/video/uikit/SDL_uikitopengles.m"
+Import "SDL/src/video/uikit/SDL_uikitopenglview.m"
+Import "SDL/src/video/uikit/SDL_uikitvideo.m"
+Import "SDL/src/video/uikit/SDL_uikitview.m"
+Import "SDL/src/video/uikit/SDL_uikitviewcontroller.m"
+Import "SDL/src/video/uikit/SDL_uikitwindow.m"
+
 ?
+

+ 6 - 3
sdlfreeaudio.mod/sdlfreeaudio.bmx

@@ -49,12 +49,15 @@ Import "../../sdl.mod/sdl.mod/include/raspberrypi/*.h"
 
 ?android
 Import "../../sdl.mod/sdl.mod/include/android/*.h"
-Import "../../sdl.mod/sdl.mod/SDL/include/*.h"
+
+?ios
+Import "../../sdl.mod/sdl.mod/include/ios/*.h"
+
 ?
 
-?Not android
+'?Not android
 Import "../../sdl.mod/sdl.mod/include/*.h"
-?
+'?
 
 Import "glue.cpp"
 

+ 3 - 0
sdlgraphics.mod/common.bmx

@@ -47,6 +47,9 @@ Import "../../sdl.mod/sdl.mod/include/android/*.h"
 ?emscripten
 Import "../../sdl.mod/sdl.mod/include/emscripten/*.h"
 
+?ios
+Import "../../sdl.mod/sdl.mod/include/ios/*.h"
+
 ?
 
 '?Not android

+ 0 - 1
sdlmax2d.mod/sdlmax2d.bmx

@@ -1 +0,0 @@
-

+ 2 - 2
sdlmixeraudio.mod/sdlmixeraudio.bmx

@@ -33,7 +33,7 @@ ModuleInfo "LD_OPTS: -L%PWD%/lib/win32x86"
 ?win32x64
 ModuleInfo "LD_OPTS: -L%PWD%/lib/win32x64"
 
-?macos
+?osx
 ModuleInfo "LD_OPTS: -F%PWD%/lib/macos"
 ModuleInfo "LD_OPTS: -Xlinker -rpath -Xlinker @loader_path/../Frameworks"
 
@@ -53,7 +53,7 @@ Import "include/*.h"
 Import "-lSDL2_mixer"
 ?linux
 Import "-lSDL2_mixer"
-?macos
+?osx
 Import "-framework SDL2_mixer"
 ?
 

+ 3 - 0
sdlsystem.mod/common.bmx

@@ -45,6 +45,9 @@ Import "../../sdl.mod/sdl.mod/include/android/*.h"
 
 ?emscripten
 Import "../../sdl.mod/sdl.mod/include/emscripten/*.h"
+
+?ios
+Import "../../sdl.mod/sdl.mod/include/ios/*.h"
 ?
 
 '?Not android

+ 3 - 0
sdltimer.mod/sdltimer.bmx

@@ -62,6 +62,9 @@ Import "../../sdl.mod/sdl.mod/include/raspberrypi/*.h"
 ?android
 Import "../../sdl.mod/sdl.mod/include/android/*.h"
 
+?ios
+Import "../../sdl.mod/sdl.mod/include/ios/*.h"
+
 ?
 
 Import "../../sdl.mod/sdl.mod/include/*.h"