From 4ec2e2698553d05066fd266e77103247acb883d8 Mon Sep 17 00:00:00 2001 From: fysx Date: Tue, 21 Oct 2014 12:20:26 +0200 Subject: [PATCH] updated to latest SDL2 (f9244b2a151) --- jni/SDL2-2.0.3/Android.mk | 4 +- jni/SDL2-2.0.3/CMakeLists.txt | 77 +- jni/SDL2-2.0.3/INSTALL.txt | 8 +- jni/SDL2-2.0.3/Makefile.in | 27 +- jni/SDL2-2.0.3/README-winrt.txt | 45 - jni/SDL2-2.0.3/README.txt | 25 +- jni/SDL2-2.0.3/VisualC.html | 10 +- jni/SDL2-2.0.3/VisualC/SDL/SDL_VS2008.vcproj | 4 + jni/SDL2-2.0.3/VisualC/SDL/SDL_VS2010.vcxproj | 6 +- jni/SDL2-2.0.3/VisualC/SDL/SDL_VS2012.vcxproj | 6 +- jni/SDL2-2.0.3/VisualC/SDL/SDL_VS2013.vcxproj | 4 + .../VisualC/SDLmain/SDLmain_VS2008.vcproj | 4 + .../VisualC/SDLmain/SDLmain_VS2010.vcxproj | 330 +- .../VisualC/SDLmain/SDLmain_VS2012.vcxproj | 6 +- .../VisualC/SDLmain/SDLmain_VS2013.vcxproj | 4 + .../VisualC/SDLtest/SDLtest_VS2008.vcproj | 4 + .../VisualC/SDLtest/SDLtest_VS2010.vcxproj | 6 +- .../VisualC/SDLtest/SDLtest_VS2012.vcxproj | 6 +- .../VisualC/SDLtest/SDLtest_VS2013.vcxproj | 4 + jni/SDL2-2.0.3/WhatsNew.txt | 10 + .../Demos/Demos.xcodeproj/project.pbxproj | 26 +- .../SDL/SDL.xcodeproj/project.pbxproj | 12 +- .../SDL2test.xcodeproj/project.pbxproj | 2 - .../project.pbxproj | 209 +- .../TestiPhoneOS.xcodeproj/project.pbxproj | 73 +- jni/SDL2-2.0.3/Xcode/SDL/Info-Framework.plist | 4 +- .../Xcode/SDL/SDL.xcodeproj/project.pbxproj | 86 +- .../SDL/pkg-support/codesign-frameworks.sh | 24 +- .../SDLTest/SDLTest.xcodeproj/project.pbxproj | 334 +- .../src/org/libsdl/app/SDLActivity.java | 392 +- .../build-scripts/checker-buildbot.sh | 6 +- jni/SDL2-2.0.3/build-scripts/config.sub | 27 + .../build-scripts/raspberrypi-buildbot.sh | 6 +- jni/SDL2-2.0.3/cmake/sdlchecks.cmake | 67 +- jni/SDL2-2.0.3/configure | 572 +- jni/SDL2-2.0.3/configure.in | 366 +- jni/SDL2-2.0.3/debian/control | 1 + .../README-android.md} | 204 +- .../README-cmake.md} | 27 +- .../README-directfb.md} | 9 +- .../README-dynapi.md} | 3 +- .../README-gesture.md} | 25 +- .../{README-hg.txt => docs/README-hg.md} | 6 +- .../{README-ios.txt => docs/README-ios.md} | 162 +- .../README-linux.md} | 8 +- .../README-macosx.md} | 46 +- .../{README-nacl.txt => docs/README-nacl.md} | 15 +- .../README-pandora.md} | 5 +- .../README-platforms.md} | 28 +- .../README-porting.md} | 2 + .../{README-psp.txt => docs/README-psp.md} | 2 + .../README-raspberrypi.md} | 4 +- .../README-touch.md} | 20 +- .../README-wince.md} | 2 + .../README-windows.md} | 3 +- jni/SDL2-2.0.3/docs/README-winrt.md | 350 + jni/SDL2-2.0.3/docs/README.md | 62 + jni/SDL2-2.0.3/{include => docs}/doxyfile | 28 +- jni/SDL2-2.0.3/include/SDL.h | 45 +- jni/SDL2-2.0.3/include/SDL_assert.h | 13 +- jni/SDL2-2.0.3/include/SDL_atomic.h | 10 +- jni/SDL2-2.0.3/include/SDL_audio.h | 107 +- jni/SDL2-2.0.3/include/SDL_config.h.cmake | 9 +- jni/SDL2-2.0.3/include/SDL_config.h.in | 22 +- jni/SDL2-2.0.3/include/SDL_config_android.h | 7 +- jni/SDL2-2.0.3/include/SDL_config_iphoneos.h | 8 +- jni/SDL2-2.0.3/include/SDL_config_macosx.h | 3 + jni/SDL2-2.0.3/include/SDL_config_pandora.h | 3 + jni/SDL2-2.0.3/include/SDL_config_psp.h | 3 + jni/SDL2-2.0.3/include/SDL_config_windows.h | 11 + jni/SDL2-2.0.3/include/SDL_config_winrt.h | 12 +- jni/SDL2-2.0.3/include/SDL_config_wiz.h | 3 + jni/SDL2-2.0.3/include/SDL_cpuinfo.h | 5 + jni/SDL2-2.0.3/include/SDL_egl.h | 11 +- jni/SDL2-2.0.3/include/SDL_error.h | 2 +- jni/SDL2-2.0.3/include/SDL_events.h | 8 +- jni/SDL2-2.0.3/include/SDL_haptic.h | 20 +- jni/SDL2-2.0.3/include/SDL_hints.h | 122 +- jni/SDL2-2.0.3/include/SDL_log.h | 16 +- jni/SDL2-2.0.3/include/SDL_main.h | 9 + jni/SDL2-2.0.3/include/SDL_mouse.h | 66 + jni/SDL2-2.0.3/include/SDL_opengl.h | 13056 +++------------- jni/SDL2-2.0.3/include/SDL_opengl_glext.h | 5 + jni/SDL2-2.0.3/include/SDL_opengles2.h | 2754 +--- jni/SDL2-2.0.3/include/SDL_pixels.h | 6 +- jni/SDL2-2.0.3/include/SDL_platform.h | 25 +- jni/SDL2-2.0.3/include/SDL_rect.h | 10 + jni/SDL2-2.0.3/include/SDL_render.h | 10 + jni/SDL2-2.0.3/include/SDL_rwops.h | 3 +- jni/SDL2-2.0.3/include/SDL_stdinc.h | 92 +- jni/SDL2-2.0.3/include/SDL_system.h | 3 +- jni/SDL2-2.0.3/include/SDL_syswm.h | 39 +- jni/SDL2-2.0.3/include/SDL_test_assert.h | 6 +- jni/SDL2-2.0.3/include/SDL_test_log.h | 4 +- jni/SDL2-2.0.3/include/SDL_thread.h | 4 +- jni/SDL2-2.0.3/include/SDL_version.h | 2 +- jni/SDL2-2.0.3/include/SDL_video.h | 74 +- jni/SDL2-2.0.3/include/begin_code.h | 8 + jni/SDL2-2.0.3/premake/README-macosx.txt | 1 + jni/SDL2-2.0.3/premake/projects/SDL2.lua | 1 + jni/SDL2-2.0.3/src/SDL.c | 2 + jni/SDL2-2.0.3/src/SDL_error.c | 2 +- jni/SDL2-2.0.3/src/SDL_log.c | 23 +- jni/SDL2-2.0.3/src/atomic/SDL_atomic.c | 27 +- jni/SDL2-2.0.3/src/atomic/SDL_spinlock.c | 19 +- jni/SDL2-2.0.3/src/audio/SDL_audio.c | 263 +- jni/SDL2-2.0.3/src/audio/SDL_audiotypecvt.c | 200 +- jni/SDL2-2.0.3/src/audio/SDL_sysaudio.h | 27 + jni/SDL2-2.0.3/src/audio/SDL_wave.c | 15 +- jni/SDL2-2.0.3/src/audio/SDL_wave.h | 2 + .../src/audio/android/SDL_androidaudio.c | 46 +- .../src/audio/android/SDL_androidaudio.h | 2 + .../src/audio/coreaudio/SDL_coreaudio.c | 10 +- .../src/audio/directsound/SDL_directsound.h | 2 +- jni/SDL2-2.0.3/src/audio/sdlgenaudiocvt.pl | 3 +- .../src/audio/sndio/SDL_sndioaudio.c | 35 +- .../src/audio/xaudio2/SDL_xaudio2.c | 6 +- jni/SDL2-2.0.3/src/core/android/SDL_android.c | 157 +- jni/SDL2-2.0.3/src/core/android/SDL_android.h | 2 + jni/SDL2-2.0.3/src/core/linux/SDL_evdev.c | 4 + jni/SDL2-2.0.3/src/core/linux/SDL_ibus.c | 348 +- jni/SDL2-2.0.3/src/core/linux/SDL_udev.c | 139 +- jni/SDL2-2.0.3/src/core/linux/SDL_udev.h | 2 + .../directx.h => core/windows/SDL_directx.h} | 19 +- jni/SDL2-2.0.3/src/core/windows/SDL_windows.c | 129 + jni/SDL2-2.0.3/src/core/windows/SDL_windows.h | 64 + jni/SDL2-2.0.3/src/core/windows/SDL_xinput.c | 129 + jni/SDL2-2.0.3/src/core/windows/SDL_xinput.h | 134 + .../src/core/winrt/SDL_winrtapp_direct3d.cpp | 253 +- .../src/core/winrt/SDL_winrtapp_direct3d.h | 2 + jni/SDL2-2.0.3/src/cpuinfo/SDL_cpuinfo.c | 104 +- jni/SDL2-2.0.3/src/dynapi/SDL_dynapi.c | 14 +- jni/SDL2-2.0.3/src/dynapi/SDL_dynapi.h | 4 +- .../src/dynapi/SDL_dynapi_overrides.h | 16 + jni/SDL2-2.0.3/src/dynapi/SDL_dynapi_procs.h | 59 +- jni/SDL2-2.0.3/src/events/SDL_events.c | 18 +- jni/SDL2-2.0.3/src/events/SDL_gesture.c | 21 +- jni/SDL2-2.0.3/src/events/SDL_keyboard.c | 11 + jni/SDL2-2.0.3/src/events/SDL_mouse.c | 131 +- jni/SDL2-2.0.3/src/events/SDL_mouse_c.h | 11 +- jni/SDL2-2.0.3/src/file/SDL_rwops.c | 8 +- .../src/file/cocoa/SDL_rwopsbundlesupport.m | 17 +- .../filesystem/android/SDL_sysfilesystem.c | 62 + .../src/filesystem/cocoa/SDL_sysfilesystem.m | 10 +- .../src/filesystem/unix/SDL_sysfilesystem.c | 2 +- jni/SDL2-2.0.3/src/haptic/SDL_haptic.c | 2 +- jni/SDL2-2.0.3/src/haptic/SDL_syshaptic.h | 5 + .../src/haptic/darwin/SDL_syshaptic.c | 105 +- .../src/haptic/linux/SDL_syshaptic.c | 69 +- .../src/haptic/windows/SDL_dinputhaptic.c | 1298 ++ .../src/haptic/windows/SDL_dinputhaptic_c.h | 47 + .../src/haptic/windows/SDL_windowshaptic.c | 445 + .../src/haptic/windows/SDL_windowshaptic_c.h | 88 + .../src/haptic/windows/SDL_xinputhaptic.c | 491 + .../src/haptic/windows/SDL_xinputhaptic_c.h | 47 + .../src/joystick/SDL_gamecontroller.c | 539 +- .../src/joystick/SDL_gamecontrollerdb.h | 23 +- jni/SDL2-2.0.3/src/joystick/SDL_joystick.c | 144 +- jni/SDL2-2.0.3/src/joystick/SDL_joystick_c.h | 3 - jni/SDL2-2.0.3/src/joystick/SDL_sysjoystick.h | 19 +- .../src/joystick/android/SDL_sysjoystick.c | 5 - .../src/joystick/bsd/SDL_sysjoystick.c | 5 - .../src/joystick/darwin/SDL_sysjoystick.c | 63 +- .../src/joystick/dummy/SDL_sysjoystick.c | 5 - .../src/joystick/haiku/SDL_haikujoystick.cc | 5 - .../iphoneos/SDLUIAccelerationDelegate.m | 141 - .../src/joystick/iphoneos/SDL_sysjoystick.m | 91 +- .../src/joystick/linux/SDL_sysjoystick.c | 9 - .../src/joystick/psp/SDL_sysjoystick.c | 5 - .../src/joystick/windows/SDL_dinputjoystick.c | 900 ++ .../joystick/windows/SDL_dinputjoystick_c.h | 30 + .../src/joystick/windows/SDL_mmjoystick.c | 470 + .../joystick/windows/SDL_windowsjoystick.c | 575 + .../joystick/windows/SDL_windowsjoystick_c.h | 88 + .../src/joystick/windows/SDL_xinputjoystick.c | 382 + .../joystick/windows/SDL_xinputjoystick_c.h | 33 + .../src/joystick/winrt/SDL_xinputjoystick.c | 537 - jni/SDL2-2.0.3/src/libm/k_rem_pio2.c | 5 + jni/SDL2-2.0.3/src/libm/math_libm.h | 1 + jni/SDL2-2.0.3/src/libm/math_private.h | 1 + .../src/main/android/SDL_android_main.c | 53 +- .../src/main/windows/SDL_windows_main.c | 27 +- jni/SDL2-2.0.3/src/main/windows/version.rc | 8 +- jni/SDL2-2.0.3/src/power/SDL_power.c | 4 +- jni/SDL2-2.0.3/src/render/SDL_d3dmath.c | 5 + jni/SDL2-2.0.3/src/render/SDL_d3dmath.h | 3 + jni/SDL2-2.0.3/src/render/SDL_render.c | 53 +- jni/SDL2-2.0.3/src/render/SDL_sysrender.h | 4 + jni/SDL2-2.0.3/src/render/SDL_yuv_sw.c | 7 +- .../src/render/direct3d/SDL_render_d3d.c | 469 +- .../src/render/direct3d11/SDL_render_d3d11.c | 143 +- .../render/direct3d11/SDL_render_winrt.cpp | 7 +- .../src/render/opengl/SDL_render_gl.c | 189 +- .../src/render/opengl/SDL_shaders_gl.c | 117 +- .../src/render/opengl/SDL_shaders_gl.h | 4 +- .../src/render/opengles/SDL_render_gles.c | 72 +- .../src/render/opengles2/SDL_gles2funcs.h | 4 +- .../src/render/opengles2/SDL_render_gles2.c | 573 +- .../src/render/opengles2/SDL_shaders_gles2.c | 127 + .../src/render/opengles2/SDL_shaders_gles2.h | 5 +- jni/SDL2-2.0.3/src/render/software/SDL_draw.h | 3 +- .../src/render/software/SDL_render_sw.c | 19 +- .../src/render/software/SDL_rotate.c | 2 +- jni/SDL2-2.0.3/src/stdlib/SDL_getenv.c | 35 +- jni/SDL2-2.0.3/src/stdlib/SDL_iconv.c | 3 +- jni/SDL2-2.0.3/src/stdlib/SDL_malloc.c | 1 + jni/SDL2-2.0.3/src/stdlib/SDL_stdlib.c | 97 +- jni/SDL2-2.0.3/src/stdlib/SDL_string.c | 48 +- jni/SDL2-2.0.3/src/test/SDL_test_assert.c | 10 +- jni/SDL2-2.0.3/src/test/SDL_test_common.c | 36 +- jni/SDL2-2.0.3/src/test/SDL_test_harness.c | 13 +- jni/SDL2-2.0.3/src/test/SDL_test_log.c | 4 +- jni/SDL2-2.0.3/src/thread/SDL_thread.c | 6 +- .../src/thread/pthread/SDL_sysmutex.c | 2 + .../src/thread/pthread/SDL_syssem.c | 2 +- .../src/thread/pthread/SDL_systhread.c | 12 +- jni/SDL2-2.0.3/src/timer/unix/SDL_systimer.c | 13 +- jni/SDL2-2.0.3/src/video/SDL_RLEaccel.c | 571 +- jni/SDL2-2.0.3/src/video/SDL_blit.h | 18 +- jni/SDL2-2.0.3/src/video/SDL_blit_A.c | 4 +- jni/SDL2-2.0.3/src/video/SDL_blit_auto.c | 578 +- jni/SDL2-2.0.3/src/video/SDL_bmp.c | 138 +- jni/SDL2-2.0.3/src/video/SDL_egl.c | 107 +- jni/SDL2-2.0.3/src/video/SDL_fillrect.c | 6 +- jni/SDL2-2.0.3/src/video/SDL_pixels.c | 2 + jni/SDL2-2.0.3/src/video/SDL_shape.c | 29 +- jni/SDL2-2.0.3/src/video/SDL_surface.c | 276 +- jni/SDL2-2.0.3/src/video/SDL_sysvideo.h | 17 +- jni/SDL2-2.0.3/src/video/SDL_video.c | 262 +- .../src/video/android/SDL_androidevents.c | 11 +- .../android/SDL_androidmessagebox.c} | 29 +- .../src/video/android/SDL_androidmessagebox.h | 29 + .../src/video/android/SDL_androidtouch.c | 8 +- .../src/video/android/SDL_androidvideo.c | 10 + .../src/video/android/SDL_androidwindow.c | 21 +- .../src/video/android/SDL_androidwindow.h | 1 + .../src/video/cocoa/SDL_cocoaclipboard.m | 30 +- .../src/video/cocoa/SDL_cocoaevents.m | 58 +- .../src/video/cocoa/SDL_cocoakeyboard.m | 79 +- .../src/video/cocoa/SDL_cocoamessagebox.m | 23 +- .../src/video/cocoa/SDL_cocoamodes.m | 84 +- .../src/video/cocoa/SDL_cocoamouse.m | 122 +- .../src/video/cocoa/SDL_cocoamousetap.m | 3 +- .../src/video/cocoa/SDL_cocoaopengl.m | 16 +- .../src/video/cocoa/SDL_cocoashape.m | 14 +- .../src/video/cocoa/SDL_cocoavideo.h | 1 - .../src/video/cocoa/SDL_cocoavideo.m | 13 +- .../src/video/cocoa/SDL_cocoawindow.h | 16 +- .../src/video/cocoa/SDL_cocoawindow.m | 190 +- .../src/video/directfb/SDL_DirectFB_render.c | 2 +- .../src/video/directfb/SDL_DirectFB_video.c | 2 +- .../src/video/directfb/SDL_DirectFB_window.c | 2 +- jni/SDL2-2.0.3/src/video/mir/SDL_mirevents.c | 26 +- .../src/video/mir/SDL_mirframebuffer.c | 2 + jni/SDL2-2.0.3/src/video/mir/SDL_mirmouse.c | 7 + jni/SDL2-2.0.3/src/video/mir/SDL_mirvideo.c | 2 +- jni/SDL2-2.0.3/src/video/mir/SDL_mirvideo.h | 2 + jni/SDL2-2.0.3/src/video/mir/SDL_mirwindow.c | 9 +- .../src/video/raspberry/SDL_rpimouse.c | 9 + jni/SDL2-2.0.3/src/video/sdlgenblit.pl | 77 +- .../src/video/uikit/SDL_uikitmessagebox.m | 2 +- .../src/video/uikit/SDL_uikitmodes.h | 2 - .../src/video/uikit/SDL_uikitmodes.m | 123 +- .../src/video/uikit/SDL_uikitopengles.m | 50 +- .../src/video/uikit/SDL_uikitopenglview.h | 2 +- .../src/video/uikit/SDL_uikitopenglview.m | 11 +- .../src/video/uikit/SDL_uikitview.m | 22 +- .../src/video/uikit/SDL_uikitwindow.m | 45 +- .../src/video/vivante/SDL_vivanteopengles.c | 47 + .../src/video/vivante/SDL_vivanteopengles.h | 48 + .../src/video/vivante/SDL_vivanteplatform.c | 44 + .../src/video/vivante/SDL_vivanteplatform.h | 45 + .../src/video/vivante/SDL_vivantevideo.c | 399 + .../src/video/vivante/SDL_vivantevideo.h | 91 + .../src/video/wayland/SDL_waylandmouse.c | 62 +- .../src/video/wayland/SDL_waylandtouch.c | 11 +- .../src/video/wayland/SDL_waylandwindow.c | 28 +- .../src/video/windows/SDL_windowsevents.c | 299 +- .../src/video/windows/SDL_windowskeyboard.c | 14 +- .../src/video/windows/SDL_windowsmodes.c | 8 +- .../src/video/windows/SDL_windowsmouse.c | 104 +- .../src/video/windows/SDL_windowsopengl.c | 4 + .../src/video/windows/SDL_windowsopengles.c | 2 + .../src/video/windows/SDL_windowsvideo.c | 316 +- .../src/video/windows/SDL_windowsvideo.h | 2 + .../src/video/windows/SDL_windowswindow.c | 47 +- .../src/video/windows/SDL_windowswindow.h | 6 +- jni/SDL2-2.0.3/src/video/windows/wmmsg.h | 10 +- .../src/video/winrt/SDL_winrtevents.cpp | 153 + .../src/video/winrt/SDL_winrtevents_c.h | 72 + .../src/video/winrt/SDL_winrtkeyboard.cpp | 329 + .../src/video/winrt/SDL_winrtmessagebox.cpp | 112 + .../src/video/winrt/SDL_winrtmessagebox.h | 29 + .../src/video/winrt/SDL_winrtmouse.cpp | 165 + .../src/video/winrt/SDL_winrtmouse_c.h | 40 + .../src/video/winrt/SDL_winrtopengles.cpp | 112 + .../src/video/winrt/SDL_winrtopengles.h | 66 + .../src/video/winrt/SDL_winrtpointerinput.cpp | 394 + .../src/video/winrt/SDL_winrtvideo.cpp | 419 + .../src/video/winrt/SDL_winrtvideo_cpp.h | 90 + jni/SDL2-2.0.3/src/video/x11/SDL_x11events.c | 345 +- .../src/video/x11/SDL_x11keyboard.c | 76 +- .../src/video/x11/SDL_x11keyboard.h | 3 + jni/SDL2-2.0.3/src/video/x11/SDL_x11modes.c | 18 +- jni/SDL2-2.0.3/src/video/x11/SDL_x11mouse.c | 68 + jni/SDL2-2.0.3/src/video/x11/SDL_x11opengl.c | 44 +- .../src/video/x11/SDL_x11opengles.c | 4 +- jni/SDL2-2.0.3/src/video/x11/SDL_x11video.c | 224 +- jni/SDL2-2.0.3/src/video/x11/SDL_x11video.h | 12 +- jni/SDL2-2.0.3/src/video/x11/SDL_x11window.c | 16 +- jni/SDL2-2.0.3/src/video/x11/SDL_x11window.h | 1 + jni/SDL2-2.0.3/src/video/x11/edid-parse.c | 2 +- jni/SDL2-2.0.3/test/Makefile.in | 12 +- jni/SDL2-2.0.3/test/README | 1 + jni/SDL2-2.0.3/test/controllermap.c | 15 +- jni/SDL2-2.0.3/test/loopwave.c | 4 +- jni/SDL2-2.0.3/test/loopwavequeue.c | 4 +- jni/SDL2-2.0.3/test/testatomic.c | 3 +- jni/SDL2-2.0.3/test/testautomation_audio.c | 233 +- jni/SDL2-2.0.3/test/testautomation_pixels.c | 10 +- jni/SDL2-2.0.3/test/testautomation_rwops.c | 4 +- jni/SDL2-2.0.3/test/testautomation_stdlib.c | 141 +- jni/SDL2-2.0.3/test/testautomation_suites.h | 2 + jni/SDL2-2.0.3/test/testautomation_surface.c | 4 + jni/SDL2-2.0.3/test/testdrawchessboard.c | 13 +- jni/SDL2-2.0.3/test/testdropfile.c | 2 +- jni/SDL2-2.0.3/test/testgamecontroller.c | 55 +- jni/SDL2-2.0.3/test/testgesture.c | 32 +- jni/SDL2-2.0.3/test/testgles2.c | 48 +- jni/SDL2-2.0.3/test/testhaptic.c | 93 +- jni/SDL2-2.0.3/test/testhotplug.c | 4 + jni/SDL2-2.0.3/test/testjoystick.c | 4 +- jni/SDL2-2.0.3/test/testmessage.c | 2 - jni/SDL2-2.0.3/test/testmultiaudio.c | 19 +- jni/SDL2-2.0.3/test/testoverlay2.c | 39 +- jni/SDL2-2.0.3/test/testrelative.c | 12 +- jni/SDL2-2.0.3/test/testshape.c | 2 +- jni/SDL2-2.0.3/test/teststreaming.c | 42 +- src/org/libsdl/app/SDLActivity.java | 403 +- src/org/libsdl/app/old._ja | 1039 -- 340 files changed, 20705 insertions(+), 20917 deletions(-) delete mode 100644 jni/SDL2-2.0.3/README-winrt.txt rename jni/SDL2-2.0.3/{README-android.txt => docs/README-android.md} (75%) rename jni/SDL2-2.0.3/{README-cmake.txt => docs/README-cmake.md} (72%) rename jni/SDL2-2.0.3/{README-directfb.txt => docs/README-directfb.md} (90%) rename jni/SDL2-2.0.3/{README-dynapi.txt => docs/README-dynapi.md} (97%) rename jni/SDL2-2.0.3/{README-gesture.txt => docs/README-gesture.md} (72%) rename jni/SDL2-2.0.3/{README-hg.txt => docs/README-hg.md} (91%) rename jni/SDL2-2.0.3/{README-ios.txt => docs/README-ios.md} (75%) rename jni/SDL2-2.0.3/{README-linux.txt => docs/README-linux.md} (94%) rename jni/SDL2-2.0.3/{README-macosx.txt => docs/README-macosx.md} (90%) rename jni/SDL2-2.0.3/{README-nacl.txt => docs/README-nacl.md} (93%) rename jni/SDL2-2.0.3/{README-pandora.txt => docs/README-pandora.md} (89%) rename jni/SDL2-2.0.3/{README-platforms.txt => docs/README-platforms.md} (55%) rename jni/SDL2-2.0.3/{README-porting.txt => docs/README-porting.md} (96%) rename jni/SDL2-2.0.3/{README-psp.txt => docs/README-psp.md} (92%) rename jni/SDL2-2.0.3/{README-raspberrypi.txt => docs/README-raspberrypi.md} (96%) rename jni/SDL2-2.0.3/{README-touch.txt => docs/README-touch.md} (85%) rename jni/SDL2-2.0.3/{README-wince.txt => docs/README-wince.md} (90%) rename jni/SDL2-2.0.3/{README-windows.txt => docs/README-windows.md} (94%) create mode 100644 jni/SDL2-2.0.3/docs/README-winrt.md create mode 100644 jni/SDL2-2.0.3/docs/README.md rename jni/SDL2-2.0.3/{include => docs}/doxyfile (98%) rename jni/SDL2-2.0.3/src/{audio/directsound/directx.h => core/windows/SDL_directx.h} (86%) create mode 100644 jni/SDL2-2.0.3/src/core/windows/SDL_windows.c create mode 100644 jni/SDL2-2.0.3/src/core/windows/SDL_windows.h create mode 100644 jni/SDL2-2.0.3/src/core/windows/SDL_xinput.c create mode 100644 jni/SDL2-2.0.3/src/core/windows/SDL_xinput.h create mode 100644 jni/SDL2-2.0.3/src/filesystem/android/SDL_sysfilesystem.c create mode 100644 jni/SDL2-2.0.3/src/haptic/windows/SDL_dinputhaptic.c create mode 100644 jni/SDL2-2.0.3/src/haptic/windows/SDL_dinputhaptic_c.h create mode 100644 jni/SDL2-2.0.3/src/haptic/windows/SDL_windowshaptic.c create mode 100644 jni/SDL2-2.0.3/src/haptic/windows/SDL_windowshaptic_c.h create mode 100644 jni/SDL2-2.0.3/src/haptic/windows/SDL_xinputhaptic.c create mode 100644 jni/SDL2-2.0.3/src/haptic/windows/SDL_xinputhaptic_c.h delete mode 100644 jni/SDL2-2.0.3/src/joystick/iphoneos/SDLUIAccelerationDelegate.m create mode 100644 jni/SDL2-2.0.3/src/joystick/windows/SDL_dinputjoystick.c create mode 100644 jni/SDL2-2.0.3/src/joystick/windows/SDL_dinputjoystick_c.h create mode 100644 jni/SDL2-2.0.3/src/joystick/windows/SDL_mmjoystick.c create mode 100644 jni/SDL2-2.0.3/src/joystick/windows/SDL_windowsjoystick.c create mode 100644 jni/SDL2-2.0.3/src/joystick/windows/SDL_windowsjoystick_c.h create mode 100644 jni/SDL2-2.0.3/src/joystick/windows/SDL_xinputjoystick.c create mode 100644 jni/SDL2-2.0.3/src/joystick/windows/SDL_xinputjoystick_c.h delete mode 100644 jni/SDL2-2.0.3/src/joystick/winrt/SDL_xinputjoystick.c rename jni/SDL2-2.0.3/src/{joystick/iphoneos/SDLUIAccelerationDelegate.h => video/android/SDL_androidmessagebox.c} (64%) create mode 100644 jni/SDL2-2.0.3/src/video/android/SDL_androidmessagebox.h create mode 100644 jni/SDL2-2.0.3/src/video/vivante/SDL_vivanteopengles.c create mode 100644 jni/SDL2-2.0.3/src/video/vivante/SDL_vivanteopengles.h create mode 100644 jni/SDL2-2.0.3/src/video/vivante/SDL_vivanteplatform.c create mode 100644 jni/SDL2-2.0.3/src/video/vivante/SDL_vivanteplatform.h create mode 100644 jni/SDL2-2.0.3/src/video/vivante/SDL_vivantevideo.c create mode 100644 jni/SDL2-2.0.3/src/video/vivante/SDL_vivantevideo.h create mode 100644 jni/SDL2-2.0.3/src/video/winrt/SDL_winrtevents.cpp create mode 100644 jni/SDL2-2.0.3/src/video/winrt/SDL_winrtevents_c.h create mode 100644 jni/SDL2-2.0.3/src/video/winrt/SDL_winrtkeyboard.cpp create mode 100644 jni/SDL2-2.0.3/src/video/winrt/SDL_winrtmessagebox.cpp create mode 100644 jni/SDL2-2.0.3/src/video/winrt/SDL_winrtmessagebox.h create mode 100644 jni/SDL2-2.0.3/src/video/winrt/SDL_winrtmouse.cpp create mode 100644 jni/SDL2-2.0.3/src/video/winrt/SDL_winrtmouse_c.h create mode 100644 jni/SDL2-2.0.3/src/video/winrt/SDL_winrtopengles.cpp create mode 100644 jni/SDL2-2.0.3/src/video/winrt/SDL_winrtopengles.h create mode 100644 jni/SDL2-2.0.3/src/video/winrt/SDL_winrtpointerinput.cpp create mode 100644 jni/SDL2-2.0.3/src/video/winrt/SDL_winrtvideo.cpp create mode 100644 jni/SDL2-2.0.3/src/video/winrt/SDL_winrtvideo_cpp.h delete mode 100644 src/org/libsdl/app/old._ja diff --git a/jni/SDL2-2.0.3/Android.mk b/jni/SDL2-2.0.3/Android.mk index 2168f579..fcf6c3dc 100755 --- a/jni/SDL2-2.0.3/Android.mk +++ b/jni/SDL2-2.0.3/Android.mk @@ -34,7 +34,7 @@ LOCAL_SRC_FILES := \ $(wildcard $(LOCAL_PATH)/src/loadso/dlopen/*.c) \ $(wildcard $(LOCAL_PATH)/src/power/*.c) \ $(wildcard $(LOCAL_PATH)/src/power/android/*.c) \ - $(wildcard $(LOCAL_PATH)/src/filesystem/dummy/*.c) \ + $(wildcard $(LOCAL_PATH)/src/filesystem/android/*.c) \ $(wildcard $(LOCAL_PATH)/src/render/*.c) \ $(wildcard $(LOCAL_PATH)/src/render/*/*.c) \ $(wildcard $(LOCAL_PATH)/src/stdlib/*.c) \ @@ -61,7 +61,7 @@ LOCAL_MODULE := SDL2_static LOCAL_MODULE_FILENAME := libSDL2 -LOCAL_SRC_FILES += ./src/main/android/SDL_android_main.c +LOCAL_SRC_FILES += $(subst $(LOCAL_PATH)/,,$(LOCAL_PATH)/src/main/android/SDL_android_main.c) LOCAL_LDLIBS := LOCAL_EXPORT_LDLIBS := -Wl,--undefined=Java_org_libsdl_app_SDLActivity_nativeInit -ldl -lGLESv1_CM -lGLESv2 -llog -landroid diff --git a/jni/SDL2-2.0.3/CMakeLists.txt b/jni/SDL2-2.0.3/CMakeLists.txt index 75a89378..b5e560f0 100644 --- a/jni/SDL2-2.0.3/CMakeLists.txt +++ b/jni/SDL2-2.0.3/CMakeLists.txt @@ -29,9 +29,9 @@ include(${SDL2_SOURCE_DIR}/cmake/sdlchecks.cmake) # set SDL_BINARY_AGE and SDL_INTERFACE_AGE to 0. set(SDL_MAJOR_VERSION 2) set(SDL_MINOR_VERSION 0) -set(SDL_MICRO_VERSION 3) -set(SDL_INTERFACE_AGE 1) -set(SDL_BINARY_AGE 3) +set(SDL_MICRO_VERSION 4) +set(SDL_INTERFACE_AGE 0) +set(SDL_BINARY_AGE 4) set(SDL_VERSION "${SDL_MAJOR_VERSION}.${SDL_MINOR_VERSION}.${SDL_MICRO_VERSION}") # Calculate a libtool-like version number @@ -235,8 +235,9 @@ set_option(RPATH "Use an rpath when linking SDL" ${UNIX_SYS}) set_option(CLOCK_GETTIME "Use clock_gettime() instead of gettimeofday()" OFF) set_option(INPUT_TSLIB "Use the Touchscreen library for input" ${UNIX_SYS}) set_option(VIDEO_X11 "Use X11 video driver" ${UNIX_SYS}) -set_option(VIDEO_WAYLAND "Use Wayland video driver" OFF) #${UNIX_SYS}) -set_option(VIDEO_MIR "Use Mir video driver" OFF) #${UNIX_SYS}) +set_option(VIDEO_WAYLAND "Use Wayland video driver" ${UNIX_SYS}) +set_option(VIDEO_MIR "Use Mir video driver" ${UNIX_SYS}) +set_option(VIDEO_RPI "Use Raspberry Pi video driver" ${UNIX_SYS}) dep_option(X11_SHARED "Dynamically load X11 support" ON "VIDEO_X11" OFF) set(SDL_X11_OPTIONS Xcursor Xinerama XInput Xrandr Xscrnsaver XShape Xvm) foreach(_SUB ${SDL_X11_OPTIONS}) @@ -246,6 +247,7 @@ endforeach() set_option(VIDEO_COCOA "Use Cocoa video driver" ${APPLE}) set_option(DIRECTX "Use DirectX for Windows audio/video" ${WINDOWS}) set_option(RENDER_D3D "Enable the Direct3D render driver" ${WINDOWS}) +set_option(VIDEO_VIVANTE "Use Vivante EGL video driver" ${UNIX_SYS}) # TODO: We should (should we?) respect cmake's ${BUILD_SHARED_LIBS} flag here # The options below are for compatibility to configure's default behaviour. @@ -330,10 +332,22 @@ if(USE_GCC OR USE_CLANG) check_c_compiler_flag(-Wall HAVE_GCC_WALL) if(HAVE_GCC_WALL) + list(APPEND EXTRA_CFLAGS "-Wall") if(HAIKU) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-multichar") endif() endif() + check_c_compiler_flag(-Wshadow HAVE_GCC_WSHADOW) + if(HAVE_GCC_WSHADOW) + list(APPEND EXTRA_CFLAGS "-Wshadow") + endif() + + set(CMAKE_REQUIRED_FLAGS "-Wl,--no-undefined") + check_c_compiler_flag("" HAVE_NO_UNDEFINED) + set(CMAKE_REQUIRED_FLAGS) + if(HAVE_NO_UNDEFINED) + list(APPEND EXTRA_LDFLAGS "-Wl,--no-undefined") + endif() endif() if(ASSEMBLY) @@ -494,7 +508,7 @@ if(LIBC) strlen _strrev _strupr _strlwr strchr strrchr strstr itoa _ltoa _ultoa strtol strtoul strtoll strtod atoi atof strcmp strncmp _stricmp _strnicmp sscanf atan atan2 acos asin ceil copysign cos - cosf fabs floor log pow scalbn sin sinf sqrt) + cosf fabs floor log pow scalbn sin sinf sqrt sqrtf tan tanf) string(TOUPPER ${_FN} _UPPER) set(HAVE_${_UPPER} 1) endforeach() @@ -541,7 +555,7 @@ if(LIBC) set(CMAKE_REQUIRED_LIBRARIES m) foreach(_FN atan atan2 ceil copysign cos cosf fabs floor log pow scalbn sin - sinf sqrt) + sinf sqrt sqrtf tan tanf) string(TOUPPER ${_FN} _UPPER) set(_HAVEVAR "HAVE_${_UPPER}") check_function_exists("${_FN}" ${_HAVEVAR}) @@ -657,12 +671,15 @@ if(UNIX AND NOT APPLE) endif() if(SDL_VIDEO) + # Need to check for Raspberry PI first and add platform specific compiler flags, otherwise the test for GLES fails! + CheckRPI() CheckX11() CheckMir() CheckDirectFB() CheckOpenGLX11() CheckOpenGLESX11() CheckWayland() + CheckVivante() endif() if(LINUX) @@ -804,6 +821,8 @@ elseif(WINDOWS) check_include_file(dsound.h HAVE_DSOUND_H) check_include_file(dinput.h HAVE_DINPUT_H) check_include_file(xaudio2.h HAVE_XAUDIO2_H) + check_include_file(xinput.h HAVE_XINPUT_H) + check_include_file(dxgi.h HAVE_DXGI_H) if(HAVE_D3D_H OR HAVE_D3D11_H OR HAVE_DDRAW_H OR HAVE_DSOUND_H OR HAVE_DINPUT_H OR HAVE_XAUDIO2_H) set(HAVE_DIRECTX TRUE) # TODO: change $ENV{DXSDL_DIR} to get the path from the include checks @@ -908,21 +927,31 @@ elseif(WINDOWS) endif() if(SDL_JOYSTICK) + file(GLOB JOYSTICK_SOURCES ${SDL2_SOURCE_DIR}/src/joystick/windows/*.c) + set(SOURCE_FILES ${SOURCE_FILES} ${JOYSTICK_SOURCES}) if(HAVE_DINPUT_H) set(SDL_JOYSTICK_DINPUT 1) - set(SOURCE_FILES ${SOURCE_FILES} ${SDL2_SOURCE_DIR}/src/joystick/windows/SDL_dxjoystick.c) list(APPEND EXTRA_LIBS dinput8 dxguid dxerr) - else() + endif() + if(HAVE_XINPUT_H) + set(SDL_JOYSTICK_XINPUT 1) + endif() + if(NOT HAVE_DINPUT_H AND NOT HAVE_XINPUT_H) set(SDL_JOYSTICK_WINMM 1) - set(SOURCE_FILES ${SOURCE_FILES} ${SDL2_SOURCE_DIR}/src/joystick/windows/SDL_mmjoystick.c) endif() set(HAVE_SDL_JOYSTICK TRUE) - endif() - if(SDL_HAPTIC AND HAVE_DINPUT_H) - set(SDL_HAPTIC_DINPUT 1) - set(SOURCE_FILES ${SOURCE_FILES} ${SDL2_SOURCE_DIR}/src/haptic/windows/SDL_syshaptic.c) - set(HAVE_SDL_HAPTIC TRUE) + if(SDL_HAPTIC) + file(GLOB HAPTIC_SOURCES ${SDL2_SOURCE_DIR}/src/haptic/windows/*.c) + set(SOURCE_FILES ${SOURCE_FILES} ${HAPTIC_SOURCES}) + if(HAVE_DINPUT_H) + set(SDL_HAPTIC_DINPUT 1) + endif() + if(HAVE_XINPUT_H) + set(SDL_HAPTIC_XINPUT 1) + endif() + set(HAVE_SDL_HAPTIC TRUE) + endif() endif() file(GLOB VERSION_SOURCES ${SDL2_SOURCE_DIR}/src/main/windows/*.rc) @@ -943,6 +972,7 @@ elseif(APPLE) set_source_files_properties(${EXTRA_SOURCES} PROPERTIES LANGUAGE C) set(HAVE_SDL_FILE TRUE) set(SDL_FRAMEWORK_COCOA 1) + set(SDL_FRAMEWORK_COREVIDEO 1) else() message_error("SDL_FILE must be enabled to build on MacOS X") endif() @@ -1002,6 +1032,10 @@ elseif(APPLE) endif() # Actually load the frameworks at the end so we don't duplicate include. + if(SDL_FRAMEWORK_COREVIDEO) + find_library(COREVIDEO CoreVideo) + list(APPEND EXTRA_LIBS ${COREVIDEO}) + endif() if(SDL_FRAMEWORK_COCOA) find_library(COCOA_LIBRARY Cocoa) list(APPEND EXTRA_LIBS ${COCOA_LIBRARY}) @@ -1304,6 +1338,17 @@ if(NOT WINDOWS OR CYGWIN) # TODO: what about the .spec file? Is it only needed for RPM creation? install(FILES "${SDL2_SOURCE_DIR}/sdl2.m4" DESTINATION "share/aclocal") else() - install(TARGETS SDL2 RUNTIME DESTINATION bin) + if(SDL_SHARED) + install(TARGETS SDL2 RUNTIME DESTINATION bin) + endif() endif() +##### Uninstall target ##### + +configure_file( + "${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in" + "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake" + IMMEDIATE @ONLY) + +add_custom_target(uninstall + COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake) diff --git a/jni/SDL2-2.0.3/INSTALL.txt b/jni/SDL2-2.0.3/INSTALL.txt index ce77664c..2df10bdd 100644 --- a/jni/SDL2-2.0.3/INSTALL.txt +++ b/jni/SDL2-2.0.3/INSTALL.txt @@ -9,7 +9,7 @@ To compile and install SDL: * Run './configure; make; make install' Mac OS X with Xcode: - * Read README-macosx.txt + * Read docs/README-macosx.md Mac OS X from the command line: * Run './configure; make; make install' @@ -18,13 +18,13 @@ To compile and install SDL: * Run './configure; make; make install' Android: - * Read README-android.txt + * Read docs/README-android.md iOS: - * Read README-ios.txt + * Read docs/README-ios.md Using Cmake: - * Read README-cmake.txt + * Read docs/README-cmake.md 2. Look at the example programs in ./test, and check out the online documentation at http://wiki.libsdl.org/ diff --git a/jni/SDL2-2.0.3/Makefile.in b/jni/SDL2-2.0.3/Makefile.in index da42661c..62b9269e 100644 --- a/jni/SDL2-2.0.3/Makefile.in +++ b/jni/SDL2-2.0.3/Makefile.in @@ -42,15 +42,25 @@ SDLTEST_OBJECTS = @SDLTEST_OBJECTS@ SRC_DIST = *.txt acinclude Android.mk autogen.sh android-project build-scripts cmake configure configure.in debian include Makefile.* sdl2-config.in sdl2.m4 sdl2.pc.in SDL2.spec.in src test VisualC.html VisualC Xcode Xcode-iOS GEN_DIST = SDL2.spec +ifneq ($V,1) +RUN_CMD_AR = @echo " AR " $@; +RUN_CMD_CC = @echo " CC " $@; +RUN_CMD_CXX = @echo " CXX " $@; +RUN_CMD_LTLINK = @echo " LTLINK" $@; +RUN_CMD_RANLIB = @echo " RANLIB" $@; +LIBTOOL += --quiet +endif + HDRS = \ SDL.h \ SDL_assert.h \ SDL_atomic.h \ SDL_audio.h \ - SDL_bits.h \ + SDL_bits.h \ SDL_blendmode.h \ SDL_clipboard.h \ SDL_cpuinfo.h \ + SDL_egl.h \ SDL_endian.h \ SDL_error.h \ SDL_events.h \ @@ -70,8 +80,13 @@ HDRS = \ SDL_mutex.h \ SDL_name.h \ SDL_opengl.h \ + SDL_opengl_glext.h \ SDL_opengles.h \ + SDL_opengles2_gl2ext.h \ + SDL_opengles2_gl2.h \ + SDL_opengles2_gl2platform.h \ SDL_opengles2.h \ + SDL_opengles2_khrplatform.h \ SDL_pixels.h \ SDL_platform.h \ SDL_power.h \ @@ -123,15 +138,15 @@ update-revision: .PHONY: all update-revision install install-bin install-hdrs install-lib install-data uninstall uninstall-bin uninstall-hdrs uninstall-lib uninstall-data clean distclean dist $(OBJECTS:.lo=.d) $(objects)/$(TARGET): $(OBJECTS) $(VERSION_OBJECTS) - $(LIBTOOL) --mode=link $(CC) -o $@ $(OBJECTS) $(VERSION_OBJECTS) $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) + $(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) -o $@ $(OBJECTS) $(VERSION_OBJECTS) $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) $(objects)/$(SDLMAIN_TARGET): $(SDLMAIN_OBJECTS) - $(AR) cru $@ $(SDLMAIN_OBJECTS) - $(RANLIB) $@ + $(RUN_CMD_AR)$(AR) cru $@ $(SDLMAIN_OBJECTS) + $(RUN_CMD_RANLIB)$(RANLIB) $@ $(objects)/$(SDLTEST_TARGET): $(SDLTEST_OBJECTS) - $(AR) cru $@ $(SDLTEST_OBJECTS) - $(RANLIB) $@ + $(RUN_CMD_AR)$(AR) cru $@ $(SDLTEST_OBJECTS) + $(RUN_CMD_RANLIB)$(RANLIB) $@ install: all install-bin install-hdrs install-lib install-data install-bin: diff --git a/jni/SDL2-2.0.3/README-winrt.txt b/jni/SDL2-2.0.3/README-winrt.txt deleted file mode 100644 index efc181b2..00000000 --- a/jni/SDL2-2.0.3/README-winrt.txt +++ /dev/null @@ -1,45 +0,0 @@ -================================================================================ -Simple DirectMedia Layer for WinRT -================================================================================ - -SDL/WinRT layer allows SDL2-based applications to run on many of Microsoft's -platforms that utilize the "Windows Runtime" (aka "WinRT") APIs. WinRT apps -are currently always full-screen apps, run in what Microsoft calls their -"Modern" environment (aka. "Metro"), and are distributed via Microsoft-run -online stores. Some of the operating systems that support such apps include: - -* Windows 8.x -* Windows RT 8.x (aka. Windows 8.x for ARM processors) -* Windows Phone 8.x - -To note, WinRT applications that run on Windows 8.x and/or Windows RT are often -called "Windows Store" apps. - - --------------------------------------------------------------------------------- -Requirements --------------------------------------------------------------------------------- -- Microsoft Visual C++ 2012 -- Free, "Express" editions may be used, so long - as they include support for either "Windows Store" or "Windows Phone" apps. - (NOTE: MSVC 2013 support is pending. 2012 projects may be converted to 2013 - projects by MSVC, in the meantime.) -- A valid Microsoft account -- This requirement is not imposed by SDL, but - rather by Microsoft's Visual C++ toolchain. - - --------------------------------------------------------------------------------- -TODO --------------------------------------------------------------------------------- -- Finish adding support for MSVC 2013, and "Universal" WinRT apps, which - support Windows 8.1, Windows Phone 8.1, and in the future, Xbox One and - Windows Desktop. -- Finish adding support for the SDL satellite libraries (SDL_image, SDL_mixer, - SDL_ttf, etc.) -- Create templates for both MSVC 2012 and MSVC 2013, and have the corresponding - VSIX packages either include pre-built copies of SDL, or reference binaries - available via MSVC's NuGet servers -- Write setup instructions that use MSVC 201x templates -- Write setup instructions that don't use MSVC 201x templates, and use - MSVC project-to-project references, rather than pre-built binaries -- Write a list of caveats found in SDL/WinRT, such as APIs that don't work due - to platform restrictions, or things that need further work diff --git a/jni/SDL2-2.0.3/README.txt b/jni/SDL2-2.0.3/README.txt index 735637b9..84c335c2 100644 --- a/jni/SDL2-2.0.3/README.txt +++ b/jni/SDL2-2.0.3/README.txt @@ -14,29 +14,8 @@ hardware via OpenGL and Direct3D. It is used by video playback software, emulators, and popular games including Valve's award winning catalog and many Humble Bundle games. -SDL officially supports Windows, Mac OS X, Linux, iOS, and Android. -Support for other platforms may be found in the source code. - -SDL is written in C, works natively with C++, and there are bindings -available for several other languages, including C# and Python. - -This library is distributed under the zlib license, which can be found -in the file "COPYING.txt". - -The best way to learn how to use SDL is to check out the header files in -the "include" subdirectory and the programs in the "test" subdirectory. -The header files and test programs are well commented and always up to date. -More documentation and FAQs are available online at: - http://wiki.libsdl.org/ - -If you need help with the library, or just want to discuss SDL related -issues, you can join the developers mailing list: - http://www.libsdl.org/mailing-list.php - -If you want to report bugs or contribute patches, please submit them to -bugzilla: - http://bugzilla.libsdl.org/ +More extensive documentation is available in the docs directory, starting +with README.md Enjoy! Sam Lantinga (slouken@libsdl.org) - diff --git a/jni/SDL2-2.0.3/VisualC.html b/jni/SDL2-2.0.3/VisualC.html index a25907bd..89035d67 100644 --- a/jni/SDL2-2.0.3/VisualC.html +++ b/jni/SDL2-2.0.3/VisualC.html @@ -22,8 +22,7 @@

There are different solution files for the various versions of the IDE. Please use the appropiate version - 2008, 2010 or 2012; the 2010EE and 2012EE files - should be used with the "Express Edition" releases. + 2008, 2010, 2012 or 2013.

Build the .dll and .lib files. @@ -111,8 +110,8 @@

Now create the basic body of your project. The body of your program should take - the following form: - 

+			the following form:
+			

 #include "SDL.h"
 
 int main( int argc, char* argv[] )
@@ -120,8 +119,7 @@ int main( int argc, char* argv[] )
   // Body of the program goes here.
   return 0;
 }
-

-			
+

That's it! diff --git a/jni/SDL2-2.0.3/VisualC/SDL/SDL_VS2008.vcproj b/jni/SDL2-2.0.3/VisualC/SDL/SDL_VS2008.vcproj index 53db16dd..bf33777c 100644 --- a/jni/SDL2-2.0.3/VisualC/SDL/SDL_VS2008.vcproj +++ b/jni/SDL2-2.0.3/VisualC/SDL/SDL_VS2008.vcproj @@ -61,6 +61,7 @@ Detect64BitPortabilityProblems="false" DebugInformationFormat="4" CompileAs="0" + OmitDefaultLibName="true" /> Default false StreamingSIMDExtensions + true _DEBUG;%(PreprocessorDefinitions) @@ -127,6 +128,7 @@ Level3 ProgramDatabase false + true _DEBUG;%(PreprocessorDefinitions) @@ -167,6 +169,7 @@ false ProgramDatabase StreamingSIMDExtensions + true NDEBUG;%(PreprocessorDefinitions) @@ -203,6 +206,7 @@ Level3 false ProgramDatabase + true NDEBUG;%(PreprocessorDefinitions) @@ -510,4 +514,4 @@ - + \ No newline at end of file diff --git a/jni/SDL2-2.0.3/VisualC/SDL/SDL_VS2012.vcxproj b/jni/SDL2-2.0.3/VisualC/SDL/SDL_VS2012.vcxproj index 1a135089..1dade200 100644 --- a/jni/SDL2-2.0.3/VisualC/SDL/SDL_VS2012.vcxproj +++ b/jni/SDL2-2.0.3/VisualC/SDL/SDL_VS2012.vcxproj @@ -98,6 +98,7 @@ Default false StreamingSIMDExtensions + true _DEBUG;%(PreprocessorDefinitions) @@ -131,6 +132,7 @@ Level3 ProgramDatabase false + true _DEBUG;%(PreprocessorDefinitions) @@ -171,6 +173,7 @@ false ProgramDatabase StreamingSIMDExtensions + true NDEBUG;%(PreprocessorDefinitions) @@ -207,6 +210,7 @@ Level3 false ProgramDatabase + true NDEBUG;%(PreprocessorDefinitions) @@ -514,4 +518,4 @@ - + \ No newline at end of file diff --git a/jni/SDL2-2.0.3/VisualC/SDL/SDL_VS2013.vcxproj b/jni/SDL2-2.0.3/VisualC/SDL/SDL_VS2013.vcxproj index 1ef810e4..89dbc00a 100644 --- a/jni/SDL2-2.0.3/VisualC/SDL/SDL_VS2013.vcxproj +++ b/jni/SDL2-2.0.3/VisualC/SDL/SDL_VS2013.vcxproj @@ -98,6 +98,7 @@ Default false StreamingSIMDExtensions + true _DEBUG;%(PreprocessorDefinitions) @@ -131,6 +132,7 @@ Level3 ProgramDatabase false + true _DEBUG;%(PreprocessorDefinitions) @@ -171,6 +173,7 @@ false ProgramDatabase StreamingSIMDExtensions + true NDEBUG;%(PreprocessorDefinitions) @@ -207,6 +210,7 @@ Level3 false ProgramDatabase + true NDEBUG;%(PreprocessorDefinitions) diff --git a/jni/SDL2-2.0.3/VisualC/SDLmain/SDLmain_VS2008.vcproj b/jni/SDL2-2.0.3/VisualC/SDLmain/SDLmain_VS2008.vcproj index 1f707c9e..33c24171 100644 --- a/jni/SDL2-2.0.3/VisualC/SDLmain/SDLmain_VS2008.vcproj +++ b/jni/SDL2-2.0.3/VisualC/SDLmain/SDLmain_VS2008.vcproj @@ -56,6 +56,7 @@ SuppressStartupBanner="true" DebugInformationFormat="1" CompileAs="0" + OmitDefaultLibName="true" /> - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - SDL2main - {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A} - - - - StaticLibrary - false - - - StaticLibrary - false - - - StaticLibrary - false - MultiByte - - - StaticLibrary - false - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)\$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - $(SolutionDir)\$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - $(SolutionDir)\$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - $(SolutionDir)\$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - - - - - OnlyExplicitInline - ..\..\include;..\..\include\SDL;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - - - Level3 - true - Default - OldStyle - false - - - true - - - - - X64 - - - OnlyExplicitInline - ..\..\include;..\..\include\SDL;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - - - Level3 - true - Default - OldStyle - false - - - true - - - - - - Disabled - ..\..\include;..\..\include\SDL;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - MultiThreadedDebugDLL - - - Level3 - true - OldStyle - Default - false - - - true - - - - - X64 - - - Disabled - ..\..\include;..\..\include\SDL;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - MultiThreadedDebugDLL - - - Level3 - true - OldStyle - Default - false - - - true - - - - - - - - + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + SDL2main + {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A} + + + + StaticLibrary + false + + + StaticLibrary + false + + + StaticLibrary + false + MultiByte + + + StaticLibrary + false + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + $(SolutionDir)\$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + $(SolutionDir)\$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + $(SolutionDir)\$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + $(SolutionDir)\$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + + + + + OnlyExplicitInline + ..\..\include;..\..\include\SDL;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + + + Level3 + true + Default + OldStyle + false + true + + + true + + + + + X64 + + + OnlyExplicitInline + ..\..\include;..\..\include\SDL;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + + + Level3 + true + Default + OldStyle + false + true + + + true + + + + + + Disabled + ..\..\include;..\..\include\SDL;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + MultiThreadedDebugDLL + + + Level3 + true + OldStyle + Default + false + true + + + true + + + + + X64 + + + Disabled + ..\..\include;..\..\include\SDL;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + MultiThreadedDebugDLL + + + Level3 + true + OldStyle + Default + false + true + + + true + + + + + + + + \ No newline at end of file diff --git a/jni/SDL2-2.0.3/VisualC/SDLmain/SDLmain_VS2012.vcxproj b/jni/SDL2-2.0.3/VisualC/SDLmain/SDLmain_VS2012.vcxproj index 3caa8b72..c6c65d23 100644 --- a/jni/SDL2-2.0.3/VisualC/SDLmain/SDLmain_VS2012.vcxproj +++ b/jni/SDL2-2.0.3/VisualC/SDLmain/SDLmain_VS2012.vcxproj @@ -91,6 +91,7 @@ Default OldStyle false + true true @@ -114,6 +115,7 @@ Default OldStyle false + true true @@ -133,6 +135,7 @@ OldStyle Default false + true true @@ -154,6 +157,7 @@ OldStyle Default false + true true @@ -165,4 +169,4 @@ - + \ No newline at end of file diff --git a/jni/SDL2-2.0.3/VisualC/SDLmain/SDLmain_VS2013.vcxproj b/jni/SDL2-2.0.3/VisualC/SDLmain/SDLmain_VS2013.vcxproj index 3f5c004c..3b90f23f 100644 --- a/jni/SDL2-2.0.3/VisualC/SDLmain/SDLmain_VS2013.vcxproj +++ b/jni/SDL2-2.0.3/VisualC/SDLmain/SDLmain_VS2013.vcxproj @@ -91,6 +91,7 @@ Default OldStyle false + true true @@ -114,6 +115,7 @@ Default OldStyle false + true true @@ -133,6 +135,7 @@ OldStyle Default false + true true @@ -154,6 +157,7 @@ OldStyle Default false + true true diff --git a/jni/SDL2-2.0.3/VisualC/SDLtest/SDLtest_VS2008.vcproj b/jni/SDL2-2.0.3/VisualC/SDLtest/SDLtest_VS2008.vcproj index 97f09a61..ccaabe2d 100644 --- a/jni/SDL2-2.0.3/VisualC/SDLtest/SDLtest_VS2008.vcproj +++ b/jni/SDL2-2.0.3/VisualC/SDLtest/SDLtest_VS2008.vcproj @@ -56,6 +56,7 @@ SuppressStartupBanner="true" DebugInformationFormat="1" CompileAs="0" + OmitDefaultLibName="true" /> Default OldStyle false + true true @@ -110,6 +111,7 @@ Default OldStyle false + true true @@ -129,6 +131,7 @@ OldStyle Default false + true true @@ -150,6 +153,7 @@ OldStyle Default false + true true @@ -189,4 +193,4 @@ - + \ No newline at end of file diff --git a/jni/SDL2-2.0.3/VisualC/SDLtest/SDLtest_VS2012.vcxproj b/jni/SDL2-2.0.3/VisualC/SDLtest/SDLtest_VS2012.vcxproj index b60e4bc7..256bbf2f 100644 --- a/jni/SDL2-2.0.3/VisualC/SDLtest/SDLtest_VS2012.vcxproj +++ b/jni/SDL2-2.0.3/VisualC/SDLtest/SDLtest_VS2012.vcxproj @@ -91,6 +91,7 @@ Default OldStyle false + true true @@ -114,6 +115,7 @@ Default OldStyle false + true true @@ -133,6 +135,7 @@ OldStyle Default false + true true @@ -154,6 +157,7 @@ OldStyle Default false + true true @@ -193,4 +197,4 @@ - + \ No newline at end of file diff --git a/jni/SDL2-2.0.3/VisualC/SDLtest/SDLtest_VS2013.vcxproj b/jni/SDL2-2.0.3/VisualC/SDLtest/SDLtest_VS2013.vcxproj index 683a5840..a515ab08 100644 --- a/jni/SDL2-2.0.3/VisualC/SDLtest/SDLtest_VS2013.vcxproj +++ b/jni/SDL2-2.0.3/VisualC/SDLtest/SDLtest_VS2013.vcxproj @@ -91,6 +91,7 @@ Default OldStyle false + true true @@ -114,6 +115,7 @@ Default OldStyle false + true true @@ -133,6 +135,7 @@ OldStyle Default false + true true @@ -154,6 +157,7 @@ OldStyle Default false + true true diff --git a/jni/SDL2-2.0.3/WhatsNew.txt b/jni/SDL2-2.0.3/WhatsNew.txt index bcbdcd10..48209e85 100644 --- a/jni/SDL2-2.0.3/WhatsNew.txt +++ b/jni/SDL2-2.0.3/WhatsNew.txt @@ -1,6 +1,16 @@ This is a list of major changes in SDL's version history. +--------------------------------------------------------------------------- +2.0.4: +--------------------------------------------------------------------------- + +General: +* Added an event SDL_RENDER_DEVICE_RESET that is sent from the D3D renderers + when the D3D device is lost, and from Android's event loop when the GLES + context had to be re created. +* Native Client backend + --------------------------------------------------------------------------- 2.0.3: --------------------------------------------------------------------------- diff --git a/jni/SDL2-2.0.3/Xcode-iOS/Demos/Demos.xcodeproj/project.pbxproj b/jni/SDL2-2.0.3/Xcode-iOS/Demos/Demos.xcodeproj/project.pbxproj index e3eaecda..5cff3547 100755 --- a/jni/SDL2-2.0.3/Xcode-iOS/Demos/Demos.xcodeproj/project.pbxproj +++ b/jni/SDL2-2.0.3/Xcode-iOS/Demos/Demos.xcodeproj/project.pbxproj @@ -10,6 +10,13 @@ 1D3623EC0D0F72F000981E51 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1D3623EB0D0F72F000981E51 /* CoreGraphics.framework */; }; 1D60589F0D05DD5A006BFB54 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1D30AB110D05D00D00671497 /* Foundation.framework */; }; 1DF5F4E00D08C38300B7A737 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1DF5F4DF0D08C38300B7A737 /* UIKit.framework */; }; + FA8B4BA31967070A00F8EB7C /* CoreMotion.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FA8B4BA21967070A00F8EB7C /* CoreMotion.framework */; }; + FA8B4BA41967071300F8EB7C /* CoreMotion.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FA8B4BA21967070A00F8EB7C /* CoreMotion.framework */; }; + FA8B4BA51967071A00F8EB7C /* CoreMotion.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FA8B4BA21967070A00F8EB7C /* CoreMotion.framework */; }; + FA8B4BA61967072100F8EB7C /* CoreMotion.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FA8B4BA21967070A00F8EB7C /* CoreMotion.framework */; }; + FA8B4BA71967072800F8EB7C /* CoreMotion.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FA8B4BA21967070A00F8EB7C /* CoreMotion.framework */; }; + FA8B4BA81967073400F8EB7C /* CoreMotion.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FA8B4BA21967070A00F8EB7C /* CoreMotion.framework */; }; + FA8B4BA91967073D00F8EB7C /* CoreMotion.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FA8B4BA21967070A00F8EB7C /* CoreMotion.framework */; }; FD15FD690E086911003BDF25 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1D30AB110D05D00D00671497 /* Foundation.framework */; }; FD15FD6A0E086911003BDF25 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1DF5F4DF0D08C38300B7A737 /* UIKit.framework */; }; FD15FD6B0E086911003BDF25 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1D3623EB0D0F72F000981E51 /* CoreGraphics.framework */; }; @@ -169,6 +176,7 @@ 1D6058910D05DD3D006BFB54 /* Rectangles.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Rectangles.app; sourceTree = BUILT_PRODUCTS_DIR; }; 1DF5F4DF0D08C38300B7A737 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; }; 8D1107310486CEB800E47090 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + FA8B4BA21967070A00F8EB7C /* CoreMotion.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMotion.framework; path = System/Library/Frameworks/CoreMotion.framework; sourceTree = SDKROOT; }; FD15FCB20E086866003BDF25 /* Happy.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Happy.app; sourceTree = BUILT_PRODUCTS_DIR; }; FD1B48920E313154007AB34E /* SDL.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = SDL.xcodeproj; path = ../SDL/SDL.xcodeproj; sourceTree = SOURCE_ROOT; }; FD5F9BE40E0DEBEA008E885B /* Accel.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Accel.app; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -209,6 +217,7 @@ buildActionMask = 2147483647; files = ( FD1B48DD0E313255007AB34E /* libSDL2.a in Frameworks */, + FA8B4BA31967070A00F8EB7C /* CoreMotion.framework in Frameworks */, FDF0D7AB0E12D53800247964 /* CoreAudio.framework in Frameworks */, FDF0D7AC0E12D53800247964 /* AudioToolbox.framework in Frameworks */, 1D60589F0D05DD5A006BFB54 /* Foundation.framework in Frameworks */, @@ -224,6 +233,7 @@ buildActionMask = 2147483647; files = ( FD1B49980E313261007AB34E /* libSDL2.a in Frameworks */, + FA8B4BA41967071300F8EB7C /* CoreMotion.framework in Frameworks */, FDF0D7A90E12D53500247964 /* CoreAudio.framework in Frameworks */, FDF0D7AA0E12D53500247964 /* AudioToolbox.framework in Frameworks */, FD15FD690E086911003BDF25 /* Foundation.framework in Frameworks */, @@ -239,6 +249,7 @@ buildActionMask = 2147483647; files = ( FD1B499C0E313269007AB34E /* libSDL2.a in Frameworks */, + FA8B4BA51967071A00F8EB7C /* CoreMotion.framework in Frameworks */, FDF0D7A70E12D53200247964 /* CoreAudio.framework in Frameworks */, FDF0D7A80E12D53200247964 /* AudioToolbox.framework in Frameworks */, FD5F9CEB0E0E0741008E885B /* OpenGLES.framework in Frameworks */, @@ -254,6 +265,7 @@ buildActionMask = 2147483647; files = ( FDB652000E43D1F300F688B5 /* libSDL2.a in Frameworks */, + FA8B4BA91967073D00F8EB7C /* CoreMotion.framework in Frameworks */, FDB652020E43D1F300F688B5 /* Foundation.framework in Frameworks */, FDB652030E43D1F300F688B5 /* UIKit.framework in Frameworks */, FDB652040E43D1F300F688B5 /* CoreGraphics.framework in Frameworks */, @@ -269,6 +281,7 @@ buildActionMask = 2147483647; files = ( FD1B499E0E31326C007AB34E /* libSDL2.a in Frameworks */, + FA8B4BA61967072100F8EB7C /* CoreMotion.framework in Frameworks */, FDF0D7950E12D52900247964 /* CoreAudio.framework in Frameworks */, FDF0D7960E12D52900247964 /* AudioToolbox.framework in Frameworks */, FDC202E60E107B1200ABAC90 /* Foundation.framework in Frameworks */, @@ -284,6 +297,7 @@ buildActionMask = 2147483647; files = ( FD1B49A20E313273007AB34E /* libSDL2.a in Frameworks */, + FA8B4BA81967073400F8EB7C /* CoreMotion.framework in Frameworks */, FDC52ED40E2843D6008D768C /* Foundation.framework in Frameworks */, FDC52ED50E2843D6008D768C /* UIKit.framework in Frameworks */, FDC52ED60E2843D6008D768C /* CoreGraphics.framework in Frameworks */, @@ -299,6 +313,7 @@ buildActionMask = 2147483647; files = ( FD1B49A00E313270007AB34E /* libSDL2.a in Frameworks */, + FA8B4BA71967072800F8EB7C /* CoreMotion.framework in Frameworks */, FDF0D69C0E12D05400247964 /* Foundation.framework in Frameworks */, FDF0D69D0E12D05400247964 /* UIKit.framework in Frameworks */, FDF0D69E0E12D05400247964 /* CoreGraphics.framework in Frameworks */, @@ -352,6 +367,7 @@ 29B97323FDCFA39411CA2CEA /* Frameworks */ = { isa = PBXGroup; children = ( + FA8B4BA21967070A00F8EB7C /* CoreMotion.framework */, FDF0D7220E12D31800247964 /* AudioToolbox.framework */, FDB96EDF0DEFC9DC00FAF19F /* QuartzCore.framework */, FDB96ED30DEFC9C700FAF19F /* OpenGLES.framework */, @@ -799,14 +815,9 @@ C01FCF4F08A954540054247B /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = ( - armv6, - armv7, - ); "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; GCC_OPTIMIZATION_LEVEL = 0; HEADER_SEARCH_PATHS = ../../include; - IPHONEOS_DEPLOYMENT_TARGET = 3.1.3; PRELINK_LIBS = ""; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; @@ -816,13 +827,8 @@ C01FCF5008A954540054247B /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = ( - armv6, - armv7, - ); "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; HEADER_SEARCH_PATHS = ../../include; - IPHONEOS_DEPLOYMENT_TARGET = 3.1.3; PRELINK_LIBS = ""; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; diff --git a/jni/SDL2-2.0.3/Xcode-iOS/SDL/SDL.xcodeproj/project.pbxproj b/jni/SDL2-2.0.3/Xcode-iOS/SDL/SDL.xcodeproj/project.pbxproj index c4b95a36..44055cae 100755 --- a/jni/SDL2-2.0.3/Xcode-iOS/SDL/SDL.xcodeproj/project.pbxproj +++ b/jni/SDL2-2.0.3/Xcode-iOS/SDL/SDL.xcodeproj/project.pbxproj @@ -175,8 +175,6 @@ FD6526800DE8FCDD002AD96B /* SDL_timer.c in Sources */ = {isa = PBXBuildFile; fileRef = FD99BA2E0DD52EDC00FB1D6B /* SDL_timer.c */; }; FD6526810DE8FCDD002AD96B /* SDL_systimer.c in Sources */ = {isa = PBXBuildFile; fileRef = FD99BA310DD52EDC00FB1D6B /* SDL_systimer.c */; }; FD689F030E26E5B600F90B21 /* SDL_sysjoystick.m in Sources */ = {isa = PBXBuildFile; fileRef = FD689F000E26E5B600F90B21 /* SDL_sysjoystick.m */; }; - FD689F040E26E5B600F90B21 /* SDLUIAccelerationDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = FD689F010E26E5B600F90B21 /* SDLUIAccelerationDelegate.h */; }; - FD689F050E26E5B600F90B21 /* SDLUIAccelerationDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = FD689F020E26E5B600F90B21 /* SDLUIAccelerationDelegate.m */; }; FD689F1C0E26E5D900F90B21 /* SDL_uikitevents.h in Headers */ = {isa = PBXBuildFile; fileRef = FD689F0C0E26E5D900F90B21 /* SDL_uikitevents.h */; }; FD689F1D0E26E5D900F90B21 /* SDL_uikitevents.m in Sources */ = {isa = PBXBuildFile; fileRef = FD689F0D0E26E5D900F90B21 /* SDL_uikitevents.m */; }; FD689F1E0E26E5D900F90B21 /* SDL_uikitopengles.h in Headers */ = {isa = PBXBuildFile; fileRef = FD689F0E0E26E5D900F90B21 /* SDL_uikitopengles.h */; }; @@ -353,8 +351,6 @@ FD5F9D200E0E08B3008E885B /* SDL_sysjoystick.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_sysjoystick.h; sourceTree = ""; }; FD6526630DE8FCCB002AD96B /* libSDL2.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libSDL2.a; sourceTree = BUILT_PRODUCTS_DIR; }; FD689F000E26E5B600F90B21 /* SDL_sysjoystick.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDL_sysjoystick.m; sourceTree = ""; }; - FD689F010E26E5B600F90B21 /* SDLUIAccelerationDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLUIAccelerationDelegate.h; sourceTree = ""; }; - FD689F020E26E5B600F90B21 /* SDLUIAccelerationDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLUIAccelerationDelegate.m; sourceTree = ""; }; FD689F0C0E26E5D900F90B21 /* SDL_uikitevents.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_uikitevents.h; sourceTree = ""; }; FD689F0D0E26E5D900F90B21 /* SDL_uikitevents.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDL_uikitevents.m; sourceTree = ""; }; FD689F0E0E26E5D900F90B21 /* SDL_uikitopengles.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_uikitopengles.h; sourceTree = ""; }; @@ -639,8 +635,6 @@ isa = PBXGroup; children = ( FD689F000E26E5B600F90B21 /* SDL_sysjoystick.m */, - FD689F010E26E5B600F90B21 /* SDLUIAccelerationDelegate.h */, - FD689F020E26E5B600F90B21 /* SDLUIAccelerationDelegate.m */, ); path = iphoneos; sourceTree = ""; @@ -972,7 +966,6 @@ FDA686000DF244C800F98A1A /* SDL_nullvideo.h in Headers */, FD5F9D300E0E08B3008E885B /* SDL_joystick_c.h in Headers */, FD5F9D310E0E08B3008E885B /* SDL_sysjoystick.h in Headers */, - FD689F040E26E5B600F90B21 /* SDLUIAccelerationDelegate.h in Headers */, FD689F1C0E26E5D900F90B21 /* SDL_uikitevents.h in Headers */, FD689F1E0E26E5D900F90B21 /* SDL_uikitopengles.h in Headers */, FD689F200E26E5D900F90B21 /* SDL_uikitvideo.h in Headers */, @@ -1181,7 +1174,6 @@ FDA685FF0DF244C800F98A1A /* SDL_nullvideo.c in Sources */, FD5F9D2F0E0E08B3008E885B /* SDL_joystick.c in Sources */, FD689F030E26E5B600F90B21 /* SDL_sysjoystick.m in Sources */, - FD689F050E26E5B600F90B21 /* SDLUIAccelerationDelegate.m in Sources */, FD689F1D0E26E5D900F90B21 /* SDL_uikitevents.m in Sources */, FD689F1F0E26E5D900F90B21 /* SDL_uikitopengles.m in Sources */, FD689F210E26E5D900F90B21 /* SDL_uikitvideo.m in Sources */, @@ -1257,7 +1249,6 @@ C01FCF4F08A954540054247B /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_BIT)"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; GCC_OPTIMIZATION_LEVEL = 0; GCC_SYMBOLS_PRIVATE_EXTERN = YES; @@ -1271,7 +1262,6 @@ C01FCF5008A954540054247B /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_BIT)"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; GCC_SYMBOLS_PRIVATE_EXTERN = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES; @@ -1285,6 +1275,7 @@ isa = XCBuildConfiguration; buildSettings = { COPY_PHASE_STRIP = NO; + IPHONEOS_DEPLOYMENT_TARGET = 5.1.1; PRODUCT_NAME = SDL2; SKIP_INSTALL = YES; }; @@ -1294,6 +1285,7 @@ isa = XCBuildConfiguration; buildSettings = { COPY_PHASE_STRIP = YES; + IPHONEOS_DEPLOYMENT_TARGET = 5.1.1; PRODUCT_NAME = SDL2; SKIP_INSTALL = YES; }; diff --git a/jni/SDL2-2.0.3/Xcode-iOS/SDLtest/SDL2test.xcodeproj/project.pbxproj b/jni/SDL2-2.0.3/Xcode-iOS/SDLtest/SDL2test.xcodeproj/project.pbxproj index 0995735e..adc31519 100644 --- a/jni/SDL2-2.0.3/Xcode-iOS/SDLtest/SDL2test.xcodeproj/project.pbxproj +++ b/jni/SDL2-2.0.3/Xcode-iOS/SDLtest/SDL2test.xcodeproj/project.pbxproj @@ -174,7 +174,6 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_32_BIT)"; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; CLANG_WARN_CONSTANT_CONVERSION = YES; @@ -206,7 +205,6 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_32_BIT)"; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; CLANG_WARN_CONSTANT_CONVERSION = YES; diff --git a/jni/SDL2-2.0.3/Xcode-iOS/Template/SDL iOS Application/___PROJECTNAME___.xcodeproj/project.pbxproj b/jni/SDL2-2.0.3/Xcode-iOS/Template/SDL iOS Application/___PROJECTNAME___.xcodeproj/project.pbxproj index 3e0eb0c8..1411ab41 100755 --- a/jni/SDL2-2.0.3/Xcode-iOS/Template/SDL iOS Application/___PROJECTNAME___.xcodeproj/project.pbxproj +++ b/jni/SDL2-2.0.3/Xcode-iOS/Template/SDL iOS Application/___PROJECTNAME___.xcodeproj/project.pbxproj @@ -3,15 +3,17 @@ archiveVersion = 1; classes = { }; - objectVersion = 45; + objectVersion = 46; objects = { /* Begin PBXBuildFile section */ - 0097E2D912F70C4E00724AC5 /* libSDL.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 0097E2D512F70C4D00724AC5 /* libSDL.a */; }; 1D60589F0D05DD5A006BFB54 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1D30AB110D05D00D00671497 /* Foundation.framework */; }; 1DF5F4E00D08C38300B7A737 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1DF5F4DF0D08C38300B7A737 /* UIKit.framework */; }; 28FD15000DC6FC520079059D /* OpenGLES.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 28FD14FF0DC6FC520079059D /* OpenGLES.framework */; }; 28FD15080DC6FC5B0079059D /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 28FD15070DC6FC5B0079059D /* QuartzCore.framework */; }; + 944A656F195747D90094A81E /* libSDL2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 944A656E1957463F0094A81E /* libSDL2.a */; }; + 945C4F53195AF17F00DBBF61 /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 945C4F52195AF17F00DBBF61 /* Default-568h@2x.png */; }; + FA8B4B97196703B400F8EB7C /* CoreMotion.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FA8B4B96196703B400F8EB7C /* CoreMotion.framework */; }; FD779EDE0E26BA1200F39101 /* CoreAudio.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FD779EDD0E26BA1200F39101 /* CoreAudio.framework */; }; FD77A07D0E26BD8C00F39101 /* Icon.png in Resources */ = {isa = PBXBuildFile; fileRef = FD77A07C0E26BD8C00F39101 /* Icon.png */; }; FD77A07F0E26BDA900F39101 /* Default.png in Resources */ = {isa = PBXBuildFile; fileRef = FD77A07E0E26BDA900F39101 /* Default.png */; }; @@ -20,71 +22,26 @@ FDB8BFC60E5A0F6A00980157 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FDB8BFC50E5A0F6A00980157 /* CoreGraphics.framework */; }; /* End PBXBuildFile section */ +/* Begin PBXContainerItemProxy section */ + 944A656D1957463F0094A81E /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 944A65681957463F0094A81E /* SDL.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = FD6526630DE8FCCB002AD96B; + remoteInfo = libSDL; + }; +/* End PBXContainerItemProxy section */ + /* Begin PBXFileReference section */ - 0097E29A12F70C4D00724AC5 /* begin_code.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = begin_code.h; sourceTree = ""; }; - 0097E29B12F70C4D00724AC5 /* close_code.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = close_code.h; sourceTree = ""; }; - 0097E29C12F70C4D00724AC5 /* doxyfile */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = doxyfile; sourceTree = ""; }; - 0097E29D12F70C4D00724AC5 /* SDL.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL.h; sourceTree = ""; }; - 0097E29E12F70C4D00724AC5 /* SDL_assert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_assert.h; sourceTree = ""; }; - 0097E29F12F70C4D00724AC5 /* SDL_atomic.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_atomic.h; sourceTree = ""; }; - 0097E2A012F70C4D00724AC5 /* SDL_audio.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_audio.h; sourceTree = ""; }; - 0097E2A112F70C4D00724AC5 /* SDL_blendmode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_blendmode.h; sourceTree = ""; }; - 0097E2A212F70C4D00724AC5 /* SDL_clipboard.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_clipboard.h; sourceTree = ""; }; - 0097E2A312F70C4D00724AC5 /* SDL_compat.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_compat.h; sourceTree = ""; }; - 0097E2A412F70C4D00724AC5 /* SDL_config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_config.h; sourceTree = ""; }; - 0097E2A512F70C4D00724AC5 /* SDL_config.h.default */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = SDL_config.h.default; sourceTree = ""; }; - 0097E2A612F70C4D00724AC5 /* SDL_config.h.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = SDL_config.h.in; sourceTree = ""; }; - 0097E2A712F70C4D00724AC5 /* SDL_config_android.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_config_android.h; sourceTree = ""; }; - 0097E2A812F70C4D00724AC5 /* SDL_config_iphoneos.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_config_iphoneos.h; sourceTree = ""; }; - 0097E2A912F70C4D00724AC5 /* SDL_config_macosx.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_config_macosx.h; sourceTree = ""; }; - 0097E2AA12F70C4D00724AC5 /* SDL_config_minimal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_config_minimal.h; sourceTree = ""; }; - 0097E2AC12F70C4D00724AC5 /* SDL_config_pandora.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_config_pandora.h; sourceTree = ""; }; - 0097E2AD12F70C4D00724AC5 /* SDL_config_windows.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_config_windows.h; sourceTree = ""; }; - 0097E2AE12F70C4D00724AC5 /* SDL_config_wiz.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_config_wiz.h; sourceTree = ""; }; - 0097E2AF12F70C4D00724AC5 /* SDL_copying.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_copying.h; sourceTree = ""; }; - 0097E2B012F70C4D00724AC5 /* SDL_cpuinfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_cpuinfo.h; sourceTree = ""; }; - 0097E2B112F70C4D00724AC5 /* SDL_endian.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_endian.h; sourceTree = ""; }; - 0097E2B212F70C4D00724AC5 /* SDL_error.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_error.h; sourceTree = ""; }; - 0097E2B312F70C4D00724AC5 /* SDL_events.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_events.h; sourceTree = ""; }; - 0097E2B412F70C4D00724AC5 /* SDL_gesture.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_gesture.h; sourceTree = ""; }; - 0097E2B512F70C4D00724AC5 /* SDL_haptic.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_haptic.h; sourceTree = ""; }; - 0097E2B612F70C4D00724AC5 /* SDL_input.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_input.h; sourceTree = ""; }; - 0097E2B712F70C4D00724AC5 /* SDL_joystick.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_joystick.h; sourceTree = ""; }; - 0097E2B812F70C4D00724AC5 /* SDL_keyboard.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_keyboard.h; sourceTree = ""; }; - 0097E2B912F70C4D00724AC5 /* SDL_keysym.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_keysym.h; sourceTree = ""; }; - 0097E2BA12F70C4D00724AC5 /* SDL_loadso.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_loadso.h; sourceTree = ""; }; - 0097E2BB12F70C4D00724AC5 /* SDL_main.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_main.h; sourceTree = ""; }; - 0097E2BC12F70C4D00724AC5 /* SDL_mouse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_mouse.h; sourceTree = ""; }; - 0097E2BD12F70C4D00724AC5 /* SDL_mutex.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_mutex.h; sourceTree = ""; }; - 0097E2BE12F70C4D00724AC5 /* SDL_name.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_name.h; sourceTree = ""; }; - 0097E2BF12F70C4D00724AC5 /* SDL_opengl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_opengl.h; sourceTree = ""; }; - 0097E2C012F70C4D00724AC5 /* SDL_opengles.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_opengles.h; sourceTree = ""; }; - 0097E2C112F70C4D00724AC5 /* SDL_pixels.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_pixels.h; sourceTree = ""; }; - 0097E2C212F70C4D00724AC5 /* SDL_platform.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_platform.h; sourceTree = ""; }; - 0097E2C312F70C4D00724AC5 /* SDL_power.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_power.h; sourceTree = ""; }; - 0097E2C412F70C4D00724AC5 /* SDL_quit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_quit.h; sourceTree = ""; }; - 0097E2C512F70C4D00724AC5 /* SDL_rect.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_rect.h; sourceTree = ""; }; - 0097E2C612F70C4D00724AC5 /* SDL_revision.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_revision.h; sourceTree = ""; }; - 0097E2C712F70C4D00724AC5 /* SDL_rwops.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_rwops.h; sourceTree = ""; }; - 0097E2C812F70C4D00724AC5 /* SDL_scalemode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_scalemode.h; sourceTree = ""; }; - 0097E2C912F70C4D00724AC5 /* SDL_scancode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_scancode.h; sourceTree = ""; }; - 0097E2CA12F70C4D00724AC5 /* SDL_shape.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_shape.h; sourceTree = ""; }; - 0097E2CB12F70C4D00724AC5 /* SDL_stdinc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_stdinc.h; sourceTree = ""; }; - 0097E2CC12F70C4D00724AC5 /* SDL_surface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_surface.h; sourceTree = ""; }; - 0097E2CD12F70C4D00724AC5 /* SDL_syswm.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_syswm.h; sourceTree = ""; }; - 0097E2CE12F70C4D00724AC5 /* SDL_thread.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_thread.h; sourceTree = ""; }; - 0097E2CF12F70C4D00724AC5 /* SDL_timer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_timer.h; sourceTree = ""; }; - 0097E2D012F70C4D00724AC5 /* SDL_touch.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_touch.h; sourceTree = ""; }; - 0097E2D112F70C4D00724AC5 /* SDL_types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_types.h; sourceTree = ""; }; - 0097E2D212F70C4D00724AC5 /* SDL_version.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_version.h; sourceTree = ""; }; - 0097E2D312F70C4D00724AC5 /* SDL_video.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_video.h; sourceTree = ""; }; - 0097E2D512F70C4D00724AC5 /* libSDL.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libSDL.a; sourceTree = ""; }; 1D30AB110D05D00D00671497 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; 1D6058910D05DD3D006BFB54 /* ___PROJECTNAME___.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "___PROJECTNAME___.app"; sourceTree = BUILT_PRODUCTS_DIR; }; 1DF5F4DF0D08C38300B7A737 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; }; 28FD14FF0DC6FC520079059D /* OpenGLES.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGLES.framework; path = System/Library/Frameworks/OpenGLES.framework; sourceTree = SDKROOT; }; 28FD15070DC6FC5B0079059D /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; }; 8D1107310486CEB800E47090 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + 944A65681957463F0094A81E /* SDL.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = SDL.xcodeproj; path = ../../SDL/SDL.xcodeproj; sourceTree = ""; }; + 945C4F52195AF17F00DBBF61 /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h@2x.png"; sourceTree = ""; }; + FA8B4B96196703B400F8EB7C /* CoreMotion.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMotion.framework; path = System/Library/Frameworks/CoreMotion.framework; sourceTree = SDKROOT; }; FD779EDD0E26BA1200F39101 /* CoreAudio.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreAudio.framework; path = System/Library/Frameworks/CoreAudio.framework; sourceTree = SDKROOT; }; FD77A07C0E26BD8C00F39101 /* Icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Icon.png; sourceTree = ""; }; FD77A07E0E26BDA900F39101 /* Default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Default.png; sourceTree = ""; }; @@ -98,6 +55,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 944A656F195747D90094A81E /* libSDL2.a in Frameworks */, 1D60589F0D05DD5A006BFB54 /* Foundation.framework in Frameworks */, 1DF5F4E00D08C38300B7A737 /* UIKit.framework in Frameworks */, 28FD15000DC6FC520079059D /* OpenGLES.framework in Frameworks */, @@ -105,94 +63,13 @@ FD779EDE0E26BA1200F39101 /* CoreAudio.framework in Frameworks */, FD77A0850E26BDB800F39101 /* AudioToolbox.framework in Frameworks */, FDB8BFC60E5A0F6A00980157 /* CoreGraphics.framework in Frameworks */, - 0097E2D912F70C4E00724AC5 /* libSDL.a in Frameworks */, + FA8B4B97196703B400F8EB7C /* CoreMotion.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 0097E29812F70C4D00724AC5 /* SDL */ = { - isa = PBXGroup; - children = ( - 0097E29912F70C4D00724AC5 /* include */, - 0097E2D412F70C4D00724AC5 /* lib */, - ); - path = SDL; - sourceTree = ""; - }; - 0097E29912F70C4D00724AC5 /* include */ = { - isa = PBXGroup; - children = ( - 0097E29A12F70C4D00724AC5 /* begin_code.h */, - 0097E29B12F70C4D00724AC5 /* close_code.h */, - 0097E29C12F70C4D00724AC5 /* doxyfile */, - 0097E29D12F70C4D00724AC5 /* SDL.h */, - 0097E29E12F70C4D00724AC5 /* SDL_assert.h */, - 0097E29F12F70C4D00724AC5 /* SDL_atomic.h */, - 0097E2A012F70C4D00724AC5 /* SDL_audio.h */, - 0097E2A112F70C4D00724AC5 /* SDL_blendmode.h */, - 0097E2A212F70C4D00724AC5 /* SDL_clipboard.h */, - 0097E2A312F70C4D00724AC5 /* SDL_compat.h */, - 0097E2A412F70C4D00724AC5 /* SDL_config.h */, - 0097E2A512F70C4D00724AC5 /* SDL_config.h.default */, - 0097E2A612F70C4D00724AC5 /* SDL_config.h.in */, - 0097E2A712F70C4D00724AC5 /* SDL_config_android.h */, - 0097E2A812F70C4D00724AC5 /* SDL_config_iphoneos.h */, - 0097E2A912F70C4D00724AC5 /* SDL_config_macosx.h */, - 0097E2AA12F70C4D00724AC5 /* SDL_config_minimal.h */, - 0097E2AC12F70C4D00724AC5 /* SDL_config_pandora.h */, - 0097E2AD12F70C4D00724AC5 /* SDL_config_windows.h */, - 0097E2AE12F70C4D00724AC5 /* SDL_config_wiz.h */, - 0097E2AF12F70C4D00724AC5 /* SDL_copying.h */, - 0097E2B012F70C4D00724AC5 /* SDL_cpuinfo.h */, - 0097E2B112F70C4D00724AC5 /* SDL_endian.h */, - 0097E2B212F70C4D00724AC5 /* SDL_error.h */, - 0097E2B312F70C4D00724AC5 /* SDL_events.h */, - 0097E2B412F70C4D00724AC5 /* SDL_gesture.h */, - 0097E2B512F70C4D00724AC5 /* SDL_haptic.h */, - 0097E2B612F70C4D00724AC5 /* SDL_input.h */, - 0097E2B712F70C4D00724AC5 /* SDL_joystick.h */, - 0097E2B812F70C4D00724AC5 /* SDL_keyboard.h */, - 0097E2B912F70C4D00724AC5 /* SDL_keysym.h */, - 0097E2BA12F70C4D00724AC5 /* SDL_loadso.h */, - 0097E2BB12F70C4D00724AC5 /* SDL_main.h */, - 0097E2BC12F70C4D00724AC5 /* SDL_mouse.h */, - 0097E2BD12F70C4D00724AC5 /* SDL_mutex.h */, - 0097E2BE12F70C4D00724AC5 /* SDL_name.h */, - 0097E2BF12F70C4D00724AC5 /* SDL_opengl.h */, - 0097E2C012F70C4D00724AC5 /* SDL_opengles.h */, - 0097E2C112F70C4D00724AC5 /* SDL_pixels.h */, - 0097E2C212F70C4D00724AC5 /* SDL_platform.h */, - 0097E2C312F70C4D00724AC5 /* SDL_power.h */, - 0097E2C412F70C4D00724AC5 /* SDL_quit.h */, - 0097E2C512F70C4D00724AC5 /* SDL_rect.h */, - 0097E2C612F70C4D00724AC5 /* SDL_revision.h */, - 0097E2C712F70C4D00724AC5 /* SDL_rwops.h */, - 0097E2C812F70C4D00724AC5 /* SDL_scalemode.h */, - 0097E2C912F70C4D00724AC5 /* SDL_scancode.h */, - 0097E2CA12F70C4D00724AC5 /* SDL_shape.h */, - 0097E2CB12F70C4D00724AC5 /* SDL_stdinc.h */, - 0097E2CC12F70C4D00724AC5 /* SDL_surface.h */, - 0097E2CD12F70C4D00724AC5 /* SDL_syswm.h */, - 0097E2CE12F70C4D00724AC5 /* SDL_thread.h */, - 0097E2CF12F70C4D00724AC5 /* SDL_timer.h */, - 0097E2D012F70C4D00724AC5 /* SDL_touch.h */, - 0097E2D112F70C4D00724AC5 /* SDL_types.h */, - 0097E2D212F70C4D00724AC5 /* SDL_version.h */, - 0097E2D312F70C4D00724AC5 /* SDL_video.h */, - ); - path = include; - sourceTree = ""; - }; - 0097E2D412F70C4D00724AC5 /* lib */ = { - isa = PBXGroup; - children = ( - 0097E2D512F70C4D00724AC5 /* libSDL.a */, - ); - path = lib; - sourceTree = ""; - }; 19C28FACFE9D520D11CA2CBB /* Products */ = { isa = PBXGroup; children = ( @@ -204,9 +81,9 @@ 29B97314FDCFA39411CA2CEA /* CustomTemplate */ = { isa = PBXGroup; children = ( + 945C4F52195AF17F00DBBF61 /* Default-568h@2x.png */, 29B97315FDCFA39411CA2CEA /* Sources */, 29B97317FDCFA39411CA2CEA /* Resources */, - 0097E29812F70C4D00724AC5 /* SDL */, 29B97323FDCFA39411CA2CEA /* Frameworks */, 19C28FACFE9D520D11CA2CBB /* Products */, ); @@ -216,6 +93,7 @@ 29B97315FDCFA39411CA2CEA /* Sources */ = { isa = PBXGroup; children = ( + 944A65681957463F0094A81E /* SDL.xcodeproj */, FD77A09C0E26BDE500F39101 /* main.c */, ); name = Sources; @@ -234,6 +112,7 @@ 29B97323FDCFA39411CA2CEA /* Frameworks */ = { isa = PBXGroup; children = ( + FA8B4B96196703B400F8EB7C /* CoreMotion.framework */, FDB8BFC50E5A0F6A00980157 /* CoreGraphics.framework */, FD77A0840E26BDB800F39101 /* AudioToolbox.framework */, FD779EDD0E26BA1200F39101 /* CoreAudio.framework */, @@ -245,6 +124,14 @@ name = Frameworks; sourceTree = ""; }; + 944A65691957463F0094A81E /* Products */ = { + isa = PBXGroup; + children = ( + 944A656E1957463F0094A81E /* libSDL2.a */, + ); + name = Products; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -270,8 +157,11 @@ /* Begin PBXProject section */ 29B97313FDCFA39411CA2CEA /* Project object */ = { isa = PBXProject; + attributes = { + LastUpgradeCheck = 0510; + }; buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "___PROJECTNAME___" */; - compatibilityVersion = "Xcode 3.1"; + compatibilityVersion = "Xcode 3.2"; developmentRegion = English; hasScannedForEncodings = 1; knownRegions = ( @@ -282,6 +172,12 @@ ); mainGroup = 29B97314FDCFA39411CA2CEA /* CustomTemplate */; projectDirPath = ""; + projectReferences = ( + { + ProductGroup = 944A65691957463F0094A81E /* Products */; + ProjectRef = 944A65681957463F0094A81E /* SDL.xcodeproj */; + }, + ); projectRoot = ""; targets = ( 1D6058900D05DD3D006BFB54 /* ___PROJECTNAME___ */, @@ -289,6 +185,16 @@ }; /* End PBXProject section */ +/* Begin PBXReferenceProxy section */ + 944A656E1957463F0094A81E /* libSDL2.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = libSDL2.a; + remoteRef = 944A656D1957463F0094A81E /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; +/* End PBXReferenceProxy section */ + /* Begin PBXResourcesBuildPhase section */ 1D60588D0D05DD3D006BFB54 /* Resources */ = { isa = PBXResourcesBuildPhase; @@ -296,6 +202,7 @@ files = ( FD77A07D0E26BD8C00F39101 /* Icon.png in Resources */, FD77A07F0E26BDA900F39101 /* Default.png in Resources */, + 945C4F53195AF17F00DBBF61 /* Default-568h@2x.png in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -323,11 +230,9 @@ GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = ""; INFOPLIST_FILE = Info.plist; - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "\"$(SRCROOT)/SDL/lib\"", - ); + LIBRARY_SEARCH_PATHS = "$(inherited)"; PRODUCT_NAME = "___PROJECTNAME___"; + USER_HEADER_SEARCH_PATHS = ../../../include; }; name = Debug; }; @@ -339,18 +244,15 @@ GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = ""; INFOPLIST_FILE = Info.plist; - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "\"$(SRCROOT)/SDL/lib\"", - ); + LIBRARY_SEARCH_PATHS = "$(inherited)"; PRODUCT_NAME = "___PROJECTNAME___"; + USER_HEADER_SEARCH_PATHS = ../../../include; }; name = Release; }; C01FCF4F08A954540054247B /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_BIT)"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; GCC_C_LANGUAGE_STANDARD = c99; GCC_WARN_ABOUT_RETURN_TYPE = YES; @@ -365,7 +267,6 @@ C01FCF5008A954540054247B /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_BIT)"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; GCC_C_LANGUAGE_STANDARD = c99; GCC_WARN_ABOUT_RETURN_TYPE = YES; diff --git a/jni/SDL2-2.0.3/Xcode-iOS/Test/TestiPhoneOS.xcodeproj/project.pbxproj b/jni/SDL2-2.0.3/Xcode-iOS/Test/TestiPhoneOS.xcodeproj/project.pbxproj index 0b35c22c..6bcdec04 100755 --- a/jni/SDL2-2.0.3/Xcode-iOS/Test/TestiPhoneOS.xcodeproj/project.pbxproj +++ b/jni/SDL2-2.0.3/Xcode-iOS/Test/TestiPhoneOS.xcodeproj/project.pbxproj @@ -65,6 +65,29 @@ AAE7DFAC14CBB54E00DF1A0E /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FDA8A89D0E2D111A00EA573E /* Foundation.framework */; }; AAE7DFAD14CBB54E00DF1A0E /* CoreAudio.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FDA8A89E0E2D111A00EA573E /* CoreAudio.framework */; }; AAE7DFB514CBB5F700DF1A0E /* testrendertarget.c in Sources */ = {isa = PBXBuildFile; fileRef = AAE7DFB414CBB5F700DF1A0E /* testrendertarget.c */; }; + FA8B4BAD1967076F00F8EB7C /* CoreMotion.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FA8B4BAC1967076F00F8EB7C /* CoreMotion.framework */; }; + FA8B4BC9196766BC00F8EB7C /* CoreMotion.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FA8B4BAC1967076F00F8EB7C /* CoreMotion.framework */; }; + FA8B4BCD196766BF00F8EB7C /* CoreMotion.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FA8B4BAC1967076F00F8EB7C /* CoreMotion.framework */; }; + FA8B4BCE196766C100F8EB7C /* CoreMotion.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FA8B4BAC1967076F00F8EB7C /* CoreMotion.framework */; }; + FA8B4BCF196766C400F8EB7C /* CoreMotion.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FA8B4BAC1967076F00F8EB7C /* CoreMotion.framework */; }; + FA8B4BD0196766C600F8EB7C /* CoreMotion.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FA8B4BAC1967076F00F8EB7C /* CoreMotion.framework */; }; + FA8B4BD1196766C900F8EB7C /* CoreMotion.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FA8B4BAC1967076F00F8EB7C /* CoreMotion.framework */; }; + FA8B4BD2196766CB00F8EB7C /* CoreMotion.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FA8B4BAC1967076F00F8EB7C /* CoreMotion.framework */; }; + FA8B4BD3196766CE00F8EB7C /* CoreMotion.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FA8B4BAC1967076F00F8EB7C /* CoreMotion.framework */; }; + FA8B4BD4196766D100F8EB7C /* CoreMotion.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FA8B4BAC1967076F00F8EB7C /* CoreMotion.framework */; }; + FA8B4BD5196766D400F8EB7C /* CoreMotion.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FA8B4BAC1967076F00F8EB7C /* CoreMotion.framework */; }; + FA8B4BD6196766D700F8EB7C /* CoreMotion.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FA8B4BAC1967076F00F8EB7C /* CoreMotion.framework */; }; + FA8B4BD7196766DA00F8EB7C /* CoreMotion.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FA8B4BAC1967076F00F8EB7C /* CoreMotion.framework */; }; + FA8B4BD8196766DD00F8EB7C /* CoreMotion.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FA8B4BAC1967076F00F8EB7C /* CoreMotion.framework */; }; + FA8B4BD9196766E000F8EB7C /* CoreMotion.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FA8B4BAC1967076F00F8EB7C /* CoreMotion.framework */; }; + FA8B4BDA196766E200F8EB7C /* CoreMotion.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FA8B4BAC1967076F00F8EB7C /* CoreMotion.framework */; }; + FA8B4BDB196766E500F8EB7C /* CoreMotion.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FA8B4BAC1967076F00F8EB7C /* CoreMotion.framework */; }; + FA8B4BDC196766E800F8EB7C /* CoreMotion.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FA8B4BAC1967076F00F8EB7C /* CoreMotion.framework */; }; + FA8B4BDD196766EB00F8EB7C /* CoreMotion.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FA8B4BAC1967076F00F8EB7C /* CoreMotion.framework */; }; + FA8B4BDE196766EE00F8EB7C /* CoreMotion.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FA8B4BAC1967076F00F8EB7C /* CoreMotion.framework */; }; + FA8B4BDF196766F100F8EB7C /* CoreMotion.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FA8B4BAC1967076F00F8EB7C /* CoreMotion.framework */; }; + FA8B4BE0196766F400F8EB7C /* CoreMotion.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FA8B4BAC1967076F00F8EB7C /* CoreMotion.framework */; }; + FA8B4BE1196766F600F8EB7C /* CoreMotion.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FA8B4BAC1967076F00F8EB7C /* CoreMotion.framework */; }; FDA8A79C0E2D0F9300EA573E /* testwm2.c in Sources */ = {isa = PBXBuildFile; fileRef = FDA8A75F0E2D0F1600EA573E /* testwm2.c */; }; FDA8A89F0E2D111A00EA573E /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FDA8A8980E2D111A00EA573E /* AudioToolbox.framework */; }; FDA8A8A00E2D111A00EA573E /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FDA8A8990E2D111A00EA573E /* QuartzCore.framework */; }; @@ -236,13 +259,6 @@ /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ - 0466EE6F11E565E4000198A4 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = FD1B48AC0E3131CA007AB34E /* SDL.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 006E982211955059001DE610; - remoteInfo = testsdl; - }; AA1EE451176059230029C7A5 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = AA1EE44D176059220029C7A5 /* SDL2test.xcodeproj */; @@ -272,6 +288,7 @@ AAE7DF4514CBB43900DF1A0E /* testscale.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = testscale.c; path = ../../test/testscale.c; sourceTree = ""; }; AAE7DFB114CBB54E00DF1A0E /* testrendertarget.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = testrendertarget.app; sourceTree = BUILT_PRODUCTS_DIR; }; AAE7DFB414CBB5F700DF1A0E /* testrendertarget.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = testrendertarget.c; path = ../../test/testrendertarget.c; sourceTree = ""; }; + FA8B4BAC1967076F00F8EB7C /* CoreMotion.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMotion.framework; path = System/Library/Frameworks/CoreMotion.framework; sourceTree = SDKROOT; }; FD1B48AC0E3131CA007AB34E /* SDL.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = SDL.xcodeproj; path = ../SDL/SDL.xcodeproj; sourceTree = SOURCE_ROOT; }; FDA8A7410E2D0F1600EA573E /* testaudioinfo.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = testaudioinfo.c; path = ../../test/testaudioinfo.c; sourceTree = SOURCE_ROOT; }; FDA8A7470E2D0F1600EA573E /* testerror.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = testerror.c; path = ../../test/testerror.c; sourceTree = SOURCE_ROOT; }; @@ -330,6 +347,7 @@ buildActionMask = 2147483647; files = ( 046CEF7B13254F23007AD51D /* libSDL2.a in Frameworks */, + FA8B4BD1196766C900F8EB7C /* CoreMotion.framework in Frameworks */, 046CEF7C13254F23007AD51D /* AudioToolbox.framework in Frameworks */, 046CEF7D13254F23007AD51D /* QuartzCore.framework in Frameworks */, 046CEF7E13254F23007AD51D /* OpenGLES.framework in Frameworks */, @@ -346,6 +364,7 @@ files = ( AA1EE470176059D00029C7A5 /* libSDL2test.a in Frameworks */, 047A63E213285C3200CD7973 /* libSDL2.a in Frameworks */, + FA8B4BAD1967076F00F8EB7C /* CoreMotion.framework in Frameworks */, 047A63E313285C3200CD7973 /* AudioToolbox.framework in Frameworks */, 047A63E413285C3200CD7973 /* QuartzCore.framework in Frameworks */, 047A63E513285C3200CD7973 /* OpenGLES.framework in Frameworks */, @@ -362,6 +381,7 @@ files = ( AA1EE47817605BF60029C7A5 /* libSDL2test.a in Frameworks */, FDBDE5810E313465006BAC0B /* libSDL2.a in Frameworks */, + FA8B4BE0196766F400F8EB7C /* CoreMotion.framework in Frameworks */, FDA8A89F0E2D111A00EA573E /* AudioToolbox.framework in Frameworks */, FDA8A8A00E2D111A00EA573E /* QuartzCore.framework in Frameworks */, FDA8A8A10E2D111A00EA573E /* OpenGLES.framework in Frameworks */, @@ -377,6 +397,7 @@ buildActionMask = 2147483647; files = ( 56ED0502118A8FE400A56AA6 /* libSDL2.a in Frameworks */, + FA8B4BD8196766DD00F8EB7C /* CoreMotion.framework in Frameworks */, 56ED0503118A8FE400A56AA6 /* AudioToolbox.framework in Frameworks */, 56ED0504118A8FE400A56AA6 /* QuartzCore.framework in Frameworks */, 56ED0505118A8FE400A56AA6 /* OpenGLES.framework in Frameworks */, @@ -393,6 +414,7 @@ files = ( AA1EE47617605B9E0029C7A5 /* libSDL2test.a in Frameworks */, AAE7DEE114CBB1E100DF1A0E /* libSDL2.a in Frameworks */, + FA8B4BDA196766E200F8EB7C /* CoreMotion.framework in Frameworks */, AAE7DEE214CBB1E100DF1A0E /* AudioToolbox.framework in Frameworks */, AAE7DEE314CBB1E100DF1A0E /* QuartzCore.framework in Frameworks */, AAE7DEE414CBB1E100DF1A0E /* OpenGLES.framework in Frameworks */, @@ -409,6 +431,7 @@ files = ( AA1EE47517605B930029C7A5 /* libSDL2test.a in Frameworks */, AAE7DFA614CBB54E00DF1A0E /* libSDL2.a in Frameworks */, + FA8B4BD9196766E000F8EB7C /* CoreMotion.framework in Frameworks */, AAE7DFA714CBB54E00DF1A0E /* AudioToolbox.framework in Frameworks */, AAE7DFA814CBB54E00DF1A0E /* QuartzCore.framework in Frameworks */, AAE7DFA914CBB54E00DF1A0E /* OpenGLES.framework in Frameworks */, @@ -424,6 +447,7 @@ buildActionMask = 2147483647; files = ( FDBDE5850E313495006BAC0B /* libSDL2.a in Frameworks */, + FA8B4BC9196766BC00F8EB7C /* CoreMotion.framework in Frameworks */, FDA8AAB10E2D330F00EA573E /* AudioToolbox.framework in Frameworks */, FDA8AAB20E2D330F00EA573E /* QuartzCore.framework in Frameworks */, FDA8AAB30E2D330F00EA573E /* OpenGLES.framework in Frameworks */, @@ -439,6 +463,7 @@ buildActionMask = 2147483647; files = ( FDBDE58C0E3134F3006BAC0B /* libSDL2.a in Frameworks */, + FA8B4BCD196766BF00F8EB7C /* CoreMotion.framework in Frameworks */, FDAAC3C30E2D47E6001DB1D8 /* AudioToolbox.framework in Frameworks */, FDAAC3C40E2D47E6001DB1D8 /* QuartzCore.framework in Frameworks */, FDAAC3C50E2D47E6001DB1D8 /* OpenGLES.framework in Frameworks */, @@ -454,6 +479,7 @@ buildActionMask = 2147483647; files = ( FDBDE59B0E31356A006BAC0B /* libSDL2.a in Frameworks */, + FA8B4BCF196766C400F8EB7C /* CoreMotion.framework in Frameworks */, FDAAC5910E2D5429001DB1D8 /* AudioToolbox.framework in Frameworks */, FDAAC5920E2D5429001DB1D8 /* QuartzCore.framework in Frameworks */, FDAAC5930E2D5429001DB1D8 /* OpenGLES.framework in Frameworks */, @@ -469,6 +495,7 @@ buildActionMask = 2147483647; files = ( FDBDE59F0E31358D006BAC0B /* libSDL2.a in Frameworks */, + FA8B4BD0196766C600F8EB7C /* CoreMotion.framework in Frameworks */, FDAAC5BF0E2D55B5001DB1D8 /* AudioToolbox.framework in Frameworks */, FDAAC5C00E2D55B5001DB1D8 /* QuartzCore.framework in Frameworks */, FDAAC5C10E2D55B5001DB1D8 /* OpenGLES.framework in Frameworks */, @@ -485,6 +512,7 @@ files = ( AA1EE47417605B5C0029C7A5 /* libSDL2test.a in Frameworks */, FDBDE57C0E313445006BAC0B /* libSDL2.a in Frameworks */, + FA8B4BD2196766CB00F8EB7C /* CoreMotion.framework in Frameworks */, FDAAC61C0E2D5914001DB1D8 /* AudioToolbox.framework in Frameworks */, FDAAC61D0E2D5914001DB1D8 /* QuartzCore.framework in Frameworks */, FDAAC61E0E2D5914001DB1D8 /* OpenGLES.framework in Frameworks */, @@ -501,6 +529,7 @@ files = ( AA1EE47117605A7F0029C7A5 /* libSDL2test.a in Frameworks */, FDC42FF40F0D866D009C87E1 /* libSDL2.a in Frameworks */, + FA8B4BCE196766C100F8EB7C /* CoreMotion.framework in Frameworks */, FDC42FF60F0D866D009C87E1 /* AudioToolbox.framework in Frameworks */, FDC42FF70F0D866D009C87E1 /* QuartzCore.framework in Frameworks */, FDC42FF80F0D866D009C87E1 /* OpenGLES.framework in Frameworks */, @@ -516,6 +545,7 @@ buildActionMask = 2147483647; files = ( FDBDE5A90E3135C0006BAC0B /* libSDL2.a in Frameworks */, + FA8B4BDD196766EB00F8EB7C /* CoreMotion.framework in Frameworks */, FDD2C1000E2E4F4B00B7A85F /* AudioToolbox.framework in Frameworks */, FDD2C1010E2E4F4B00B7A85F /* QuartzCore.framework in Frameworks */, FDD2C1020E2E4F4B00B7A85F /* OpenGLES.framework in Frameworks */, @@ -531,6 +561,7 @@ buildActionMask = 2147483647; files = ( FDBDE5AE0E3135E6006BAC0B /* libSDL2.a in Frameworks */, + FA8B4BD3196766CE00F8EB7C /* CoreMotion.framework in Frameworks */, FDD2C1770E2E52C000B7A85F /* AudioToolbox.framework in Frameworks */, FDD2C1780E2E52C000B7A85F /* QuartzCore.framework in Frameworks */, FDD2C1790E2E52C000B7A85F /* OpenGLES.framework in Frameworks */, @@ -546,6 +577,7 @@ buildActionMask = 2147483647; files = ( FDBDE5B60E3135FE006BAC0B /* libSDL2.a in Frameworks */, + FA8B4BD4196766D100F8EB7C /* CoreMotion.framework in Frameworks */, FDD2C19B0E2E534F00B7A85F /* AudioToolbox.framework in Frameworks */, FDD2C19C0E2E534F00B7A85F /* QuartzCore.framework in Frameworks */, FDD2C19D0E2E534F00B7A85F /* OpenGLES.framework in Frameworks */, @@ -561,6 +593,7 @@ buildActionMask = 2147483647; files = ( FDBDE5BC0E31364D006BAC0B /* libSDL2.a in Frameworks */, + FA8B4BD5196766D400F8EB7C /* CoreMotion.framework in Frameworks */, FDD2C4540E2E773800B7A85F /* AudioToolbox.framework in Frameworks */, FDD2C4550E2E773800B7A85F /* QuartzCore.framework in Frameworks */, FDD2C4560E2E773800B7A85F /* OpenGLES.framework in Frameworks */, @@ -576,6 +609,7 @@ buildActionMask = 2147483647; files = ( FDBDE5C20E313663006BAC0B /* libSDL2.a in Frameworks */, + FA8B4BD6196766D700F8EB7C /* CoreMotion.framework in Frameworks */, FDD2C4720E2E77D700B7A85F /* AudioToolbox.framework in Frameworks */, FDD2C4730E2E77D700B7A85F /* QuartzCore.framework in Frameworks */, FDD2C4740E2E77D700B7A85F /* OpenGLES.framework in Frameworks */, @@ -591,6 +625,7 @@ buildActionMask = 2147483647; files = ( FDBDE5C60E3136F1006BAC0B /* libSDL2.a in Frameworks */, + FA8B4BD7196766DA00F8EB7C /* CoreMotion.framework in Frameworks */, FDD2C5010E2E7F4800B7A85F /* AudioToolbox.framework in Frameworks */, FDD2C5020E2E7F4800B7A85F /* QuartzCore.framework in Frameworks */, FDD2C5030E2E7F4800B7A85F /* OpenGLES.framework in Frameworks */, @@ -606,6 +641,7 @@ buildActionMask = 2147483647; files = ( FDBDE5C80E313702006BAC0B /* libSDL2.a in Frameworks */, + FA8B4BDB196766E500F8EB7C /* CoreMotion.framework in Frameworks */, FDD2C51F0E2E807600B7A85F /* AudioToolbox.framework in Frameworks */, FDD2C5200E2E807600B7A85F /* QuartzCore.framework in Frameworks */, FDD2C5210E2E807600B7A85F /* OpenGLES.framework in Frameworks */, @@ -622,6 +658,7 @@ files = ( AA1EE47717605BAB0029C7A5 /* libSDL2test.a in Frameworks */, FDBDE5CA0E313712006BAC0B /* libSDL2.a in Frameworks */, + FA8B4BDC196766E800F8EB7C /* CoreMotion.framework in Frameworks */, FDD2C5440E2E80E400B7A85F /* AudioToolbox.framework in Frameworks */, FDD2C5450E2E80E400B7A85F /* QuartzCore.framework in Frameworks */, FDD2C5460E2E80E400B7A85F /* OpenGLES.framework in Frameworks */, @@ -637,6 +674,7 @@ buildActionMask = 2147483647; files = ( FDBDE5CC0E31372B006BAC0B /* libSDL2.a in Frameworks */, + FA8B4BDE196766EE00F8EB7C /* CoreMotion.framework in Frameworks */, FDD2C57D0E2E8C7400B7A85F /* AudioToolbox.framework in Frameworks */, FDD2C57E0E2E8C7400B7A85F /* QuartzCore.framework in Frameworks */, FDD2C57F0E2E8C7400B7A85F /* OpenGLES.framework in Frameworks */, @@ -652,6 +690,7 @@ buildActionMask = 2147483647; files = ( FDBDE5CE0E31373E006BAC0B /* libSDL2.a in Frameworks */, + FA8B4BDF196766F100F8EB7C /* CoreMotion.framework in Frameworks */, FDD2C5BB0E2E8CFC00B7A85F /* AudioToolbox.framework in Frameworks */, FDD2C5BC0E2E8CFC00B7A85F /* QuartzCore.framework in Frameworks */, FDD2C5BD0E2E8CFC00B7A85F /* OpenGLES.framework in Frameworks */, @@ -667,6 +706,7 @@ buildActionMask = 2147483647; files = ( FDBDE5D40E313789006BAC0B /* libSDL2.a in Frameworks */, + FA8B4BE1196766F600F8EB7C /* CoreMotion.framework in Frameworks */, FDD2C6EA0E2E959E00B7A85F /* AudioToolbox.framework in Frameworks */, FDD2C6EB0E2E959E00B7A85F /* QuartzCore.framework in Frameworks */, FDD2C6EC0E2E959E00B7A85F /* OpenGLES.framework in Frameworks */, @@ -735,7 +775,6 @@ isa = PBXGroup; children = ( FD1B48B80E3131CA007AB34E /* libSDL2.a */, - 0466EE7011E565E4000198A4 /* testsdl.app */, ); name = Products; sourceTree = ""; @@ -774,6 +813,7 @@ FDA8A7C30E2D10FA00EA573E /* Linked Frameworks */ = { isa = PBXGroup; children = ( + FA8B4BAC1967076F00F8EB7C /* CoreMotion.framework */, FDA8A8980E2D111A00EA573E /* AudioToolbox.framework */, FDA8A8990E2D111A00EA573E /* QuartzCore.framework */, FDA8A89A0E2D111A00EA573E /* OpenGLES.framework */, @@ -1252,13 +1292,6 @@ /* End PBXProject section */ /* Begin PBXReferenceProxy section */ - 0466EE7011E565E4000198A4 /* testsdl.app */ = { - isa = PBXReferenceProxy; - fileType = wrapper.application; - path = testsdl.app; - remoteRef = 0466EE6F11E565E4000198A4 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; AA1EE452176059230029C7A5 /* libSDL2test.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; @@ -1738,14 +1771,9 @@ C01FCF4F08A954540054247B /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = ( - armv7, - armv6, - ); "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; GCC_OPTIMIZATION_LEVEL = 0; HEADER_SEARCH_PATHS = ../../include; - IPHONEOS_DEPLOYMENT_TARGET = 3.1.3; OTHER_LDFLAGS = "-ObjC"; "PROVISIONING_PROFILE[sdk=iphoneos*]" = ""; SDKROOT = iphoneos; @@ -1756,13 +1784,8 @@ C01FCF5008A954540054247B /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = ( - armv7, - armv6, - ); "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; HEADER_SEARCH_PATHS = ../../include; - IPHONEOS_DEPLOYMENT_TARGET = 3.1.3; OTHER_LDFLAGS = "-ObjC"; "PROVISIONING_PROFILE[sdk=iphoneos*]" = ""; SDKROOT = iphoneos; diff --git a/jni/SDL2-2.0.3/Xcode/SDL/Info-Framework.plist b/jni/SDL2-2.0.3/Xcode/SDL/Info-Framework.plist index fa55492b..bccaa8af 100644 --- a/jni/SDL2-2.0.3/Xcode/SDL/Info-Framework.plist +++ b/jni/SDL2-2.0.3/Xcode/SDL/Info-Framework.plist @@ -19,10 +19,10 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 2.0.3 + 2.0.4 CFBundleSignature SDLX CFBundleVersion - 2.0.3 + 2.0.4 diff --git a/jni/SDL2-2.0.3/Xcode/SDL/SDL.xcodeproj/project.pbxproj b/jni/SDL2-2.0.3/Xcode/SDL/SDL.xcodeproj/project.pbxproj index 61797524..6c618b4e 100755 --- a/jni/SDL2-2.0.3/Xcode/SDL/SDL.xcodeproj/project.pbxproj +++ b/jni/SDL2-2.0.3/Xcode/SDL/SDL.xcodeproj/project.pbxproj @@ -12,13 +12,11 @@ 007317A40858DECD00B2BC32 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0073179D0858DECD00B2BC32 /* Cocoa.framework */; }; 007317A50858DECD00B2BC32 /* CoreAudio.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0073179E0858DECD00B2BC32 /* CoreAudio.framework */; }; 007317A60858DECD00B2BC32 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0073179F0858DECD00B2BC32 /* IOKit.framework */; }; - 007317A70858DECD00B2BC32 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 007317A00858DECD00B2BC32 /* OpenGL.framework */; }; 007317A90858DECD00B2BC32 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0073179B0858DECD00B2BC32 /* AudioToolbox.framework */; }; 007317AA0858DECD00B2BC32 /* AudioUnit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0073179C0858DECD00B2BC32 /* AudioUnit.framework */; }; 007317AB0858DECD00B2BC32 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0073179D0858DECD00B2BC32 /* Cocoa.framework */; }; 007317AC0858DECD00B2BC32 /* CoreAudio.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0073179E0858DECD00B2BC32 /* CoreAudio.framework */; }; 007317AD0858DECD00B2BC32 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0073179F0858DECD00B2BC32 /* IOKit.framework */; }; - 007317AE0858DECD00B2BC32 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 007317A00858DECD00B2BC32 /* OpenGL.framework */; }; 007317C30858E15000B2BC32 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 007317C10858E15000B2BC32 /* Carbon.framework */; }; 00CFA89D106B4BA100758660 /* ForceFeedback.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 00CFA89C106B4BA100758660 /* ForceFeedback.framework */; }; 00D0D08410675DD9004B05EF /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 00D0D08310675DD9004B05EF /* CoreFoundation.framework */; }; @@ -530,6 +528,21 @@ AABCC38E164063D200AB8930 /* SDL_cocoamessagebox.h in Headers */ = {isa = PBXBuildFile; fileRef = AABCC38B164063D200AB8930 /* SDL_cocoamessagebox.h */; }; AABCC38F164063D200AB8930 /* SDL_cocoamessagebox.m in Sources */ = {isa = PBXBuildFile; fileRef = AABCC38C164063D200AB8930 /* SDL_cocoamessagebox.m */; }; AABCC390164063D200AB8930 /* SDL_cocoamessagebox.m in Sources */ = {isa = PBXBuildFile; fileRef = AABCC38C164063D200AB8930 /* SDL_cocoamessagebox.m */; }; + AAC070F9195606770073DCDF /* SDL_opengl_glext.h in Headers */ = {isa = PBXBuildFile; fileRef = AAC070F4195606770073DCDF /* SDL_opengl_glext.h */; settings = {ATTRIBUTES = (Public, ); }; }; + AAC070FA195606770073DCDF /* SDL_opengl_glext.h in Headers */ = {isa = PBXBuildFile; fileRef = AAC070F4195606770073DCDF /* SDL_opengl_glext.h */; settings = {ATTRIBUTES = (Public, ); }; }; + AAC070FB195606770073DCDF /* SDL_opengl_glext.h in Headers */ = {isa = PBXBuildFile; fileRef = AAC070F4195606770073DCDF /* SDL_opengl_glext.h */; settings = {ATTRIBUTES = (Public, ); }; }; + AAC070FC195606770073DCDF /* SDL_opengles2_gl2.h in Headers */ = {isa = PBXBuildFile; fileRef = AAC070F5195606770073DCDF /* SDL_opengles2_gl2.h */; settings = {ATTRIBUTES = (Public, ); }; }; + AAC070FD195606770073DCDF /* SDL_opengles2_gl2.h in Headers */ = {isa = PBXBuildFile; fileRef = AAC070F5195606770073DCDF /* SDL_opengles2_gl2.h */; settings = {ATTRIBUTES = (Public, ); }; }; + AAC070FE195606770073DCDF /* SDL_opengles2_gl2.h in Headers */ = {isa = PBXBuildFile; fileRef = AAC070F5195606770073DCDF /* SDL_opengles2_gl2.h */; settings = {ATTRIBUTES = (Public, ); }; }; + AAC070FF195606770073DCDF /* SDL_opengles2_gl2ext.h in Headers */ = {isa = PBXBuildFile; fileRef = AAC070F6195606770073DCDF /* SDL_opengles2_gl2ext.h */; settings = {ATTRIBUTES = (Public, ); }; }; + AAC07100195606770073DCDF /* SDL_opengles2_gl2ext.h in Headers */ = {isa = PBXBuildFile; fileRef = AAC070F6195606770073DCDF /* SDL_opengles2_gl2ext.h */; settings = {ATTRIBUTES = (Public, ); }; }; + AAC07101195606770073DCDF /* SDL_opengles2_gl2ext.h in Headers */ = {isa = PBXBuildFile; fileRef = AAC070F6195606770073DCDF /* SDL_opengles2_gl2ext.h */; settings = {ATTRIBUTES = (Public, ); }; }; + AAC07102195606770073DCDF /* SDL_opengles2_gl2platform.h in Headers */ = {isa = PBXBuildFile; fileRef = AAC070F7195606770073DCDF /* SDL_opengles2_gl2platform.h */; settings = {ATTRIBUTES = (Public, ); }; }; + AAC07103195606770073DCDF /* SDL_opengles2_gl2platform.h in Headers */ = {isa = PBXBuildFile; fileRef = AAC070F7195606770073DCDF /* SDL_opengles2_gl2platform.h */; settings = {ATTRIBUTES = (Public, ); }; }; + AAC07104195606770073DCDF /* SDL_opengles2_gl2platform.h in Headers */ = {isa = PBXBuildFile; fileRef = AAC070F7195606770073DCDF /* SDL_opengles2_gl2platform.h */; settings = {ATTRIBUTES = (Public, ); }; }; + AAC07105195606770073DCDF /* SDL_opengles2_khrplatform.h in Headers */ = {isa = PBXBuildFile; fileRef = AAC070F8195606770073DCDF /* SDL_opengles2_khrplatform.h */; settings = {ATTRIBUTES = (Public, ); }; }; + AAC07106195606770073DCDF /* SDL_opengles2_khrplatform.h in Headers */ = {isa = PBXBuildFile; fileRef = AAC070F8195606770073DCDF /* SDL_opengles2_khrplatform.h */; settings = {ATTRIBUTES = (Public, ); }; }; + AAC07107195606770073DCDF /* SDL_opengles2_khrplatform.h in Headers */ = {isa = PBXBuildFile; fileRef = AAC070F8195606770073DCDF /* SDL_opengles2_khrplatform.h */; settings = {ATTRIBUTES = (Public, ); }; }; AADA5B8716CCAB3000107CF7 /* SDL_bits.h in Headers */ = {isa = PBXBuildFile; fileRef = AADA5B8616CCAB3000107CF7 /* SDL_bits.h */; settings = {ATTRIBUTES = (Public, ); }; }; AADA5B8816CCAB3000107CF7 /* SDL_bits.h in Headers */ = {isa = PBXBuildFile; fileRef = AADA5B8616CCAB3000107CF7 /* SDL_bits.h */; settings = {ATTRIBUTES = (Public, ); }; }; BBFC088D164C6647003E6A99 /* SDL_gamecontroller.c in Sources */ = {isa = PBXBuildFile; fileRef = BBFC088A164C6514003E6A99 /* SDL_gamecontroller.c */; }; @@ -794,10 +807,12 @@ DB31406E17554B71006C0E22 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0073179D0858DECD00B2BC32 /* Cocoa.framework */; }; DB31406F17554B71006C0E22 /* CoreAudio.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0073179E0858DECD00B2BC32 /* CoreAudio.framework */; }; DB31407017554B71006C0E22 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0073179F0858DECD00B2BC32 /* IOKit.framework */; }; - DB31407117554B71006C0E22 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 007317A00858DECD00B2BC32 /* OpenGL.framework */; }; DB31407217554B71006C0E22 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 007317C10858E15000B2BC32 /* Carbon.framework */; }; DB31408B17554D37006C0E22 /* ForceFeedback.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 00CFA89C106B4BA100758660 /* ForceFeedback.framework */; }; DB31408D17554D3C006C0E22 /* ForceFeedback.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 00CFA89C106B4BA100758660 /* ForceFeedback.framework */; }; + FA73671D19A540EF004122E4 /* CoreVideo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FA73671C19A540EF004122E4 /* CoreVideo.framework */; }; + FA73671E19A54140004122E4 /* CoreVideo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FA73671C19A540EF004122E4 /* CoreVideo.framework */; }; + FA73671F19A54144004122E4 /* CoreVideo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FA73671C19A540EF004122E4 /* CoreVideo.framework */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -816,10 +831,8 @@ 0073179D0858DECD00B2BC32 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = ""; }; 0073179E0858DECD00B2BC32 /* CoreAudio.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreAudio.framework; path = /System/Library/Frameworks/CoreAudio.framework; sourceTree = ""; }; 0073179F0858DECD00B2BC32 /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = /System/Library/Frameworks/IOKit.framework; sourceTree = ""; }; - 007317A00858DECD00B2BC32 /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = /System/Library/Frameworks/OpenGL.framework; sourceTree = ""; }; 007317C10858E15000B2BC32 /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = /System/Library/Frameworks/Carbon.framework; sourceTree = ""; }; 00794D3F09D0C461003FC8A1 /* License.txt */ = {isa = PBXFileReference; lastKnownFileType = text; path = License.txt; sourceTree = ""; }; - 00AE6E1E08B958CC00255E2F /* ReadMeDevLite.txt */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = ReadMeDevLite.txt; sourceTree = ""; }; 00CFA89C106B4BA100758660 /* ForceFeedback.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ForceFeedback.framework; path = /System/Library/Frameworks/ForceFeedback.framework; sourceTree = ""; }; 00D0D08310675DD9004B05EF /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = /System/Library/Frameworks/CoreFoundation.framework; sourceTree = ""; }; 04043BBA12FEB1BE0076DB1F /* SDL_glfuncs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_glfuncs.h; sourceTree = ""; }; @@ -1074,6 +1087,11 @@ AA9FF9591637CBF9000DF050 /* SDL_messagebox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_messagebox.h; sourceTree = ""; }; AABCC38B164063D200AB8930 /* SDL_cocoamessagebox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_cocoamessagebox.h; sourceTree = ""; }; AABCC38C164063D200AB8930 /* SDL_cocoamessagebox.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDL_cocoamessagebox.m; sourceTree = ""; }; + AAC070F4195606770073DCDF /* SDL_opengl_glext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_opengl_glext.h; sourceTree = ""; }; + AAC070F5195606770073DCDF /* SDL_opengles2_gl2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_opengles2_gl2.h; sourceTree = ""; }; + AAC070F6195606770073DCDF /* SDL_opengles2_gl2ext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_opengles2_gl2ext.h; sourceTree = ""; }; + AAC070F7195606770073DCDF /* SDL_opengles2_gl2platform.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_opengles2_gl2platform.h; sourceTree = ""; }; + AAC070F8195606770073DCDF /* SDL_opengles2_khrplatform.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_opengles2_khrplatform.h; sourceTree = ""; }; AADA5B8616CCAB3000107CF7 /* SDL_bits.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_bits.h; sourceTree = ""; }; BBFC088A164C6514003E6A99 /* SDL_gamecontroller.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_gamecontroller.c; sourceTree = ""; }; BECDF66B0761BA81005FE872 /* Info-Framework.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Info-Framework.plist"; sourceTree = ""; }; @@ -1084,15 +1102,10 @@ D55A1B80179F262300625D7C /* SDL_cocoamousetap.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDL_cocoamousetap.m; sourceTree = ""; }; DB31407717554B71006C0E22 /* libSDL2.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = libSDL2.dylib; sourceTree = BUILT_PRODUCTS_DIR; }; DB89958518A1A5C50092407C /* SDL_syshaptic_c.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDL_syshaptic_c.h; sourceTree = ""; }; - F59C70FF00D5CB5801000001 /* ReadMe.txt */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = ReadMe.txt; sourceTree = ""; }; - F59C710000D5CB5801000001 /* Welcome.txt */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = Welcome.txt; sourceTree = ""; }; F59C710300D5CB5801000001 /* ReadMe.txt */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = ReadMe.txt; sourceTree = ""; }; - F59C710500D5CB5801000001 /* SDL-devel.info */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = "SDL-devel.info"; sourceTree = ""; }; F59C710600D5CB5801000001 /* SDL.info */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = SDL.info; sourceTree = ""; }; - F59C710C00D5D15801000001 /* install.sh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.script.sh; path = install.sh; sourceTree = ""; }; F5A2EF3900C6A39A01000001 /* BUGS.txt */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; name = BUGS.txt; path = ../../BUGS.txt; sourceTree = SOURCE_ROOT; }; - F5A2EF3A00C6A3C201000001 /* README-macosx.txt */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; name = "README-macosx.txt"; path = "../../README-macosx.txt"; sourceTree = SOURCE_ROOT; }; - F5F81AD400D706B101000001 /* Readme SDL Developer.txt */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; name = "Readme SDL Developer.txt"; path = "pkg-support/Readme SDL Developer.txt"; sourceTree = SOURCE_ROOT; }; + FA73671C19A540EF004122E4 /* CoreVideo.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreVideo.framework; path = /System/Library/Frameworks/CoreVideo.framework; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -1100,12 +1113,12 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + FA73671D19A540EF004122E4 /* CoreVideo.framework in Frameworks */, 007317A20858DECD00B2BC32 /* AudioToolbox.framework in Frameworks */, 007317A30858DECD00B2BC32 /* AudioUnit.framework in Frameworks */, 007317A40858DECD00B2BC32 /* Cocoa.framework in Frameworks */, 007317A50858DECD00B2BC32 /* CoreAudio.framework in Frameworks */, 007317A60858DECD00B2BC32 /* IOKit.framework in Frameworks */, - 007317A70858DECD00B2BC32 /* OpenGL.framework in Frameworks */, 00D0D08410675DD9004B05EF /* CoreFoundation.framework in Frameworks */, 00D0D0D810675E46004B05EF /* Carbon.framework in Frameworks */, 00CFA89D106B4BA100758660 /* ForceFeedback.framework in Frameworks */, @@ -1116,12 +1129,12 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + FA73671E19A54140004122E4 /* CoreVideo.framework in Frameworks */, 007317A90858DECD00B2BC32 /* AudioToolbox.framework in Frameworks */, 007317AA0858DECD00B2BC32 /* AudioUnit.framework in Frameworks */, 007317AB0858DECD00B2BC32 /* Cocoa.framework in Frameworks */, 007317AC0858DECD00B2BC32 /* CoreAudio.framework in Frameworks */, 007317AD0858DECD00B2BC32 /* IOKit.framework in Frameworks */, - 007317AE0858DECD00B2BC32 /* OpenGL.framework in Frameworks */, 007317C30858E15000B2BC32 /* Carbon.framework in Frameworks */, DB31408B17554D37006C0E22 /* ForceFeedback.framework in Frameworks */, ); @@ -1131,12 +1144,12 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + FA73671F19A54144004122E4 /* CoreVideo.framework in Frameworks */, DB31406C17554B71006C0E22 /* AudioToolbox.framework in Frameworks */, DB31406D17554B71006C0E22 /* AudioUnit.framework in Frameworks */, DB31406E17554B71006C0E22 /* Cocoa.framework in Frameworks */, DB31406F17554B71006C0E22 /* CoreAudio.framework in Frameworks */, DB31407017554B71006C0E22 /* IOKit.framework in Frameworks */, - DB31407117554B71006C0E22 /* OpenGL.framework in Frameworks */, DB31407217554B71006C0E22 /* Carbon.framework in Frameworks */, DB31408D17554D3C006C0E22 /* ForceFeedback.framework in Frameworks */, ); @@ -1180,8 +1193,13 @@ AA7557E01595D4D800BBD41B /* SDL_mutex.h */, AA7557E11595D4D800BBD41B /* SDL_name.h */, AA7557E21595D4D800BBD41B /* SDL_opengl.h */, + AAC070F4195606770073DCDF /* SDL_opengl_glext.h */, AA7557E31595D4D800BBD41B /* SDL_opengles.h */, AA7557E41595D4D800BBD41B /* SDL_opengles2.h */, + AAC070F5195606770073DCDF /* SDL_opengles2_gl2.h */, + AAC070F6195606770073DCDF /* SDL_opengles2_gl2ext.h */, + AAC070F7195606770073DCDF /* SDL_opengles2_gl2platform.h */, + AAC070F8195606770073DCDF /* SDL_opengles2_khrplatform.h */, AA7557E51595D4D800BBD41B /* SDL_pixels.h */, AA7557E61595D4D800BBD41B /* SDL_platform.h */, AA7557E71595D4D800BBD41B /* SDL_power.h */, @@ -1645,7 +1663,6 @@ isa = PBXGroup; children = ( F5A2EF3900C6A39A01000001 /* BUGS.txt */, - F5A2EF3A00C6A3C201000001 /* README-macosx.txt */, F59C70FC00D5CB5801000001 /* pkg-support */, 0153844A006D81B07F000001 /* Public Headers */, 08FB77ACFE841707C02AAC07 /* Library Source */, @@ -1720,6 +1737,7 @@ BEC562FE0761C0E800A33029 /* Linked Frameworks */ = { isa = PBXGroup; children = ( + FA73671C19A540EF004122E4 /* CoreVideo.framework */, 00D0D08310675DD9004B05EF /* CoreFoundation.framework */, 007317C10858E15000B2BC32 /* Carbon.framework */, 0073179B0858DECD00B2BC32 /* AudioToolbox.framework */, @@ -1727,7 +1745,6 @@ 0073179D0858DECD00B2BC32 /* Cocoa.framework */, 0073179E0858DECD00B2BC32 /* CoreAudio.framework */, 0073179F0858DECD00B2BC32 /* IOKit.framework */, - 007317A00858DECD00B2BC32 /* OpenGL.framework */, 00CFA89C106B4BA100758660 /* ForceFeedback.framework */, ); name = "Linked Frameworks"; @@ -1736,30 +1753,16 @@ F59C70FC00D5CB5801000001 /* pkg-support */ = { isa = PBXGroup; children = ( - F59C70FE00D5CB5801000001 /* devel-resources */, F59C710100D5CB5801000001 /* resources */, - F5F81AD400D706B101000001 /* Readme SDL Developer.txt */, - F59C710500D5CB5801000001 /* SDL-devel.info */, F59C710600D5CB5801000001 /* SDL.info */, ); path = "pkg-support"; sourceTree = SOURCE_ROOT; }; - F59C70FE00D5CB5801000001 /* devel-resources */ = { - isa = PBXGroup; - children = ( - F59C710C00D5D15801000001 /* install.sh */, - F59C70FF00D5CB5801000001 /* ReadMe.txt */, - F59C710000D5CB5801000001 /* Welcome.txt */, - ); - path = "devel-resources"; - sourceTree = ""; - }; F59C710100D5CB5801000001 /* resources */ = { isa = PBXGroup; children = ( 00794D3F09D0C461003FC8A1 /* License.txt */, - 00AE6E1E08B958CC00255E2F /* ReadMeDevLite.txt */, F59C710300D5CB5801000001 /* ReadMe.txt */, ); path = resources; @@ -1774,6 +1777,7 @@ files = ( AA7557FA1595D4D800BBD41B /* begin_code.h in Headers */, AA7557FC1595D4D800BBD41B /* close_code.h in Headers */, + AA75585E1595D4D800BBD41B /* SDL.h in Headers */, AA7557FE1595D4D800BBD41B /* SDL_assert.h in Headers */, AA7558001595D4D800BBD41B /* SDL_atomic.h in Headers */, AA7558021595D4D800BBD41B /* SDL_audio.h in Headers */, @@ -1804,8 +1808,13 @@ AA75582C1595D4D800BBD41B /* SDL_mutex.h in Headers */, AA75582E1595D4D800BBD41B /* SDL_name.h in Headers */, AA7558301595D4D800BBD41B /* SDL_opengl.h in Headers */, + AAC070F9195606770073DCDF /* SDL_opengl_glext.h in Headers */, AA7558321595D4D800BBD41B /* SDL_opengles.h in Headers */, AA7558341595D4D800BBD41B /* SDL_opengles2.h in Headers */, + AAC070FC195606770073DCDF /* SDL_opengles2_gl2.h in Headers */, + AAC070FF195606770073DCDF /* SDL_opengles2_gl2ext.h in Headers */, + AAC07102195606770073DCDF /* SDL_opengles2_gl2platform.h in Headers */, + AAC07105195606770073DCDF /* SDL_opengles2_khrplatform.h in Headers */, AA7558361595D4D800BBD41B /* SDL_pixels.h in Headers */, AA7558381595D4D800BBD41B /* SDL_platform.h in Headers */, AA75583A1595D4D800BBD41B /* SDL_power.h in Headers */, @@ -1826,7 +1835,6 @@ AA7558581595D4D800BBD41B /* SDL_types.h in Headers */, AA75585A1595D4D800BBD41B /* SDL_version.h in Headers */, AA75585C1595D4D800BBD41B /* SDL_video.h in Headers */, - AA75585E1595D4D800BBD41B /* SDL.h in Headers */, 04BD000912E6671800899322 /* SDL_diskaudio.h in Headers */, 04BD001112E6671800899322 /* SDL_dummyaudio.h in Headers */, 04BD001912E6671800899322 /* SDL_coreaudio.h in Headers */, @@ -1950,6 +1958,7 @@ AA7558251595D4D800BBD41B /* SDL_loadso.h in Headers */, AA7558271595D4D800BBD41B /* SDL_log.h in Headers */, AA7558291595D4D800BBD41B /* SDL_main.h in Headers */, + AAC07106195606770073DCDF /* SDL_opengles2_khrplatform.h in Headers */, DB0F489417C400ED008798C5 /* SDL_messagebox.h in Headers */, AA75582B1595D4D800BBD41B /* SDL_mouse.h in Headers */, AA75582D1595D4D800BBD41B /* SDL_mutex.h in Headers */, @@ -1973,6 +1982,7 @@ AA75584D1595D4D800BBD41B /* SDL_surface.h in Headers */, AA75584F1595D4D800BBD41B /* SDL_system.h in Headers */, AA7558511595D4D800BBD41B /* SDL_syswm.h in Headers */, + AAC070FA195606770073DCDF /* SDL_opengl_glext.h in Headers */, AA7558531595D4D800BBD41B /* SDL_thread.h in Headers */, AA7558551595D4D800BBD41B /* SDL_timer.h in Headers */, AA7558571595D4D800BBD41B /* SDL_touch.h in Headers */, @@ -1985,6 +1995,7 @@ 04BD023512E6671800899322 /* SDL_coreaudio.h in Headers */, 04BD024312E6671800899322 /* SDL_audio_c.h in Headers */, 04BD024612E6671800899322 /* SDL_audiodev_c.h in Headers */, + AAC070FD195606770073DCDF /* SDL_opengles2_gl2.h in Headers */, 04BD024712E6671800899322 /* SDL_audiomem.h in Headers */, 04BD025012E6671800899322 /* SDL_sysaudio.h in Headers */, 04BD025212E6671800899322 /* SDL_wave.h in Headers */, @@ -2022,6 +2033,7 @@ 04BD031512E6671800899322 /* SDL_cocoamouse.h in Headers */, 04BD031712E6671800899322 /* SDL_cocoaopengl.h in Headers */, 04BD031912E6671800899322 /* SDL_cocoashape.h in Headers */, + AAC07103195606770073DCDF /* SDL_opengles2_gl2platform.h in Headers */, 04BD031B12E6671800899322 /* SDL_cocoavideo.h in Headers */, 04BD031D12E6671800899322 /* SDL_cocoawindow.h in Headers */, 04BD033212E6671800899322 /* SDL_nullevents_c.h in Headers */, @@ -2047,6 +2059,7 @@ 04BD040B12E6671800899322 /* SDL_x11sym.h in Headers */, 04BD040D12E6671800899322 /* SDL_x11touch.h in Headers */, 04BD040F12E6671800899322 /* SDL_x11video.h in Headers */, + AAC07100195606770073DCDF /* SDL_opengles2_gl2ext.h in Headers */, 04BD041112E6671800899322 /* SDL_x11window.h in Headers */, 041B2CAC12FA0D680087D585 /* SDL_sysrender.h in Headers */, 04409B9512FA97ED00FB9AA8 /* mmx.h in Headers */, @@ -2100,6 +2113,7 @@ DB313FDC17554B71006C0E22 /* SDL_loadso.h in Headers */, DB313FDD17554B71006C0E22 /* SDL_log.h in Headers */, DB313FDE17554B71006C0E22 /* SDL_main.h in Headers */, + AAC07107195606770073DCDF /* SDL_opengles2_khrplatform.h in Headers */, DB0F489317C400E6008798C5 /* SDL_messagebox.h in Headers */, DB313FDF17554B71006C0E22 /* SDL_mouse.h in Headers */, DB313FE017554B71006C0E22 /* SDL_mutex.h in Headers */, @@ -2123,6 +2137,7 @@ DB313FF017554B71006C0E22 /* SDL_surface.h in Headers */, DB313FF117554B71006C0E22 /* SDL_system.h in Headers */, DB313FF217554B71006C0E22 /* SDL_syswm.h in Headers */, + AAC070FB195606770073DCDF /* SDL_opengl_glext.h in Headers */, DB313FF317554B71006C0E22 /* SDL_thread.h in Headers */, DB313FF417554B71006C0E22 /* SDL_timer.h in Headers */, DB313FF517554B71006C0E22 /* SDL_touch.h in Headers */, @@ -2135,6 +2150,7 @@ DB313F7617554B71006C0E22 /* SDL_coreaudio.h in Headers */, DB313F7717554B71006C0E22 /* SDL_audio_c.h in Headers */, DB313F7817554B71006C0E22 /* SDL_audiodev_c.h in Headers */, + AAC070FE195606770073DCDF /* SDL_opengles2_gl2.h in Headers */, DB313F7917554B71006C0E22 /* SDL_audiomem.h in Headers */, DB313F7A17554B71006C0E22 /* SDL_sysaudio.h in Headers */, DB313F7B17554B71006C0E22 /* SDL_wave.h in Headers */, @@ -2172,6 +2188,7 @@ DB313F9B17554B71006C0E22 /* SDL_cocoamouse.h in Headers */, DB313F9C17554B71006C0E22 /* SDL_cocoaopengl.h in Headers */, DB313F9D17554B71006C0E22 /* SDL_cocoashape.h in Headers */, + AAC07104195606770073DCDF /* SDL_opengles2_gl2platform.h in Headers */, DB313F9E17554B71006C0E22 /* SDL_cocoavideo.h in Headers */, DB313F9F17554B71006C0E22 /* SDL_cocoawindow.h in Headers */, DB313FA017554B71006C0E22 /* SDL_nullevents_c.h in Headers */, @@ -2197,6 +2214,7 @@ DB313FB417554B71006C0E22 /* SDL_x11sym.h in Headers */, DB313FB517554B71006C0E22 /* SDL_x11touch.h in Headers */, DB313FB617554B71006C0E22 /* SDL_x11video.h in Headers */, + AAC07101195606770073DCDF /* SDL_opengles2_gl2ext.h in Headers */, DB313FB717554B71006C0E22 /* SDL_x11window.h in Headers */, DB313FB817554B71006C0E22 /* SDL_sysrender.h in Headers */, DB313FB917554B71006C0E22 /* mmx.h in Headers */, @@ -2773,8 +2791,9 @@ 00CFA622106A567900758660 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_LINK_OBJC_RUNTIME = NO; DYLIB_COMPATIBILITY_VERSION = 1.0.0; - DYLIB_CURRENT_VERSION = 3.1.0; + DYLIB_CURRENT_VERSION = 5.0.0; FRAMEWORK_VERSION = A; HEADER_SEARCH_PATHS = /usr/X11R6/include; INFOPLIST_FILE = "Info-Framework.plist"; @@ -2827,8 +2846,9 @@ 00CFA628106A568900758660 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_LINK_OBJC_RUNTIME = NO; DYLIB_COMPATIBILITY_VERSION = 1.0.0; - DYLIB_CURRENT_VERSION = 3.1.0; + DYLIB_CURRENT_VERSION = 5.0.0; FRAMEWORK_VERSION = A; HEADER_SEARCH_PATHS = /usr/X11R6/include; INFOPLIST_FILE = "Info-Framework.plist"; diff --git a/jni/SDL2-2.0.3/Xcode/SDL/pkg-support/codesign-frameworks.sh b/jni/SDL2-2.0.3/Xcode/SDL/pkg-support/codesign-frameworks.sh index 16dea251..1e184b08 100755 --- a/jni/SDL2-2.0.3/Xcode/SDL/pkg-support/codesign-frameworks.sh +++ b/jni/SDL2-2.0.3/Xcode/SDL/pkg-support/codesign-frameworks.sh @@ -1,6 +1,6 @@ #!/bin/sh -# WARNING: You may have to run Clean in Xcode after changing CODE_SIGN_IDENTITY! +# WARNING: You may have to run Clean in Xcode after changing CODE_SIGN_IDENTITY! # Verify that $CODE_SIGN_IDENTITY is set if [ -z "$CODE_SIGN_IDENTITY" ] ; then @@ -14,30 +14,30 @@ if [ -z "$CODE_SIGN_IDENTITY" ] ; then fi fi -SAVEIFS=$IFS -IFS=$(echo -en "\n\b") - FRAMEWORK_DIR="${TARGET_BUILD_DIR}" # Loop through all frameworks -FRAMEWORKS=`find "${FRAMEWORK_DIR}" -type d -name "*.framework" | sed -e "s/\(.*\)/\1\/Versions\/A\//"` +FRAMEWORKS=`find "${FRAMEWORK_DIR}" -type d -name "*.framework" | sort -r` RESULT=$? if [[ $RESULT != 0 ]] ; then exit 1 fi -echo "Found:" -echo "${FRAMEWORKS}" - for FRAMEWORK in $FRAMEWORKS; do + if [[ "$CONFIGURATION" = "Release" ]]; then + echo "Stripping '${FRAMEWORK}'" + NAME=$(basename "${FRAMEWORK}" .framework) + xcrun strip -x "${FRAMEWORK}/${NAME}" + RESULT=$? + if [[ $RESULT != 0 ]] ; then + exit 1 + fi + fi echo "Signing '${FRAMEWORK}'" - `codesign -f -v -s "${CODE_SIGN_IDENTITY}" "${FRAMEWORK}"` + codesign -f -v -s "${CODE_SIGN_IDENTITY}" "${FRAMEWORK}" RESULT=$? if [[ $RESULT != 0 ]] ; then exit 1 fi done - -# restore $IFS -IFS=$SAVEIFS diff --git a/jni/SDL2-2.0.3/Xcode/SDLTest/SDLTest.xcodeproj/project.pbxproj b/jni/SDL2-2.0.3/Xcode/SDLTest/SDLTest.xcodeproj/project.pbxproj index a9d0a47a..d6619c2d 100755 --- a/jni/SDL2-2.0.3/Xcode/SDLTest/SDLTest.xcodeproj/project.pbxproj +++ b/jni/SDL2-2.0.3/Xcode/SDLTest/SDLTest.xcodeproj/project.pbxproj @@ -82,7 +82,6 @@ 0017957F10741F7900F5D044 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A863D10730545007319AE /* IOKit.framework */; }; 0017958010741F7900F5D044 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A869F10730593007319AE /* AudioToolbox.framework */; }; 0017958110741F7900F5D044 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A86A010730593007319AE /* CoreFoundation.framework */; }; - 0017958210741F7900F5D044 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A86F2107305CE007319AE /* OpenGL.framework */; }; 0017958310741F7900F5D044 /* AudioUnit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A871410730623007319AE /* AudioUnit.framework */; }; 0017958410741F7900F5D044 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A873910730675007319AE /* Carbon.framework */; }; 0017958510741F7900F5D044 /* libSDL2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 003FA645093FFD41000C53B3 /* libSDL2.a */; }; @@ -93,7 +92,6 @@ 001795A0107421BF00F5D044 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A863D10730545007319AE /* IOKit.framework */; }; 001795A1107421BF00F5D044 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A869F10730593007319AE /* AudioToolbox.framework */; }; 001795A2107421BF00F5D044 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A86A010730593007319AE /* CoreFoundation.framework */; }; - 001795A3107421BF00F5D044 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A86F2107305CE007319AE /* OpenGL.framework */; }; 001795A4107421BF00F5D044 /* AudioUnit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A871410730623007319AE /* AudioUnit.framework */; }; 001795A5107421BF00F5D044 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A873910730675007319AE /* Carbon.framework */; }; 001795A6107421BF00F5D044 /* libSDL2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 003FA645093FFD41000C53B3 /* libSDL2.a */; }; @@ -104,7 +102,6 @@ 0017971410742F3200F5D044 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A863D10730545007319AE /* IOKit.framework */; }; 0017971510742F3200F5D044 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A869F10730593007319AE /* AudioToolbox.framework */; }; 0017971610742F3200F5D044 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A86A010730593007319AE /* CoreFoundation.framework */; }; - 0017971710742F3200F5D044 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A86F2107305CE007319AE /* OpenGL.framework */; }; 0017971810742F3200F5D044 /* AudioUnit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A871410730623007319AE /* AudioUnit.framework */; }; 0017971910742F3200F5D044 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A873910730675007319AE /* Carbon.framework */; }; 0017971A10742F3200F5D044 /* libSDL2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 003FA645093FFD41000C53B3 /* libSDL2.a */; }; @@ -115,7 +112,6 @@ 0017973B107430D600F5D044 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A863D10730545007319AE /* IOKit.framework */; }; 0017973C107430D600F5D044 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A869F10730593007319AE /* AudioToolbox.framework */; }; 0017973D107430D600F5D044 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A86A010730593007319AE /* CoreFoundation.framework */; }; - 0017973E107430D600F5D044 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A86F2107305CE007319AE /* OpenGL.framework */; }; 0017973F107430D600F5D044 /* AudioUnit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A871410730623007319AE /* AudioUnit.framework */; }; 00179740107430D600F5D044 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A873910730675007319AE /* Carbon.framework */; }; 00179741107430D600F5D044 /* libSDL2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 003FA645093FFD41000C53B3 /* libSDL2.a */; }; @@ -126,7 +122,6 @@ 00179761107431B300F5D044 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A863D10730545007319AE /* IOKit.framework */; }; 00179762107431B300F5D044 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A869F10730593007319AE /* AudioToolbox.framework */; }; 00179763107431B300F5D044 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A86A010730593007319AE /* CoreFoundation.framework */; }; - 00179764107431B300F5D044 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A86F2107305CE007319AE /* OpenGL.framework */; }; 00179765107431B300F5D044 /* AudioUnit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A871410730623007319AE /* AudioUnit.framework */; }; 00179766107431B300F5D044 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A873910730675007319AE /* Carbon.framework */; }; 00179767107431B300F5D044 /* libSDL2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 003FA645093FFD41000C53B3 /* libSDL2.a */; }; @@ -137,7 +132,6 @@ 00179781107432AE00F5D044 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A863D10730545007319AE /* IOKit.framework */; }; 00179782107432AE00F5D044 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A869F10730593007319AE /* AudioToolbox.framework */; }; 00179783107432AE00F5D044 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A86A010730593007319AE /* CoreFoundation.framework */; }; - 00179784107432AE00F5D044 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A86F2107305CE007319AE /* OpenGL.framework */; }; 00179785107432AE00F5D044 /* AudioUnit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A871410730623007319AE /* AudioUnit.framework */; }; 00179786107432AE00F5D044 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A873910730675007319AE /* Carbon.framework */; }; 00179787107432AE00F5D044 /* libSDL2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 003FA645093FFD41000C53B3 /* libSDL2.a */; }; @@ -148,7 +142,6 @@ 001797A11074334C00F5D044 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A863D10730545007319AE /* IOKit.framework */; }; 001797A21074334C00F5D044 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A869F10730593007319AE /* AudioToolbox.framework */; }; 001797A31074334C00F5D044 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A86A010730593007319AE /* CoreFoundation.framework */; }; - 001797A41074334C00F5D044 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A86F2107305CE007319AE /* OpenGL.framework */; }; 001797A51074334C00F5D044 /* AudioUnit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A871410730623007319AE /* AudioUnit.framework */; }; 001797A61074334C00F5D044 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A873910730675007319AE /* Carbon.framework */; }; 001797A71074334C00F5D044 /* libSDL2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 003FA645093FFD41000C53B3 /* libSDL2.a */; }; @@ -159,7 +152,6 @@ 001797C3107433C600F5D044 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A863D10730545007319AE /* IOKit.framework */; }; 001797C4107433C600F5D044 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A869F10730593007319AE /* AudioToolbox.framework */; }; 001797C5107433C600F5D044 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A86A010730593007319AE /* CoreFoundation.framework */; }; - 001797C6107433C600F5D044 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A86F2107305CE007319AE /* OpenGL.framework */; }; 001797C7107433C600F5D044 /* AudioUnit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A871410730623007319AE /* AudioUnit.framework */; }; 001797C8107433C600F5D044 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A873910730675007319AE /* Carbon.framework */; }; 001797C9107433C600F5D044 /* libSDL2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 003FA645093FFD41000C53B3 /* libSDL2.a */; }; @@ -170,7 +162,6 @@ 001798051074355200F5D044 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A863D10730545007319AE /* IOKit.framework */; }; 001798061074355200F5D044 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A869F10730593007319AE /* AudioToolbox.framework */; }; 001798071074355200F5D044 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A86A010730593007319AE /* CoreFoundation.framework */; }; - 001798081074355200F5D044 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A86F2107305CE007319AE /* OpenGL.framework */; }; 001798091074355200F5D044 /* AudioUnit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A871410730623007319AE /* AudioUnit.framework */; }; 0017980A1074355200F5D044 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A873910730675007319AE /* Carbon.framework */; }; 0017980B1074355200F5D044 /* libSDL2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 003FA645093FFD41000C53B3 /* libSDL2.a */; }; @@ -184,7 +175,6 @@ 001798871074392D00F5D044 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A863D10730545007319AE /* IOKit.framework */; }; 001798881074392D00F5D044 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A869F10730593007319AE /* AudioToolbox.framework */; }; 001798891074392D00F5D044 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A86A010730593007319AE /* CoreFoundation.framework */; }; - 0017988A1074392D00F5D044 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A86F2107305CE007319AE /* OpenGL.framework */; }; 0017988B1074392D00F5D044 /* AudioUnit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A871410730623007319AE /* AudioUnit.framework */; }; 0017988C1074392D00F5D044 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A873910730675007319AE /* Carbon.framework */; }; 0017988D1074392D00F5D044 /* libSDL2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 003FA645093FFD41000C53B3 /* libSDL2.a */; }; @@ -194,7 +184,6 @@ 001798A8107439DF00F5D044 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A863D10730545007319AE /* IOKit.framework */; }; 001798A9107439DF00F5D044 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A869F10730593007319AE /* AudioToolbox.framework */; }; 001798AA107439DF00F5D044 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A86A010730593007319AE /* CoreFoundation.framework */; }; - 001798AB107439DF00F5D044 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A86F2107305CE007319AE /* OpenGL.framework */; }; 001798AC107439DF00F5D044 /* AudioUnit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A871410730623007319AE /* AudioUnit.framework */; }; 001798AD107439DF00F5D044 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A873910730675007319AE /* Carbon.framework */; }; 001798AE107439DF00F5D044 /* libSDL2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 003FA645093FFD41000C53B3 /* libSDL2.a */; }; @@ -205,7 +194,6 @@ 001798E510743BEC00F5D044 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A863D10730545007319AE /* IOKit.framework */; }; 001798E610743BEC00F5D044 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A869F10730593007319AE /* AudioToolbox.framework */; }; 001798E710743BEC00F5D044 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A86A010730593007319AE /* CoreFoundation.framework */; }; - 001798E810743BEC00F5D044 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A86F2107305CE007319AE /* OpenGL.framework */; }; 001798E910743BEC00F5D044 /* AudioUnit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A871410730623007319AE /* AudioUnit.framework */; }; 001798EA10743BEC00F5D044 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A873910730675007319AE /* Carbon.framework */; }; 001798EB10743BEC00F5D044 /* libSDL2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 003FA645093FFD41000C53B3 /* libSDL2.a */; }; @@ -216,7 +204,6 @@ 0017990910743F1000F5D044 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A863D10730545007319AE /* IOKit.framework */; }; 0017990A10743F1000F5D044 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A869F10730593007319AE /* AudioToolbox.framework */; }; 0017990B10743F1000F5D044 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A86A010730593007319AE /* CoreFoundation.framework */; }; - 0017990C10743F1000F5D044 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A86F2107305CE007319AE /* OpenGL.framework */; }; 0017990D10743F1000F5D044 /* AudioUnit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A871410730623007319AE /* AudioUnit.framework */; }; 0017990E10743F1000F5D044 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A873910730675007319AE /* Carbon.framework */; }; 0017990F10743F1000F5D044 /* libSDL2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 003FA645093FFD41000C53B3 /* libSDL2.a */; }; @@ -227,7 +214,6 @@ 0017992B10743FB700F5D044 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A863D10730545007319AE /* IOKit.framework */; }; 0017992C10743FB700F5D044 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A869F10730593007319AE /* AudioToolbox.framework */; }; 0017992D10743FB700F5D044 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A86A010730593007319AE /* CoreFoundation.framework */; }; - 0017992E10743FB700F5D044 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A86F2107305CE007319AE /* OpenGL.framework */; }; 0017992F10743FB700F5D044 /* AudioUnit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A871410730623007319AE /* AudioUnit.framework */; }; 0017993010743FB700F5D044 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A873910730675007319AE /* Carbon.framework */; }; 0017993110743FB700F5D044 /* libSDL2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 003FA645093FFD41000C53B3 /* libSDL2.a */; }; @@ -308,21 +294,6 @@ 002A86DC10730596007319AE /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A86A010730593007319AE /* CoreFoundation.framework */; }; 002A86DD10730596007319AE /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A869F10730593007319AE /* AudioToolbox.framework */; }; 002A86DE10730596007319AE /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A86A010730593007319AE /* CoreFoundation.framework */; }; - 002A86F4107305CE007319AE /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A86F2107305CE007319AE /* OpenGL.framework */; }; - 002A86F8107305CE007319AE /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A86F2107305CE007319AE /* OpenGL.framework */; }; - 002A86FA107305CE007319AE /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A86F2107305CE007319AE /* OpenGL.framework */; }; - 002A86FF107305CE007319AE /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A86F2107305CE007319AE /* OpenGL.framework */; }; - 002A8702107305CF007319AE /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A86F2107305CE007319AE /* OpenGL.framework */; }; - 002A8703107305CF007319AE /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A86F2107305CE007319AE /* OpenGL.framework */; }; - 002A8705107305CF007319AE /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A86F2107305CE007319AE /* OpenGL.framework */; }; - 002A8706107305CF007319AE /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A86F2107305CE007319AE /* OpenGL.framework */; }; - 002A8707107305CF007319AE /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A86F2107305CE007319AE /* OpenGL.framework */; }; - 002A8709107305CF007319AE /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A86F2107305CE007319AE /* OpenGL.framework */; }; - 002A870B107305CF007319AE /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A86F2107305CE007319AE /* OpenGL.framework */; }; - 002A870C107305CF007319AE /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A86F2107305CE007319AE /* OpenGL.framework */; }; - 002A870E107305CF007319AE /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A86F2107305CE007319AE /* OpenGL.framework */; }; - 002A8710107305CF007319AE /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A86F2107305CE007319AE /* OpenGL.framework */; }; - 002A8711107305CF007319AE /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A86F2107305CE007319AE /* OpenGL.framework */; }; 002A871610730623007319AE /* AudioUnit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A871410730623007319AE /* AudioUnit.framework */; }; 002A871A10730623007319AE /* AudioUnit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A871410730623007319AE /* AudioUnit.framework */; }; 002A871C10730623007319AE /* AudioUnit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A871410730623007319AE /* AudioUnit.framework */; }; @@ -383,7 +354,6 @@ BBFC08C3164C6862003E6A99 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A863D10730545007319AE /* IOKit.framework */; }; BBFC08C4164C6862003E6A99 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A869F10730593007319AE /* AudioToolbox.framework */; }; BBFC08C5164C6862003E6A99 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A86A010730593007319AE /* CoreFoundation.framework */; }; - BBFC08C6164C6862003E6A99 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A86F2107305CE007319AE /* OpenGL.framework */; }; BBFC08C7164C6862003E6A99 /* AudioUnit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A871410730623007319AE /* AudioUnit.framework */; }; BBFC08C8164C6862003E6A99 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A873910730675007319AE /* Carbon.framework */; }; BBFC08C9164C6862003E6A99 /* libSDL2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 003FA645093FFD41000C53B3 /* libSDL2.a */; }; @@ -405,7 +375,6 @@ DB0F48E017CA51E5008798C5 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A863D10730545007319AE /* IOKit.framework */; }; DB0F48E117CA51E5008798C5 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A869F10730593007319AE /* AudioToolbox.framework */; }; DB0F48E217CA51E5008798C5 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A86A010730593007319AE /* CoreFoundation.framework */; }; - DB0F48E317CA51E5008798C5 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A86F2107305CE007319AE /* OpenGL.framework */; }; DB0F48E417CA51E5008798C5 /* AudioUnit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A871410730623007319AE /* AudioUnit.framework */; }; DB0F48E517CA51E5008798C5 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A873910730675007319AE /* Carbon.framework */; }; DB0F48E617CA51E5008798C5 /* libSDL2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 003FA645093FFD41000C53B3 /* libSDL2.a */; }; @@ -416,7 +385,6 @@ DB0F48F617CA5212008798C5 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A863D10730545007319AE /* IOKit.framework */; }; DB0F48F717CA5212008798C5 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A869F10730593007319AE /* AudioToolbox.framework */; }; DB0F48F817CA5212008798C5 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A86A010730593007319AE /* CoreFoundation.framework */; }; - DB0F48F917CA5212008798C5 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A86F2107305CE007319AE /* OpenGL.framework */; }; DB0F48FA17CA5212008798C5 /* AudioUnit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A871410730623007319AE /* AudioUnit.framework */; }; DB0F48FB17CA5212008798C5 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A873910730675007319AE /* Carbon.framework */; }; DB0F48FC17CA5212008798C5 /* libSDL2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 003FA645093FFD41000C53B3 /* libSDL2.a */; }; @@ -429,7 +397,6 @@ DB166D7616A1CFB200A1396C /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A86A010730593007319AE /* CoreFoundation.framework */; }; DB166D7716A1CFB200A1396C /* ForceFeedback.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A863C10730545007319AE /* ForceFeedback.framework */; }; DB166D7816A1CFB200A1396C /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A863D10730545007319AE /* IOKit.framework */; }; - DB166D7916A1CFB200A1396C /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A86F2107305CE007319AE /* OpenGL.framework */; }; DB166D7A16A1CFD500A1396C /* libSDL2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 003FA645093FFD41000C53B3 /* libSDL2.a */; }; DB166D9316A1D1A500A1396C /* SDL_test_assert.c in Sources */ = {isa = PBXBuildFile; fileRef = DB166D8416A1D1A500A1396C /* SDL_test_assert.c */; }; DB166D9416A1D1A500A1396C /* SDL_test_common.c in Sources */ = {isa = PBXBuildFile; fileRef = DB166D8516A1D1A500A1396C /* SDL_test_common.c */; }; @@ -459,7 +426,6 @@ DB166DB416A1D2F600A1396C /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A863D10730545007319AE /* IOKit.framework */; }; DB166DB516A1D2F600A1396C /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A869F10730593007319AE /* AudioToolbox.framework */; }; DB166DB616A1D2F600A1396C /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A86A010730593007319AE /* CoreFoundation.framework */; }; - DB166DB716A1D2F600A1396C /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A86F2107305CE007319AE /* OpenGL.framework */; }; DB166DB816A1D2F600A1396C /* AudioUnit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A871410730623007319AE /* AudioUnit.framework */; }; DB166DB916A1D2F600A1396C /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A873910730675007319AE /* Carbon.framework */; }; DB166DBA16A1D2F600A1396C /* libSDL2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 003FA645093FFD41000C53B3 /* libSDL2.a */; }; @@ -470,7 +436,6 @@ DB166DCB16A1D36A00A1396C /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A863D10730545007319AE /* IOKit.framework */; }; DB166DCC16A1D36A00A1396C /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A869F10730593007319AE /* AudioToolbox.framework */; }; DB166DCD16A1D36A00A1396C /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A86A010730593007319AE /* CoreFoundation.framework */; }; - DB166DCE16A1D36A00A1396C /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A86F2107305CE007319AE /* OpenGL.framework */; }; DB166DCF16A1D36A00A1396C /* AudioUnit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A871410730623007319AE /* AudioUnit.framework */; }; DB166DD016A1D36A00A1396C /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A873910730675007319AE /* Carbon.framework */; }; DB166DD116A1D36A00A1396C /* libSDL2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 003FA645093FFD41000C53B3 /* libSDL2.a */; }; @@ -482,7 +447,6 @@ DB166DE316A1D50C00A1396C /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A863D10730545007319AE /* IOKit.framework */; }; DB166DE416A1D50C00A1396C /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A869F10730593007319AE /* AudioToolbox.framework */; }; DB166DE516A1D50C00A1396C /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A86A010730593007319AE /* CoreFoundation.framework */; }; - DB166DE616A1D50C00A1396C /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A86F2107305CE007319AE /* OpenGL.framework */; }; DB166DE716A1D50C00A1396C /* AudioUnit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A871410730623007319AE /* AudioUnit.framework */; }; DB166DE816A1D50C00A1396C /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A873910730675007319AE /* Carbon.framework */; }; DB166DE916A1D50C00A1396C /* libSDL2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 003FA645093FFD41000C53B3 /* libSDL2.a */; }; @@ -494,7 +458,6 @@ DB166DFA16A1D57C00A1396C /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A863D10730545007319AE /* IOKit.framework */; }; DB166DFB16A1D57C00A1396C /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A869F10730593007319AE /* AudioToolbox.framework */; }; DB166DFC16A1D57C00A1396C /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A86A010730593007319AE /* CoreFoundation.framework */; }; - DB166DFD16A1D57C00A1396C /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A86F2107305CE007319AE /* OpenGL.framework */; }; DB166DFE16A1D57C00A1396C /* AudioUnit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A871410730623007319AE /* AudioUnit.framework */; }; DB166DFF16A1D57C00A1396C /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A873910730675007319AE /* Carbon.framework */; }; DB166E0016A1D57C00A1396C /* libSDL2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 003FA645093FFD41000C53B3 /* libSDL2.a */; }; @@ -506,7 +469,6 @@ DB166E1116A1D5AD00A1396C /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A863D10730545007319AE /* IOKit.framework */; }; DB166E1216A1D5AD00A1396C /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A869F10730593007319AE /* AudioToolbox.framework */; }; DB166E1316A1D5AD00A1396C /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A86A010730593007319AE /* CoreFoundation.framework */; }; - DB166E1416A1D5AD00A1396C /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A86F2107305CE007319AE /* OpenGL.framework */; }; DB166E1516A1D5AD00A1396C /* AudioUnit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A871410730623007319AE /* AudioUnit.framework */; }; DB166E1616A1D5AD00A1396C /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A873910730675007319AE /* Carbon.framework */; }; DB166E1716A1D5AD00A1396C /* libSDL2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 003FA645093FFD41000C53B3 /* libSDL2.a */; }; @@ -522,7 +484,6 @@ DB166E2E16A1D64D00A1396C /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A863D10730545007319AE /* IOKit.framework */; }; DB166E2F16A1D64D00A1396C /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A869F10730593007319AE /* AudioToolbox.framework */; }; DB166E3016A1D64D00A1396C /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A86A010730593007319AE /* CoreFoundation.framework */; }; - DB166E3116A1D64D00A1396C /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A86F2107305CE007319AE /* OpenGL.framework */; }; DB166E3216A1D64D00A1396C /* AudioUnit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A871410730623007319AE /* AudioUnit.framework */; }; DB166E3316A1D64D00A1396C /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A873910730675007319AE /* Carbon.framework */; }; DB166E3416A1D64D00A1396C /* libSDL2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 003FA645093FFD41000C53B3 /* libSDL2.a */; }; @@ -533,7 +494,6 @@ DB166E4416A1D69000A1396C /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A863D10730545007319AE /* IOKit.framework */; }; DB166E4516A1D69000A1396C /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A869F10730593007319AE /* AudioToolbox.framework */; }; DB166E4616A1D69000A1396C /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A86A010730593007319AE /* CoreFoundation.framework */; }; - DB166E4716A1D69000A1396C /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A86F2107305CE007319AE /* OpenGL.framework */; }; DB166E4816A1D69000A1396C /* AudioUnit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A871410730623007319AE /* AudioUnit.framework */; }; DB166E4916A1D69000A1396C /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A873910730675007319AE /* Carbon.framework */; }; DB166E4A16A1D69000A1396C /* libSDL2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 003FA645093FFD41000C53B3 /* libSDL2.a */; }; @@ -547,7 +507,6 @@ DB166E5E16A1D6F300A1396C /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A863D10730545007319AE /* IOKit.framework */; }; DB166E5F16A1D6F300A1396C /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A869F10730593007319AE /* AudioToolbox.framework */; }; DB166E6016A1D6F300A1396C /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A86A010730593007319AE /* CoreFoundation.framework */; }; - DB166E6116A1D6F300A1396C /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A86F2107305CE007319AE /* OpenGL.framework */; }; DB166E6216A1D6F300A1396C /* AudioUnit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A871410730623007319AE /* AudioUnit.framework */; }; DB166E6316A1D6F300A1396C /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A873910730675007319AE /* Carbon.framework */; }; DB166E6416A1D6F300A1396C /* libSDL2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 003FA645093FFD41000C53B3 /* libSDL2.a */; }; @@ -558,7 +517,6 @@ DB166E7416A1D78400A1396C /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A863D10730545007319AE /* IOKit.framework */; }; DB166E7516A1D78400A1396C /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A869F10730593007319AE /* AudioToolbox.framework */; }; DB166E7616A1D78400A1396C /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A86A010730593007319AE /* CoreFoundation.framework */; }; - DB166E7716A1D78400A1396C /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A86F2107305CE007319AE /* OpenGL.framework */; }; DB166E7816A1D78400A1396C /* AudioUnit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A871410730623007319AE /* AudioUnit.framework */; }; DB166E7916A1D78400A1396C /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A873910730675007319AE /* Carbon.framework */; }; DB166E7A16A1D78400A1396C /* libSDL2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 003FA645093FFD41000C53B3 /* libSDL2.a */; }; @@ -568,7 +526,6 @@ DB166E8716A1D78C00A1396C /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A863D10730545007319AE /* IOKit.framework */; }; DB166E8816A1D78C00A1396C /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A869F10730593007319AE /* AudioToolbox.framework */; }; DB166E8916A1D78C00A1396C /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A86A010730593007319AE /* CoreFoundation.framework */; }; - DB166E8A16A1D78C00A1396C /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A86F2107305CE007319AE /* OpenGL.framework */; }; DB166E8B16A1D78C00A1396C /* AudioUnit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A871410730623007319AE /* AudioUnit.framework */; }; DB166E8C16A1D78C00A1396C /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A873910730675007319AE /* Carbon.framework */; }; DB166E8D16A1D78C00A1396C /* libSDL2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 003FA645093FFD41000C53B3 /* libSDL2.a */; }; @@ -577,29 +534,72 @@ DB166E9A16A1D7F700A1396C /* moose.dat in CopyFiles */ = {isa = PBXBuildFile; fileRef = 00794E5E09D20839003FC8A1 /* moose.dat */; }; DB166E9C16A1D80900A1396C /* icon.bmp in CopyFiles */ = {isa = PBXBuildFile; fileRef = 00794E5D09D20839003FC8A1 /* icon.bmp */; }; DB166ED016A1D88100A1396C /* shapes in CopyFiles */ = {isa = PBXBuildFile; fileRef = DB166ECF16A1D87000A1396C /* shapes */; }; - DB89957118A19ABA0092407C /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002F33A709CA188600EBEB88 /* Cocoa.framework */; }; - DB89957218A19ABA0092407C /* CoreAudio.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A863B10730545007319AE /* CoreAudio.framework */; }; - DB89957318A19ABA0092407C /* ForceFeedback.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A863C10730545007319AE /* ForceFeedback.framework */; }; - DB89957418A19ABA0092407C /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A863D10730545007319AE /* IOKit.framework */; }; - DB89957518A19ABA0092407C /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A869F10730593007319AE /* AudioToolbox.framework */; }; - DB89957618A19ABA0092407C /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A86A010730593007319AE /* CoreFoundation.framework */; }; - DB89957718A19ABA0092407C /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A86F2107305CE007319AE /* OpenGL.framework */; }; - DB89957818A19ABA0092407C /* AudioUnit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A871410730623007319AE /* AudioUnit.framework */; }; - DB89957918A19ABA0092407C /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A873910730675007319AE /* Carbon.framework */; }; - DB89957A18A19ABA0092407C /* libSDL2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 003FA645093FFD41000C53B3 /* libSDL2.a */; }; - DB89958418A19B130092407C /* testhotplug.c in Sources */ = {isa = PBXBuildFile; fileRef = DB89958318A19B130092407C /* testhotplug.c */; }; DB445EEA18184B7000B306B0 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002F33A709CA188600EBEB88 /* Cocoa.framework */; }; DB445EEB18184B7000B306B0 /* CoreAudio.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A863B10730545007319AE /* CoreAudio.framework */; }; DB445EEC18184B7000B306B0 /* ForceFeedback.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A863C10730545007319AE /* ForceFeedback.framework */; }; DB445EED18184B7000B306B0 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A863D10730545007319AE /* IOKit.framework */; }; DB445EEE18184B7000B306B0 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A869F10730593007319AE /* AudioToolbox.framework */; }; DB445EEF18184B7000B306B0 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A86A010730593007319AE /* CoreFoundation.framework */; }; - DB445EF018184B7000B306B0 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A86F2107305CE007319AE /* OpenGL.framework */; }; DB445EF118184B7000B306B0 /* AudioUnit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A871410730623007319AE /* AudioUnit.framework */; }; DB445EF218184B7000B306B0 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A873910730675007319AE /* Carbon.framework */; }; DB445EF318184B7000B306B0 /* libSDL2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 003FA645093FFD41000C53B3 /* libSDL2.a */; }; DB445EF418184B7000B306B0 /* libSDL_test.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DB166D7F16A1D12400A1396C /* libSDL_test.a */; }; DB445EFB18184BB600B306B0 /* testdropfile.c in Sources */ = {isa = PBXBuildFile; fileRef = DB445EFA18184BB600B306B0 /* testdropfile.c */; }; + DB89957118A19ABA0092407C /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002F33A709CA188600EBEB88 /* Cocoa.framework */; }; + DB89957218A19ABA0092407C /* CoreAudio.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A863B10730545007319AE /* CoreAudio.framework */; }; + DB89957318A19ABA0092407C /* ForceFeedback.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A863C10730545007319AE /* ForceFeedback.framework */; }; + DB89957418A19ABA0092407C /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A863D10730545007319AE /* IOKit.framework */; }; + DB89957518A19ABA0092407C /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A869F10730593007319AE /* AudioToolbox.framework */; }; + DB89957618A19ABA0092407C /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A86A010730593007319AE /* CoreFoundation.framework */; }; + DB89957818A19ABA0092407C /* AudioUnit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A871410730623007319AE /* AudioUnit.framework */; }; + DB89957918A19ABA0092407C /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A873910730675007319AE /* Carbon.framework */; }; + DB89957A18A19ABA0092407C /* libSDL2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 003FA645093FFD41000C53B3 /* libSDL2.a */; }; + DB89958418A19B130092407C /* testhotplug.c in Sources */ = {isa = PBXBuildFile; fileRef = DB89958318A19B130092407C /* testhotplug.c */; }; + FA73672319A54A90004122E4 /* CoreVideo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FA73672219A54A90004122E4 /* CoreVideo.framework */; }; + FA73672819A54AB6004122E4 /* CoreVideo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FA73672219A54A90004122E4 /* CoreVideo.framework */; }; + FA73672919A54AB9004122E4 /* CoreVideo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FA73672219A54A90004122E4 /* CoreVideo.framework */; }; + FA73672A19A54AC0004122E4 /* CoreVideo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FA73672219A54A90004122E4 /* CoreVideo.framework */; }; + FA73672B19A54AC2004122E4 /* CoreVideo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FA73672219A54A90004122E4 /* CoreVideo.framework */; }; + FA73672C19A54AC5004122E4 /* CoreVideo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FA73672219A54A90004122E4 /* CoreVideo.framework */; }; + FA73672D19A54AC7004122E4 /* CoreVideo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FA73672219A54A90004122E4 /* CoreVideo.framework */; }; + FA73672E19A54ACA004122E4 /* CoreVideo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FA73672219A54A90004122E4 /* CoreVideo.framework */; }; + FA73672F19A54ACC004122E4 /* CoreVideo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FA73672219A54A90004122E4 /* CoreVideo.framework */; }; + FA73673019A54AD0004122E4 /* CoreVideo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FA73672219A54A90004122E4 /* CoreVideo.framework */; }; + FA73673119A54AD3004122E4 /* CoreVideo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FA73672219A54A90004122E4 /* CoreVideo.framework */; }; + FA73673219A54AD5004122E4 /* CoreVideo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FA73672219A54A90004122E4 /* CoreVideo.framework */; }; + FA73673319A54AD8004122E4 /* CoreVideo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FA73672219A54A90004122E4 /* CoreVideo.framework */; }; + FA73673419A54ADB004122E4 /* CoreVideo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FA73672219A54A90004122E4 /* CoreVideo.framework */; }; + FA73673519A54ADE004122E4 /* CoreVideo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FA73672219A54A90004122E4 /* CoreVideo.framework */; }; + FA73673619A54AE1004122E4 /* CoreVideo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FA73672219A54A90004122E4 /* CoreVideo.framework */; }; + FA73673719A54AE3004122E4 /* CoreVideo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FA73672219A54A90004122E4 /* CoreVideo.framework */; }; + FA73673819A54AE6004122E4 /* CoreVideo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FA73672219A54A90004122E4 /* CoreVideo.framework */; }; + FA73673919A54AE8004122E4 /* CoreVideo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FA73672219A54A90004122E4 /* CoreVideo.framework */; }; + FA73673A19A54AEB004122E4 /* CoreVideo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FA73672219A54A90004122E4 /* CoreVideo.framework */; }; + FA73673B19A54AED004122E4 /* CoreVideo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FA73672219A54A90004122E4 /* CoreVideo.framework */; }; + FA73673C19A54AF0004122E4 /* CoreVideo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FA73672219A54A90004122E4 /* CoreVideo.framework */; }; + FA73673D19A54AF3004122E4 /* CoreVideo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FA73672219A54A90004122E4 /* CoreVideo.framework */; }; + FA73673E19A54AF6004122E4 /* CoreVideo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FA73672219A54A90004122E4 /* CoreVideo.framework */; }; + FA73673F19A54AF8004122E4 /* CoreVideo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FA73672219A54A90004122E4 /* CoreVideo.framework */; }; + FA73674019A54AFB004122E4 /* CoreVideo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FA73672219A54A90004122E4 /* CoreVideo.framework */; }; + FA73674119A54AFE004122E4 /* CoreVideo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FA73672219A54A90004122E4 /* CoreVideo.framework */; }; + FA73674219A54B01004122E4 /* CoreVideo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FA73672219A54A90004122E4 /* CoreVideo.framework */; }; + FA73674319A54B04004122E4 /* CoreVideo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FA73672219A54A90004122E4 /* CoreVideo.framework */; }; + FA73674419A54B06004122E4 /* CoreVideo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FA73672219A54A90004122E4 /* CoreVideo.framework */; }; + FA73674519A54B09004122E4 /* CoreVideo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FA73672219A54A90004122E4 /* CoreVideo.framework */; }; + FA73674619A54B0B004122E4 /* CoreVideo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FA73672219A54A90004122E4 /* CoreVideo.framework */; }; + FA73674719A54B0F004122E4 /* CoreVideo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FA73672219A54A90004122E4 /* CoreVideo.framework */; }; + FA73674819A54B13004122E4 /* CoreVideo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FA73672219A54A90004122E4 /* CoreVideo.framework */; }; + FA73674919A54B16004122E4 /* CoreVideo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FA73672219A54A90004122E4 /* CoreVideo.framework */; }; + FA73674A19A54B19004122E4 /* CoreVideo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FA73672219A54A90004122E4 /* CoreVideo.framework */; }; + FA73674B19A54B1B004122E4 /* CoreVideo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FA73672219A54A90004122E4 /* CoreVideo.framework */; }; + FA73674C19A54B1F004122E4 /* CoreVideo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FA73672219A54A90004122E4 /* CoreVideo.framework */; }; + FA73674D19A54B22004122E4 /* CoreVideo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FA73672219A54A90004122E4 /* CoreVideo.framework */; }; + FA73674E19A54B25004122E4 /* CoreVideo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FA73672219A54A90004122E4 /* CoreVideo.framework */; }; + FA73674F19A54B28004122E4 /* CoreVideo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FA73672219A54A90004122E4 /* CoreVideo.framework */; }; + FA73675019A54B2B004122E4 /* CoreVideo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FA73672219A54A90004122E4 /* CoreVideo.framework */; }; + FA73675119A54B2F004122E4 /* CoreVideo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FA73672219A54A90004122E4 /* CoreVideo.framework */; }; + FA73675219A54B32004122E4 /* CoreVideo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FA73672219A54A90004122E4 /* CoreVideo.framework */; }; + FA73675319A54B35004122E4 /* CoreVideo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FA73672219A54A90004122E4 /* CoreVideo.framework */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -1095,7 +1095,6 @@ 002A863D10730545007319AE /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = /System/Library/Frameworks/IOKit.framework; sourceTree = ""; }; 002A869F10730593007319AE /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = /System/Library/Frameworks/AudioToolbox.framework; sourceTree = ""; }; 002A86A010730593007319AE /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = /System/Library/Frameworks/CoreFoundation.framework; sourceTree = ""; }; - 002A86F2107305CE007319AE /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = /System/Library/Frameworks/OpenGL.framework; sourceTree = ""; }; 002A871410730623007319AE /* AudioUnit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioUnit.framework; path = /System/Library/Frameworks/AudioUnit.framework; sourceTree = ""; }; 002A873910730675007319AE /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = /System/Library/Frameworks/Carbon.framework; sourceTree = ""; }; 002F33A709CA188600EBEB88 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = ""; }; @@ -1182,11 +1181,12 @@ DB166E7E16A1D78400A1396C /* testspriteminimal */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = testspriteminimal; sourceTree = BUILT_PRODUCTS_DIR; }; DB166E9116A1D78C00A1396C /* teststreaming */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = teststreaming; sourceTree = BUILT_PRODUCTS_DIR; }; DB166ECF16A1D87000A1396C /* shapes */ = {isa = PBXFileReference; lastKnownFileType = folder; name = shapes; path = ../../test/shapes; sourceTree = ""; }; - DB89957E18A19ABA0092407C /* testhotplug */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = testhotplug; sourceTree = BUILT_PRODUCTS_DIR; }; - DB89958318A19B130092407C /* testhotplug.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = testhotplug.c; path = ../../test/testhotplug.c; sourceTree = ""; }; DB445EF818184B7000B306B0 /* testdropfile.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = testdropfile.app; sourceTree = BUILT_PRODUCTS_DIR; }; DB445EFA18184BB600B306B0 /* testdropfile.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = testdropfile.c; path = ../../test/testdropfile.c; sourceTree = ""; }; + DB89957E18A19ABA0092407C /* testhotplug */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = testhotplug; sourceTree = BUILT_PRODUCTS_DIR; }; + DB89958318A19B130092407C /* testhotplug.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = testhotplug.c; path = ../../test/testhotplug.c; sourceTree = ""; }; DBBC552C182831D700F3CA8D /* TestDropFile-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = "TestDropFile-Info.plist"; sourceTree = ""; }; + FA73672219A54A90004122E4 /* CoreVideo.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreVideo.framework; path = /System/Library/Frameworks/CoreVideo.framework; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -1194,13 +1194,13 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + FA73672919A54AB9004122E4 /* CoreVideo.framework in Frameworks */, 0017957C10741F7900F5D044 /* Cocoa.framework in Frameworks */, 0017957D10741F7900F5D044 /* CoreAudio.framework in Frameworks */, 0017957E10741F7900F5D044 /* ForceFeedback.framework in Frameworks */, 0017957F10741F7900F5D044 /* IOKit.framework in Frameworks */, 0017958010741F7900F5D044 /* AudioToolbox.framework in Frameworks */, 0017958110741F7900F5D044 /* CoreFoundation.framework in Frameworks */, - 0017958210741F7900F5D044 /* OpenGL.framework in Frameworks */, 0017958310741F7900F5D044 /* AudioUnit.framework in Frameworks */, 0017958410741F7900F5D044 /* Carbon.framework in Frameworks */, 0017958510741F7900F5D044 /* libSDL2.a in Frameworks */, @@ -1211,13 +1211,13 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + FA73672A19A54AC0004122E4 /* CoreVideo.framework in Frameworks */, 0017959D107421BF00F5D044 /* Cocoa.framework in Frameworks */, 0017959E107421BF00F5D044 /* CoreAudio.framework in Frameworks */, 0017959F107421BF00F5D044 /* ForceFeedback.framework in Frameworks */, 001795A0107421BF00F5D044 /* IOKit.framework in Frameworks */, 001795A1107421BF00F5D044 /* AudioToolbox.framework in Frameworks */, 001795A2107421BF00F5D044 /* CoreFoundation.framework in Frameworks */, - 001795A3107421BF00F5D044 /* OpenGL.framework in Frameworks */, 001795A4107421BF00F5D044 /* AudioUnit.framework in Frameworks */, 001795A5107421BF00F5D044 /* Carbon.framework in Frameworks */, 001795A6107421BF00F5D044 /* libSDL2.a in Frameworks */, @@ -1228,13 +1228,13 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + FA73673319A54AD8004122E4 /* CoreVideo.framework in Frameworks */, 0017971110742F3200F5D044 /* Cocoa.framework in Frameworks */, 0017971210742F3200F5D044 /* CoreAudio.framework in Frameworks */, 0017971310742F3200F5D044 /* ForceFeedback.framework in Frameworks */, 0017971410742F3200F5D044 /* IOKit.framework in Frameworks */, 0017971510742F3200F5D044 /* AudioToolbox.framework in Frameworks */, 0017971610742F3200F5D044 /* CoreFoundation.framework in Frameworks */, - 0017971710742F3200F5D044 /* OpenGL.framework in Frameworks */, 0017971810742F3200F5D044 /* AudioUnit.framework in Frameworks */, 0017971910742F3200F5D044 /* Carbon.framework in Frameworks */, 0017971A10742F3200F5D044 /* libSDL2.a in Frameworks */, @@ -1246,13 +1246,13 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + FA73673419A54ADB004122E4 /* CoreVideo.framework in Frameworks */, 00179738107430D600F5D044 /* Cocoa.framework in Frameworks */, 00179739107430D600F5D044 /* CoreAudio.framework in Frameworks */, 0017973A107430D600F5D044 /* ForceFeedback.framework in Frameworks */, 0017973B107430D600F5D044 /* IOKit.framework in Frameworks */, 0017973C107430D600F5D044 /* AudioToolbox.framework in Frameworks */, 0017973D107430D600F5D044 /* CoreFoundation.framework in Frameworks */, - 0017973E107430D600F5D044 /* OpenGL.framework in Frameworks */, 0017973F107430D600F5D044 /* AudioUnit.framework in Frameworks */, 00179740107430D600F5D044 /* Carbon.framework in Frameworks */, 00179741107430D600F5D044 /* libSDL2.a in Frameworks */, @@ -1263,13 +1263,13 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + FA73672B19A54AC2004122E4 /* CoreVideo.framework in Frameworks */, 0017975E107431B300F5D044 /* Cocoa.framework in Frameworks */, 0017975F107431B300F5D044 /* CoreAudio.framework in Frameworks */, 00179760107431B300F5D044 /* ForceFeedback.framework in Frameworks */, 00179761107431B300F5D044 /* IOKit.framework in Frameworks */, 00179762107431B300F5D044 /* AudioToolbox.framework in Frameworks */, 00179763107431B300F5D044 /* CoreFoundation.framework in Frameworks */, - 00179764107431B300F5D044 /* OpenGL.framework in Frameworks */, 00179765107431B300F5D044 /* AudioUnit.framework in Frameworks */, 00179766107431B300F5D044 /* Carbon.framework in Frameworks */, 00179767107431B300F5D044 /* libSDL2.a in Frameworks */, @@ -1281,13 +1281,13 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + FA73673719A54AE3004122E4 /* CoreVideo.framework in Frameworks */, 0017977E107432AE00F5D044 /* Cocoa.framework in Frameworks */, 0017977F107432AE00F5D044 /* CoreAudio.framework in Frameworks */, 00179780107432AE00F5D044 /* ForceFeedback.framework in Frameworks */, 00179781107432AE00F5D044 /* IOKit.framework in Frameworks */, 00179782107432AE00F5D044 /* AudioToolbox.framework in Frameworks */, 00179783107432AE00F5D044 /* CoreFoundation.framework in Frameworks */, - 00179784107432AE00F5D044 /* OpenGL.framework in Frameworks */, 00179785107432AE00F5D044 /* AudioUnit.framework in Frameworks */, 00179786107432AE00F5D044 /* Carbon.framework in Frameworks */, 00179787107432AE00F5D044 /* libSDL2.a in Frameworks */, @@ -1299,13 +1299,13 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + FA73673819A54AE6004122E4 /* CoreVideo.framework in Frameworks */, 0017979E1074334C00F5D044 /* Cocoa.framework in Frameworks */, 0017979F1074334C00F5D044 /* CoreAudio.framework in Frameworks */, 001797A01074334C00F5D044 /* ForceFeedback.framework in Frameworks */, 001797A11074334C00F5D044 /* IOKit.framework in Frameworks */, 001797A21074334C00F5D044 /* AudioToolbox.framework in Frameworks */, 001797A31074334C00F5D044 /* CoreFoundation.framework in Frameworks */, - 001797A41074334C00F5D044 /* OpenGL.framework in Frameworks */, 001797A51074334C00F5D044 /* AudioUnit.framework in Frameworks */, 001797A61074334C00F5D044 /* Carbon.framework in Frameworks */, 001797A71074334C00F5D044 /* libSDL2.a in Frameworks */, @@ -1317,13 +1317,13 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + FA73673B19A54AED004122E4 /* CoreVideo.framework in Frameworks */, 001797C0107433C600F5D044 /* Cocoa.framework in Frameworks */, 001797C1107433C600F5D044 /* CoreAudio.framework in Frameworks */, 001797C2107433C600F5D044 /* ForceFeedback.framework in Frameworks */, 001797C3107433C600F5D044 /* IOKit.framework in Frameworks */, 001797C4107433C600F5D044 /* AudioToolbox.framework in Frameworks */, 001797C5107433C600F5D044 /* CoreFoundation.framework in Frameworks */, - 001797C6107433C600F5D044 /* OpenGL.framework in Frameworks */, 001797C7107433C600F5D044 /* AudioUnit.framework in Frameworks */, 001797C8107433C600F5D044 /* Carbon.framework in Frameworks */, 001797C9107433C600F5D044 /* libSDL2.a in Frameworks */, @@ -1334,13 +1334,13 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + FA73673E19A54AF6004122E4 /* CoreVideo.framework in Frameworks */, 001798021074355200F5D044 /* Cocoa.framework in Frameworks */, 001798031074355200F5D044 /* CoreAudio.framework in Frameworks */, 001798041074355200F5D044 /* ForceFeedback.framework in Frameworks */, 001798051074355200F5D044 /* IOKit.framework in Frameworks */, 001798061074355200F5D044 /* AudioToolbox.framework in Frameworks */, 001798071074355200F5D044 /* CoreFoundation.framework in Frameworks */, - 001798081074355200F5D044 /* OpenGL.framework in Frameworks */, 001798091074355200F5D044 /* AudioUnit.framework in Frameworks */, 0017980A1074355200F5D044 /* Carbon.framework in Frameworks */, 0017980B1074355200F5D044 /* libSDL2.a in Frameworks */, @@ -1351,13 +1351,13 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + FA73673F19A54AF8004122E4 /* CoreVideo.framework in Frameworks */, 001798841074392D00F5D044 /* Cocoa.framework in Frameworks */, 001798851074392D00F5D044 /* CoreAudio.framework in Frameworks */, 001798861074392D00F5D044 /* ForceFeedback.framework in Frameworks */, 001798871074392D00F5D044 /* IOKit.framework in Frameworks */, 001798881074392D00F5D044 /* AudioToolbox.framework in Frameworks */, 001798891074392D00F5D044 /* CoreFoundation.framework in Frameworks */, - 0017988A1074392D00F5D044 /* OpenGL.framework in Frameworks */, 0017988B1074392D00F5D044 /* AudioUnit.framework in Frameworks */, 0017988C1074392D00F5D044 /* Carbon.framework in Frameworks */, 0017988D1074392D00F5D044 /* libSDL2.a in Frameworks */, @@ -1368,13 +1368,13 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + FA73674219A54B01004122E4 /* CoreVideo.framework in Frameworks */, 001798A5107439DF00F5D044 /* Cocoa.framework in Frameworks */, 001798A6107439DF00F5D044 /* CoreAudio.framework in Frameworks */, 001798A7107439DF00F5D044 /* ForceFeedback.framework in Frameworks */, 001798A8107439DF00F5D044 /* IOKit.framework in Frameworks */, 001798A9107439DF00F5D044 /* AudioToolbox.framework in Frameworks */, 001798AA107439DF00F5D044 /* CoreFoundation.framework in Frameworks */, - 001798AB107439DF00F5D044 /* OpenGL.framework in Frameworks */, 001798AC107439DF00F5D044 /* AudioUnit.framework in Frameworks */, 001798AD107439DF00F5D044 /* Carbon.framework in Frameworks */, 001798AE107439DF00F5D044 /* libSDL2.a in Frameworks */, @@ -1385,13 +1385,13 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + FA73674619A54B0B004122E4 /* CoreVideo.framework in Frameworks */, 001798E210743BEC00F5D044 /* Cocoa.framework in Frameworks */, 001798E310743BEC00F5D044 /* CoreAudio.framework in Frameworks */, 001798E410743BEC00F5D044 /* ForceFeedback.framework in Frameworks */, 001798E510743BEC00F5D044 /* IOKit.framework in Frameworks */, 001798E610743BEC00F5D044 /* AudioToolbox.framework in Frameworks */, 001798E710743BEC00F5D044 /* CoreFoundation.framework in Frameworks */, - 001798E810743BEC00F5D044 /* OpenGL.framework in Frameworks */, 001798E910743BEC00F5D044 /* AudioUnit.framework in Frameworks */, 001798EA10743BEC00F5D044 /* Carbon.framework in Frameworks */, 001798EB10743BEC00F5D044 /* libSDL2.a in Frameworks */, @@ -1402,13 +1402,13 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + FA73674C19A54B1F004122E4 /* CoreVideo.framework in Frameworks */, 0017990610743F1000F5D044 /* Cocoa.framework in Frameworks */, 0017990710743F1000F5D044 /* CoreAudio.framework in Frameworks */, 0017990810743F1000F5D044 /* ForceFeedback.framework in Frameworks */, 0017990910743F1000F5D044 /* IOKit.framework in Frameworks */, 0017990A10743F1000F5D044 /* AudioToolbox.framework in Frameworks */, 0017990B10743F1000F5D044 /* CoreFoundation.framework in Frameworks */, - 0017990C10743F1000F5D044 /* OpenGL.framework in Frameworks */, 0017990D10743F1000F5D044 /* AudioUnit.framework in Frameworks */, 0017990E10743F1000F5D044 /* Carbon.framework in Frameworks */, 0017990F10743F1000F5D044 /* libSDL2.a in Frameworks */, @@ -1420,13 +1420,13 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + FA73675219A54B32004122E4 /* CoreVideo.framework in Frameworks */, 0017992810743FB700F5D044 /* Cocoa.framework in Frameworks */, 0017992910743FB700F5D044 /* CoreAudio.framework in Frameworks */, 0017992A10743FB700F5D044 /* ForceFeedback.framework in Frameworks */, 0017992B10743FB700F5D044 /* IOKit.framework in Frameworks */, 0017992C10743FB700F5D044 /* AudioToolbox.framework in Frameworks */, 0017992D10743FB700F5D044 /* CoreFoundation.framework in Frameworks */, - 0017992E10743FB700F5D044 /* OpenGL.framework in Frameworks */, 0017992F10743FB700F5D044 /* AudioUnit.framework in Frameworks */, 0017993010743FB700F5D044 /* Carbon.framework in Frameworks */, 0017993110743FB700F5D044 /* libSDL2.a in Frameworks */, @@ -1438,13 +1438,13 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + FA73672F19A54ACC004122E4 /* CoreVideo.framework in Frameworks */, 002F340B09CA1BFF00EBEB88 /* Cocoa.framework in Frameworks */, 002A866B10730548007319AE /* CoreAudio.framework in Frameworks */, 002A866C10730548007319AE /* ForceFeedback.framework in Frameworks */, 002A866D10730548007319AE /* IOKit.framework in Frameworks */, 002A86BF10730595007319AE /* AudioToolbox.framework in Frameworks */, 002A86C010730595007319AE /* CoreFoundation.framework in Frameworks */, - 002A8702107305CF007319AE /* OpenGL.framework in Frameworks */, 002A872410730624007319AE /* AudioUnit.framework in Frameworks */, 002A874910730676007319AE /* Carbon.framework in Frameworks */, 001794D11073667B00F5D044 /* libSDL2.a in Frameworks */, @@ -1455,13 +1455,13 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + FA73673619A54AE1004122E4 /* CoreVideo.framework in Frameworks */, 002F342A09CA1F0300EBEB88 /* Cocoa.framework in Frameworks */, 002A866210730547007319AE /* CoreAudio.framework in Frameworks */, 002A866310730547007319AE /* ForceFeedback.framework in Frameworks */, 002A866410730547007319AE /* IOKit.framework in Frameworks */, 002A86B910730594007319AE /* AudioToolbox.framework in Frameworks */, 002A86BA10730594007319AE /* CoreFoundation.framework in Frameworks */, - 002A86FF107305CE007319AE /* OpenGL.framework in Frameworks */, 002A872110730624007319AE /* AudioUnit.framework in Frameworks */, 002A874610730676007319AE /* Carbon.framework in Frameworks */, 001794D41073668800F5D044 /* libSDL2.a in Frameworks */, @@ -1472,13 +1472,13 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + FA73674019A54AFB004122E4 /* CoreVideo.framework in Frameworks */, 002F344609CA1FB300EBEB88 /* Cocoa.framework in Frameworks */, 002A868010730549007319AE /* CoreAudio.framework in Frameworks */, 002A868110730549007319AE /* ForceFeedback.framework in Frameworks */, 002A868210730549007319AE /* IOKit.framework in Frameworks */, 002A86CD10730595007319AE /* AudioToolbox.framework in Frameworks */, 002A86CE10730596007319AE /* CoreFoundation.framework in Frameworks */, - 002A8709107305CF007319AE /* OpenGL.framework in Frameworks */, 002A872B10730624007319AE /* AudioUnit.framework in Frameworks */, 002A875010730677007319AE /* Carbon.framework in Frameworks */, 001794D91073669E00F5D044 /* libSDL2.a in Frameworks */, @@ -1489,13 +1489,13 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + FA73674119A54AFE004122E4 /* CoreVideo.framework in Frameworks */, 002F346309CA204F00EBEB88 /* Cocoa.framework in Frameworks */, 002A868610730549007319AE /* CoreAudio.framework in Frameworks */, 002A868710730549007319AE /* ForceFeedback.framework in Frameworks */, 002A868810730549007319AE /* IOKit.framework in Frameworks */, 002A86D110730596007319AE /* AudioToolbox.framework in Frameworks */, 002A86D210730596007319AE /* CoreFoundation.framework in Frameworks */, - 002A870B107305CF007319AE /* OpenGL.framework in Frameworks */, 002A872D10730624007319AE /* AudioUnit.framework in Frameworks */, 002A875210730677007319AE /* Carbon.framework in Frameworks */, 001794DB107366A700F5D044 /* libSDL2.a in Frameworks */, @@ -1506,6 +1506,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + FA73674B19A54B1B004122E4 /* CoreVideo.framework in Frameworks */, DB166D7116A1CFB200A1396C /* AudioToolbox.framework in Frameworks */, DB166D7216A1CFB200A1396C /* AudioUnit.framework in Frameworks */, DB166D7316A1CFB200A1396C /* Carbon.framework in Frameworks */, @@ -1514,7 +1515,6 @@ DB166D7616A1CFB200A1396C /* CoreFoundation.framework in Frameworks */, DB166D7716A1CFB200A1396C /* ForceFeedback.framework in Frameworks */, DB166D7816A1CFB200A1396C /* IOKit.framework in Frameworks */, - DB166D7916A1CFB200A1396C /* OpenGL.framework in Frameworks */, DB166D7A16A1CFD500A1396C /* libSDL2.a in Frameworks */, DB166DA416A1D21700A1396C /* libSDL_test.a in Frameworks */, ); @@ -1524,13 +1524,13 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + FA73673119A54AD3004122E4 /* CoreVideo.framework in Frameworks */, BBFC08C0164C6862003E6A99 /* Cocoa.framework in Frameworks */, BBFC08C1164C6862003E6A99 /* CoreAudio.framework in Frameworks */, BBFC08C2164C6862003E6A99 /* ForceFeedback.framework in Frameworks */, BBFC08C3164C6862003E6A99 /* IOKit.framework in Frameworks */, BBFC08C4164C6862003E6A99 /* AudioToolbox.framework in Frameworks */, BBFC08C5164C6862003E6A99 /* CoreFoundation.framework in Frameworks */, - BBFC08C6164C6862003E6A99 /* OpenGL.framework in Frameworks */, BBFC08C7164C6862003E6A99 /* AudioUnit.framework in Frameworks */, BBFC08C8164C6862003E6A99 /* Carbon.framework in Frameworks */, BBFC08C9164C6862003E6A99 /* libSDL2.a in Frameworks */, @@ -1541,6 +1541,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + FA73672319A54A90004122E4 /* CoreVideo.framework in Frameworks */, 002F33C109CA188600EBEB88 /* Cocoa.framework in Frameworks */, 002A863010730405007319AE /* libSDL2.a in Frameworks */, 002A864D10730546007319AE /* CoreAudio.framework in Frameworks */, @@ -1548,7 +1549,6 @@ 002A864F10730546007319AE /* IOKit.framework in Frameworks */, 002A86AB10730594007319AE /* AudioToolbox.framework in Frameworks */, 002A86AC10730594007319AE /* CoreFoundation.framework in Frameworks */, - 002A86F8107305CE007319AE /* OpenGL.framework in Frameworks */, 002A871A10730623007319AE /* AudioUnit.framework in Frameworks */, 002A873F10730675007319AE /* Carbon.framework in Frameworks */, ); @@ -1558,13 +1558,13 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + FA73672819A54AB6004122E4 /* CoreVideo.framework in Frameworks */, 002F33BF09CA188600EBEB88 /* Cocoa.framework in Frameworks */, 002A865310730547007319AE /* CoreAudio.framework in Frameworks */, 002A865410730547007319AE /* ForceFeedback.framework in Frameworks */, 002A865510730547007319AE /* IOKit.framework in Frameworks */, 002A86AF10730594007319AE /* AudioToolbox.framework in Frameworks */, 002A86B010730594007319AE /* CoreFoundation.framework in Frameworks */, - 002A86FA107305CE007319AE /* OpenGL.framework in Frameworks */, 002A871C10730623007319AE /* AudioUnit.framework in Frameworks */, 002A874110730676007319AE /* Carbon.framework in Frameworks */, 002A875E10730745007319AE /* libSDL2.a in Frameworks */, @@ -1575,13 +1575,13 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + FA73672E19A54ACA004122E4 /* CoreVideo.framework in Frameworks */, 002F33BC09CA188600EBEB88 /* Cocoa.framework in Frameworks */, 002A866E10730548007319AE /* CoreAudio.framework in Frameworks */, 002A866F10730548007319AE /* ForceFeedback.framework in Frameworks */, 002A867010730548007319AE /* IOKit.framework in Frameworks */, 002A86C110730595007319AE /* AudioToolbox.framework in Frameworks */, 002A86C210730595007319AE /* CoreFoundation.framework in Frameworks */, - 002A8703107305CF007319AE /* OpenGL.framework in Frameworks */, 002A872510730624007319AE /* AudioUnit.framework in Frameworks */, 002A874A10730676007319AE /* Carbon.framework in Frameworks */, 001794D01073667700F5D044 /* libSDL2.a in Frameworks */, @@ -1592,13 +1592,13 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + FA73674F19A54B28004122E4 /* CoreVideo.framework in Frameworks */, 002F33B809CA188600EBEB88 /* Cocoa.framework in Frameworks */, 002A868F1073054A007319AE /* CoreAudio.framework in Frameworks */, 002A86901073054A007319AE /* ForceFeedback.framework in Frameworks */, 002A86911073054A007319AE /* IOKit.framework in Frameworks */, 002A86D710730596007319AE /* AudioToolbox.framework in Frameworks */, 002A86D810730596007319AE /* CoreFoundation.framework in Frameworks */, - 002A870E107305CF007319AE /* OpenGL.framework in Frameworks */, 002A873010730625007319AE /* AudioUnit.framework in Frameworks */, 002A875510730677007319AE /* Carbon.framework in Frameworks */, 001794DE107366B900F5D044 /* libSDL2.a in Frameworks */, @@ -1609,13 +1609,13 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + FA73673919A54AE8004122E4 /* CoreVideo.framework in Frameworks */, 002F33B709CA188600EBEB88 /* Cocoa.framework in Frameworks */, 002A867410730548007319AE /* CoreAudio.framework in Frameworks */, 002A867510730548007319AE /* ForceFeedback.framework in Frameworks */, 002A867610730548007319AE /* IOKit.framework in Frameworks */, 002A86C510730595007319AE /* AudioToolbox.framework in Frameworks */, 002A86C610730595007319AE /* CoreFoundation.framework in Frameworks */, - 002A8705107305CF007319AE /* OpenGL.framework in Frameworks */, 002A872710730624007319AE /* AudioUnit.framework in Frameworks */, 002A874C10730676007319AE /* Carbon.framework in Frameworks */, 001794D51073668D00F5D044 /* libSDL2.a in Frameworks */, @@ -1626,13 +1626,13 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + FA73673A19A54AEB004122E4 /* CoreVideo.framework in Frameworks */, 002F33B509CA188600EBEB88 /* Cocoa.framework in Frameworks */, 002A867710730548007319AE /* CoreAudio.framework in Frameworks */, 002A867810730548007319AE /* ForceFeedback.framework in Frameworks */, 002A867910730549007319AE /* IOKit.framework in Frameworks */, 002A86C710730595007319AE /* AudioToolbox.framework in Frameworks */, 002A86C810730595007319AE /* CoreFoundation.framework in Frameworks */, - 002A8706107305CF007319AE /* OpenGL.framework in Frameworks */, 002A872810730624007319AE /* AudioUnit.framework in Frameworks */, 002A874D10730677007319AE /* Carbon.framework in Frameworks */, 001794D61073669200F5D044 /* libSDL2.a in Frameworks */, @@ -1643,13 +1643,13 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + FA73673C19A54AF0004122E4 /* CoreVideo.framework in Frameworks */, 002F33B609CA188600EBEB88 /* Cocoa.framework in Frameworks */, 002A867A10730549007319AE /* CoreAudio.framework in Frameworks */, 002A867B10730549007319AE /* ForceFeedback.framework in Frameworks */, 002A867C10730549007319AE /* IOKit.framework in Frameworks */, 002A86C910730595007319AE /* AudioToolbox.framework in Frameworks */, 002A86CA10730595007319AE /* CoreFoundation.framework in Frameworks */, - 002A8707107305CF007319AE /* OpenGL.framework in Frameworks */, 002A872910730624007319AE /* AudioUnit.framework in Frameworks */, 002A874E10730677007319AE /* Carbon.framework in Frameworks */, 001794D71073669700F5D044 /* libSDL2.a in Frameworks */, @@ -1660,13 +1660,13 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + FA73674919A54B16004122E4 /* CoreVideo.framework in Frameworks */, 002F33B209CA188600EBEB88 /* Cocoa.framework in Frameworks */, 002A868910730549007319AE /* CoreAudio.framework in Frameworks */, 002A868A10730549007319AE /* ForceFeedback.framework in Frameworks */, 002A868B1073054A007319AE /* IOKit.framework in Frameworks */, 002A86D310730596007319AE /* AudioToolbox.framework in Frameworks */, 002A86D410730596007319AE /* CoreFoundation.framework in Frameworks */, - 002A870C107305CF007319AE /* OpenGL.framework in Frameworks */, 002A872E10730624007319AE /* AudioUnit.framework in Frameworks */, 002A875310730677007319AE /* Carbon.framework in Frameworks */, 001794DC107366AC00F5D044 /* libSDL2.a in Frameworks */, @@ -1677,13 +1677,13 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + FA73675019A54B2B004122E4 /* CoreVideo.framework in Frameworks */, 002F33B009CA188600EBEB88 /* Cocoa.framework in Frameworks */, 002A86981073054A007319AE /* CoreAudio.framework in Frameworks */, 002A86991073054A007319AE /* ForceFeedback.framework in Frameworks */, 002A869A1073054A007319AE /* IOKit.framework in Frameworks */, 002A86DD10730596007319AE /* AudioToolbox.framework in Frameworks */, 002A86DE10730596007319AE /* CoreFoundation.framework in Frameworks */, - 002A8711107305CF007319AE /* OpenGL.framework in Frameworks */, 002A873310730625007319AE /* AudioUnit.framework in Frameworks */, 002A875810730678007319AE /* Carbon.framework in Frameworks */, 001794DF107366BD00F5D044 /* libSDL2.a in Frameworks */, @@ -1694,13 +1694,13 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + FA73675119A54B2F004122E4 /* CoreVideo.framework in Frameworks */, 002F33AF09CA188600EBEB88 /* Cocoa.framework in Frameworks */, 002A86951073054A007319AE /* CoreAudio.framework in Frameworks */, 002A86961073054A007319AE /* ForceFeedback.framework in Frameworks */, 002A86971073054A007319AE /* IOKit.framework in Frameworks */, 002A86DB10730596007319AE /* AudioToolbox.framework in Frameworks */, 002A86DC10730596007319AE /* CoreFoundation.framework in Frameworks */, - 002A8710107305CF007319AE /* OpenGL.framework in Frameworks */, 002A873210730625007319AE /* AudioUnit.framework in Frameworks */, 002A875710730678007319AE /* Carbon.framework in Frameworks */, 001794E0107366C100F5D044 /* libSDL2.a in Frameworks */, @@ -1711,13 +1711,13 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + FA73675319A54B35004122E4 /* CoreVideo.framework in Frameworks */, 002F33AA09CA188600EBEB88 /* Cocoa.framework in Frameworks */, 002A864110730546007319AE /* CoreAudio.framework in Frameworks */, 002A864210730546007319AE /* ForceFeedback.framework in Frameworks */, 002A864310730546007319AE /* IOKit.framework in Frameworks */, 002A86A310730593007319AE /* AudioToolbox.framework in Frameworks */, 002A86A410730593007319AE /* CoreFoundation.framework in Frameworks */, - 002A86F4107305CE007319AE /* OpenGL.framework in Frameworks */, 002A871610730623007319AE /* AudioUnit.framework in Frameworks */, 002A873B10730675007319AE /* Carbon.framework in Frameworks */, 001794E5107366D900F5D044 /* libSDL2.a in Frameworks */, @@ -1728,13 +1728,13 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + FA73672C19A54AC5004122E4 /* CoreVideo.framework in Frameworks */, DB0F48DD17CA51E5008798C5 /* Cocoa.framework in Frameworks */, DB0F48DE17CA51E5008798C5 /* CoreAudio.framework in Frameworks */, DB0F48DF17CA51E5008798C5 /* ForceFeedback.framework in Frameworks */, DB0F48E017CA51E5008798C5 /* IOKit.framework in Frameworks */, DB0F48E117CA51E5008798C5 /* AudioToolbox.framework in Frameworks */, DB0F48E217CA51E5008798C5 /* CoreFoundation.framework in Frameworks */, - DB0F48E317CA51E5008798C5 /* OpenGL.framework in Frameworks */, DB0F48E417CA51E5008798C5 /* AudioUnit.framework in Frameworks */, DB0F48E517CA51E5008798C5 /* Carbon.framework in Frameworks */, DB0F48E617CA51E5008798C5 /* libSDL2.a in Frameworks */, @@ -1745,13 +1745,13 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + FA73673019A54AD0004122E4 /* CoreVideo.framework in Frameworks */, DB0F48F317CA5212008798C5 /* Cocoa.framework in Frameworks */, DB0F48F417CA5212008798C5 /* CoreAudio.framework in Frameworks */, DB0F48F517CA5212008798C5 /* ForceFeedback.framework in Frameworks */, DB0F48F617CA5212008798C5 /* IOKit.framework in Frameworks */, DB0F48F717CA5212008798C5 /* AudioToolbox.framework in Frameworks */, DB0F48F817CA5212008798C5 /* CoreFoundation.framework in Frameworks */, - DB0F48F917CA5212008798C5 /* OpenGL.framework in Frameworks */, DB0F48FA17CA5212008798C5 /* AudioUnit.framework in Frameworks */, DB0F48FB17CA5212008798C5 /* Carbon.framework in Frameworks */, DB0F48FC17CA5212008798C5 /* libSDL2.a in Frameworks */, @@ -1769,13 +1769,13 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + FA73673219A54AD5004122E4 /* CoreVideo.framework in Frameworks */, DB166DB116A1D2F600A1396C /* Cocoa.framework in Frameworks */, DB166DB216A1D2F600A1396C /* CoreAudio.framework in Frameworks */, DB166DB316A1D2F600A1396C /* ForceFeedback.framework in Frameworks */, DB166DB416A1D2F600A1396C /* IOKit.framework in Frameworks */, DB166DB516A1D2F600A1396C /* AudioToolbox.framework in Frameworks */, DB166DB616A1D2F600A1396C /* CoreFoundation.framework in Frameworks */, - DB166DB716A1D2F600A1396C /* OpenGL.framework in Frameworks */, DB166DB816A1D2F600A1396C /* AudioUnit.framework in Frameworks */, DB166DB916A1D2F600A1396C /* Carbon.framework in Frameworks */, DB166DBA16A1D2F600A1396C /* libSDL2.a in Frameworks */, @@ -1786,13 +1786,13 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + FA73673D19A54AF3004122E4 /* CoreVideo.framework in Frameworks */, DB166DC816A1D36A00A1396C /* Cocoa.framework in Frameworks */, DB166DC916A1D36A00A1396C /* CoreAudio.framework in Frameworks */, DB166DCA16A1D36A00A1396C /* ForceFeedback.framework in Frameworks */, DB166DCB16A1D36A00A1396C /* IOKit.framework in Frameworks */, DB166DCC16A1D36A00A1396C /* AudioToolbox.framework in Frameworks */, DB166DCD16A1D36A00A1396C /* CoreFoundation.framework in Frameworks */, - DB166DCE16A1D36A00A1396C /* OpenGL.framework in Frameworks */, DB166DCF16A1D36A00A1396C /* AudioUnit.framework in Frameworks */, DB166DD016A1D36A00A1396C /* Carbon.framework in Frameworks */, DB166DD116A1D36A00A1396C /* libSDL2.a in Frameworks */, @@ -1803,13 +1803,13 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + FA73674319A54B04004122E4 /* CoreVideo.framework in Frameworks */, DB166DE016A1D50C00A1396C /* Cocoa.framework in Frameworks */, DB166DE116A1D50C00A1396C /* CoreAudio.framework in Frameworks */, DB166DE216A1D50C00A1396C /* ForceFeedback.framework in Frameworks */, DB166DE316A1D50C00A1396C /* IOKit.framework in Frameworks */, DB166DE416A1D50C00A1396C /* AudioToolbox.framework in Frameworks */, DB166DE516A1D50C00A1396C /* CoreFoundation.framework in Frameworks */, - DB166DE616A1D50C00A1396C /* OpenGL.framework in Frameworks */, DB166DE716A1D50C00A1396C /* AudioUnit.framework in Frameworks */, DB166DE816A1D50C00A1396C /* Carbon.framework in Frameworks */, DB166DE916A1D50C00A1396C /* libSDL2.a in Frameworks */, @@ -1821,13 +1821,13 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + FA73674419A54B06004122E4 /* CoreVideo.framework in Frameworks */, DB166DF716A1D57C00A1396C /* Cocoa.framework in Frameworks */, DB166DF816A1D57C00A1396C /* CoreAudio.framework in Frameworks */, DB166DF916A1D57C00A1396C /* ForceFeedback.framework in Frameworks */, DB166DFA16A1D57C00A1396C /* IOKit.framework in Frameworks */, DB166DFB16A1D57C00A1396C /* AudioToolbox.framework in Frameworks */, DB166DFC16A1D57C00A1396C /* CoreFoundation.framework in Frameworks */, - DB166DFD16A1D57C00A1396C /* OpenGL.framework in Frameworks */, DB166DFE16A1D57C00A1396C /* AudioUnit.framework in Frameworks */, DB166DFF16A1D57C00A1396C /* Carbon.framework in Frameworks */, DB166E0016A1D57C00A1396C /* libSDL2.a in Frameworks */, @@ -1839,13 +1839,13 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + FA73674519A54B09004122E4 /* CoreVideo.framework in Frameworks */, DB166E0E16A1D5AD00A1396C /* Cocoa.framework in Frameworks */, DB166E0F16A1D5AD00A1396C /* CoreAudio.framework in Frameworks */, DB166E1016A1D5AD00A1396C /* ForceFeedback.framework in Frameworks */, DB166E1116A1D5AD00A1396C /* IOKit.framework in Frameworks */, DB166E1216A1D5AD00A1396C /* AudioToolbox.framework in Frameworks */, DB166E1316A1D5AD00A1396C /* CoreFoundation.framework in Frameworks */, - DB166E1416A1D5AD00A1396C /* OpenGL.framework in Frameworks */, DB166E1516A1D5AD00A1396C /* AudioUnit.framework in Frameworks */, DB166E1616A1D5AD00A1396C /* Carbon.framework in Frameworks */, DB166E1716A1D5AD00A1396C /* libSDL2.a in Frameworks */, @@ -1857,13 +1857,13 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + FA73674719A54B0F004122E4 /* CoreVideo.framework in Frameworks */, DB166E2B16A1D64D00A1396C /* Cocoa.framework in Frameworks */, DB166E2C16A1D64D00A1396C /* CoreAudio.framework in Frameworks */, DB166E2D16A1D64D00A1396C /* ForceFeedback.framework in Frameworks */, DB166E2E16A1D64D00A1396C /* IOKit.framework in Frameworks */, DB166E2F16A1D64D00A1396C /* AudioToolbox.framework in Frameworks */, DB166E3016A1D64D00A1396C /* CoreFoundation.framework in Frameworks */, - DB166E3116A1D64D00A1396C /* OpenGL.framework in Frameworks */, DB166E3216A1D64D00A1396C /* AudioUnit.framework in Frameworks */, DB166E3316A1D64D00A1396C /* Carbon.framework in Frameworks */, DB166E3416A1D64D00A1396C /* libSDL2.a in Frameworks */, @@ -1874,13 +1874,13 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + FA73674819A54B13004122E4 /* CoreVideo.framework in Frameworks */, DB166E4116A1D69000A1396C /* Cocoa.framework in Frameworks */, DB166E4216A1D69000A1396C /* CoreAudio.framework in Frameworks */, DB166E4316A1D69000A1396C /* ForceFeedback.framework in Frameworks */, DB166E4416A1D69000A1396C /* IOKit.framework in Frameworks */, DB166E4516A1D69000A1396C /* AudioToolbox.framework in Frameworks */, DB166E4616A1D69000A1396C /* CoreFoundation.framework in Frameworks */, - DB166E4716A1D69000A1396C /* OpenGL.framework in Frameworks */, DB166E4816A1D69000A1396C /* AudioUnit.framework in Frameworks */, DB166E4916A1D69000A1396C /* Carbon.framework in Frameworks */, DB166E4A16A1D69000A1396C /* libSDL2.a in Frameworks */, @@ -1892,13 +1892,13 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + FA73674A19A54B19004122E4 /* CoreVideo.framework in Frameworks */, DB166E5B16A1D6F300A1396C /* Cocoa.framework in Frameworks */, DB166E5C16A1D6F300A1396C /* CoreAudio.framework in Frameworks */, DB166E5D16A1D6F300A1396C /* ForceFeedback.framework in Frameworks */, DB166E5E16A1D6F300A1396C /* IOKit.framework in Frameworks */, DB166E5F16A1D6F300A1396C /* AudioToolbox.framework in Frameworks */, DB166E6016A1D6F300A1396C /* CoreFoundation.framework in Frameworks */, - DB166E6116A1D6F300A1396C /* OpenGL.framework in Frameworks */, DB166E6216A1D6F300A1396C /* AudioUnit.framework in Frameworks */, DB166E6316A1D6F300A1396C /* Carbon.framework in Frameworks */, DB166E6416A1D6F300A1396C /* libSDL2.a in Frameworks */, @@ -1909,13 +1909,13 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + FA73674D19A54B22004122E4 /* CoreVideo.framework in Frameworks */, DB166E7116A1D78400A1396C /* Cocoa.framework in Frameworks */, DB166E7216A1D78400A1396C /* CoreAudio.framework in Frameworks */, DB166E7316A1D78400A1396C /* ForceFeedback.framework in Frameworks */, DB166E7416A1D78400A1396C /* IOKit.framework in Frameworks */, DB166E7516A1D78400A1396C /* AudioToolbox.framework in Frameworks */, DB166E7616A1D78400A1396C /* CoreFoundation.framework in Frameworks */, - DB166E7716A1D78400A1396C /* OpenGL.framework in Frameworks */, DB166E7816A1D78400A1396C /* AudioUnit.framework in Frameworks */, DB166E7916A1D78400A1396C /* Carbon.framework in Frameworks */, DB166E7A16A1D78400A1396C /* libSDL2.a in Frameworks */, @@ -1926,47 +1926,30 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + FA73674E19A54B25004122E4 /* CoreVideo.framework in Frameworks */, DB166E8416A1D78C00A1396C /* Cocoa.framework in Frameworks */, DB166E8516A1D78C00A1396C /* CoreAudio.framework in Frameworks */, DB166E8616A1D78C00A1396C /* ForceFeedback.framework in Frameworks */, DB166E8716A1D78C00A1396C /* IOKit.framework in Frameworks */, DB166E8816A1D78C00A1396C /* AudioToolbox.framework in Frameworks */, DB166E8916A1D78C00A1396C /* CoreFoundation.framework in Frameworks */, - DB166E8A16A1D78C00A1396C /* OpenGL.framework in Frameworks */, DB166E8B16A1D78C00A1396C /* AudioUnit.framework in Frameworks */, DB166E8C16A1D78C00A1396C /* Carbon.framework in Frameworks */, DB166E8D16A1D78C00A1396C /* libSDL2.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; - DB89957018A19ABA0092407C /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - DB89957118A19ABA0092407C /* Cocoa.framework in Frameworks */, - DB89957218A19ABA0092407C /* CoreAudio.framework in Frameworks */, - DB89957318A19ABA0092407C /* ForceFeedback.framework in Frameworks */, - DB89957418A19ABA0092407C /* IOKit.framework in Frameworks */, - DB89957518A19ABA0092407C /* AudioToolbox.framework in Frameworks */, - DB89957618A19ABA0092407C /* CoreFoundation.framework in Frameworks */, - DB89957718A19ABA0092407C /* OpenGL.framework in Frameworks */, - DB89957818A19ABA0092407C /* AudioUnit.framework in Frameworks */, - DB89957918A19ABA0092407C /* Carbon.framework in Frameworks */, - DB89957A18A19ABA0092407C /* libSDL2.a in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; DB445EE918184B7000B306B0 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + FA73672D19A54AC7004122E4 /* CoreVideo.framework in Frameworks */, DB445EEA18184B7000B306B0 /* Cocoa.framework in Frameworks */, DB445EEB18184B7000B306B0 /* CoreAudio.framework in Frameworks */, DB445EEC18184B7000B306B0 /* ForceFeedback.framework in Frameworks */, DB445EED18184B7000B306B0 /* IOKit.framework in Frameworks */, DB445EEE18184B7000B306B0 /* AudioToolbox.framework in Frameworks */, DB445EEF18184B7000B306B0 /* CoreFoundation.framework in Frameworks */, - DB445EF018184B7000B306B0 /* OpenGL.framework in Frameworks */, DB445EF118184B7000B306B0 /* AudioUnit.framework in Frameworks */, DB445EF218184B7000B306B0 /* Carbon.framework in Frameworks */, DB445EF318184B7000B306B0 /* libSDL2.a in Frameworks */, @@ -1974,12 +1957,30 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + DB89957018A19ABA0092407C /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + FA73673519A54ADE004122E4 /* CoreVideo.framework in Frameworks */, + DB89957118A19ABA0092407C /* Cocoa.framework in Frameworks */, + DB89957218A19ABA0092407C /* CoreAudio.framework in Frameworks */, + DB89957318A19ABA0092407C /* ForceFeedback.framework in Frameworks */, + DB89957418A19ABA0092407C /* IOKit.framework in Frameworks */, + DB89957518A19ABA0092407C /* AudioToolbox.framework in Frameworks */, + DB89957618A19ABA0092407C /* CoreFoundation.framework in Frameworks */, + DB89957818A19ABA0092407C /* AudioUnit.framework in Frameworks */, + DB89957918A19ABA0092407C /* Carbon.framework in Frameworks */, + DB89957A18A19ABA0092407C /* libSDL2.a in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ 002F33A209CA183B00EBEB88 /* Linked Frameworks */ = { isa = PBXGroup; children = ( + FA73672219A54A90004122E4 /* CoreVideo.framework */, 002A869F10730593007319AE /* AudioToolbox.framework */, 002A871410730623007319AE /* AudioUnit.framework */, 002A873910730675007319AE /* Carbon.framework */, @@ -1988,7 +1989,6 @@ 002A86A010730593007319AE /* CoreFoundation.framework */, 002A863C10730545007319AE /* ForceFeedback.framework */, 002A863D10730545007319AE /* IOKit.framework */, - 002A86F2107305CE007319AE /* OpenGL.framework */, ); name = "Linked Frameworks"; sourceTree = ""; @@ -2894,22 +2894,6 @@ productReference = DB166E9116A1D78C00A1396C /* teststreaming */; productType = "com.apple.product-type.tool"; }; - DB89956D18A19ABA0092407C /* testhotplug */ = { - isa = PBXNativeTarget; - buildConfigurationList = DB89957B18A19ABA0092407C /* Build configuration list for PBXNativeTarget "testhotplug" */; - buildPhases = ( - DB89956E18A19ABA0092407C /* Sources */, - DB89957018A19ABA0092407C /* Frameworks */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = testhotplug; - productName = testalpha; - productReference = DB89957E18A19ABA0092407C /* testhotplug */; - productType = "com.apple.product-type.tool"; - }; DB445EE618184B7000B306B0 /* testdropfile */ = { isa = PBXNativeTarget; buildConfigurationList = DB445EF518184B7000B306B0 /* Build configuration list for PBXNativeTarget "testdropfile" */; @@ -2926,6 +2910,22 @@ productReference = DB445EF818184B7000B306B0 /* testdropfile.app */; productType = "com.apple.product-type.application"; }; + DB89956D18A19ABA0092407C /* testhotplug */ = { + isa = PBXNativeTarget; + buildConfigurationList = DB89957B18A19ABA0092407C /* Build configuration list for PBXNativeTarget "testhotplug" */; + buildPhases = ( + DB89956E18A19ABA0092407C /* Sources */, + DB89957018A19ABA0092407C /* Frameworks */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = testhotplug; + productName = testalpha; + productReference = DB89957E18A19ABA0092407C /* testhotplug */; + productType = "com.apple.product-type.tool"; + }; /* End PBXNativeTarget section */ /* Begin PBXProject section */ @@ -3406,14 +3406,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - DB89956E18A19ABA0092407C /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - DB89958418A19B130092407C /* testhotplug.c in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; DB445EE718184B7000B306B0 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; @@ -3422,6 +3414,14 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + DB89956E18A19ABA0092407C /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + DB89958418A19B130092407C /* testhotplug.c in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ @@ -4309,20 +4309,6 @@ }; name = Release; }; - DB89957C18A19ABA0092407C /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - PRODUCT_NAME = testhotplug; - }; - name = Debug; - }; - DB89957D18A19ABA0092407C /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - PRODUCT_NAME = testhotplug; - }; - name = Release; - }; DB445EF618184B7000B306B0 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -4339,6 +4325,20 @@ }; name = Release; }; + DB89957C18A19ABA0092407C /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + PRODUCT_NAME = testhotplug; + }; + name = Debug; + }; + DB89957D18A19ABA0092407C /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + PRODUCT_NAME = testhotplug; + }; + name = Release; + }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ @@ -4756,15 +4756,6 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Debug; }; - DB89957B18A19ABA0092407C /* Build configuration list for PBXNativeTarget "testhotplug" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - DB89957C18A19ABA0092407C /* Debug */, - DB89957D18A19ABA0092407C /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Debug; - }; DB445EF518184B7000B306B0 /* Build configuration list for PBXNativeTarget "testdropfile" */ = { isa = XCConfigurationList; buildConfigurations = ( @@ -4774,6 +4765,15 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Debug; }; + DB89957B18A19ABA0092407C /* Build configuration list for PBXNativeTarget "testhotplug" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + DB89957C18A19ABA0092407C /* Debug */, + DB89957D18A19ABA0092407C /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Debug; + }; /* End XCConfigurationList section */ }; rootObject = 08FB7793FE84155DC02AAC07 /* Project object */; diff --git a/jni/SDL2-2.0.3/android-project/src/org/libsdl/app/SDLActivity.java b/jni/SDL2-2.0.3/android-project/src/org/libsdl/app/SDLActivity.java index 49a1d38f..f850bf52 100644 --- a/jni/SDL2-2.0.3/android-project/src/org/libsdl/app/SDLActivity.java +++ b/jni/SDL2-2.0.3/android-project/src/org/libsdl/app/SDLActivity.java @@ -1,10 +1,13 @@ package org.libsdl.app; +import java.io.IOException; +import java.io.InputStream; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; import java.util.Comparator; import java.util.List; +import java.lang.reflect.Method; import android.app.*; import android.content.*; @@ -14,13 +17,17 @@ import android.view.inputmethod.EditorInfo; import android.view.inputmethod.InputConnection; import android.view.inputmethod.InputMethodManager; import android.widget.AbsoluteLayout; +import android.widget.Button; +import android.widget.LinearLayout; +import android.widget.TextView; import android.os.*; import android.util.Log; +import android.util.SparseArray; import android.graphics.*; +import android.graphics.drawable.Drawable; import android.media.*; import android.hardware.*; - /** SDL Activity */ @@ -54,6 +61,16 @@ public class SDLActivity extends Activity { System.loadLibrary("main"); } + /** + * This method is called by SDL using JNI. + * This method is called by SDL before starting the native application thread. + * It can be overridden to provide the arguments after the application name. + * The default implementation returns an empty array. It never returns null. + * @return arguments for the native application. + */ + protected String[] getArguments() { + return new String[0]; + } public static void initialize() { // The static nature of the singleton and Android quirkyness force us to initialize everything here @@ -190,7 +207,7 @@ public class SDLActivity extends Activity { if (SDLActivity.mIsPaused && SDLActivity.mIsSurfaceReady && SDLActivity.mHasFocus) { SDLActivity.mIsPaused = false; SDLActivity.nativeResume(); - mSurface.enableSensor(Sensor.TYPE_ACCELEROMETER, true); + mSurface.handleResume(); } } @@ -205,6 +222,7 @@ public class SDLActivity extends Activity { static final int COMMAND_CHANGE_TITLE = 1; static final int COMMAND_UNUSED = 2; static final int COMMAND_TEXTEDIT_HIDE = 3; + static final int COMMAND_SET_KEEP_SCREEN_ON = 5; protected static final int COMMAND_USER = 0x8000; @@ -249,7 +267,18 @@ public class SDLActivity extends Activity { imm.hideSoftInputFromWindow(mTextEdit.getWindowToken(), 0); } break; - + case COMMAND_SET_KEEP_SCREEN_ON: + { + Window window = ((Activity) context).getWindow(); + if (window != null) { + if ((msg.obj instanceof Integer) && (((Integer) msg.obj).intValue() != 0)) { + window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON); + } else { + window.clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON); + } + } + break; + } default: if ((context instanceof SDLActivity) && !((SDLActivity) context).onUnhandledMessage(msg.arg1, msg.obj)) { Log.e(TAG, "error handling message, command is " + msg.arg1); @@ -270,7 +299,7 @@ public class SDLActivity extends Activity { } // C functions we call - public static native void nativeInit(); + public static native int nativeInit(Object arguments); public static native void nativeLowMemory(); public static native void nativeQuit(); public static native void nativePause(); @@ -296,25 +325,39 @@ public class SDLActivity extends Activity { int is_accelerometer, int nbuttons, int naxes, int nhats, int nballs); public static native int nativeRemoveJoystick(int device_id); + public static native String nativeGetHint(String name); + /** + * This method is called by SDL using JNI. + */ public static void flipBuffers() { SDLActivity.nativeFlipBuffers(); } + /** + * This method is called by SDL using JNI. + */ public static boolean setActivityTitle(String title) { // Called from SDLMain() thread and can't directly affect the view return mSingleton.sendCommand(COMMAND_CHANGE_TITLE, title); } + /** + * This method is called by SDL using JNI. + */ public static boolean sendMessage(int command, int param) { return mSingleton.sendCommand(command, Integer.valueOf(param)); } + /** + * This method is called by SDL using JNI. + */ public static Context getContext() { return mSingleton; } /** + * This method is called by SDL using JNI. * @return result of getSystemService(name) but executed on UI thread. */ public Object getSystemServiceFromUiThread(final String name) { @@ -380,16 +423,26 @@ public class SDLActivity extends Activity { } } + /** + * This method is called by SDL using JNI. + */ public static boolean showTextInput(int x, int y, int w, int h) { // Transfer the task to the main thread as a Runnable return mSingleton.commandHandler.post(new ShowTextInputTask(x, y, w, h)); } - + + /** + * This method is called by SDL using JNI. + */ public static Surface getNativeSurface() { return SDLActivity.mSurface.getNativeSurface(); } // Audio + + /** + * This method is called by SDL using JNI. + */ public static int audioInit(int sampleRate, boolean is16Bit, boolean isStereo, int desiredFrames) { int channelConfig = isStereo ? AudioFormat.CHANNEL_CONFIGURATION_STEREO : AudioFormat.CHANNEL_CONFIGURATION_MONO; int audioFormat = is16Bit ? AudioFormat.ENCODING_PCM_16BIT : AudioFormat.ENCODING_PCM_8BIT; @@ -423,7 +476,10 @@ public class SDLActivity extends Activity { return 0; } - + + /** + * This method is called by SDL using JNI. + */ public static void audioWriteShortBuffer(short[] buffer) { for (int i = 0; i < buffer.length; ) { int result = mAudioTrack.write(buffer, i, buffer.length - i); @@ -441,7 +497,10 @@ public class SDLActivity extends Activity { } } } - + + /** + * This method is called by SDL using JNI. + */ public static void audioWriteByteBuffer(byte[] buffer) { for (int i = 0; i < buffer.length; ) { int result = mAudioTrack.write(buffer, i, buffer.length - i); @@ -460,6 +519,9 @@ public class SDLActivity extends Activity { } } + /** + * This method is called by SDL using JNI. + */ public static void audioQuit() { if (mAudioTrack != null) { mAudioTrack.stop(); @@ -470,6 +532,7 @@ public class SDLActivity extends Activity { // Input /** + * This method is called by SDL using JNI. * @return an array which may be empty but is never null. */ public static int[] inputGetInputDeviceIds(int sources) { @@ -484,18 +547,274 @@ public class SDLActivity extends Activity { } return Arrays.copyOf(filtered, used); } - + // Joystick glue code, just a series of stubs that redirect to the SDLJoystickHandler instance public static boolean handleJoystickMotionEvent(MotionEvent event) { return mJoystickHandler.handleMotionEvent(event); } - + + /** + * This method is called by SDL using JNI. + */ public static void pollInputDevices() { if (SDLActivity.mSDLThread != null) { mJoystickHandler.pollInputDevices(); } } - + + // APK extension files support + + /** com.android.vending.expansion.zipfile.ZipResourceFile object or null. */ + private Object expansionFile; + + /** com.android.vending.expansion.zipfile.ZipResourceFile's getInputStream() or null. */ + private Method expansionFileMethod; + + /** + * This method is called by SDL using JNI. + */ + public InputStream openAPKExtensionInputStream(String fileName) throws IOException { + // Get a ZipResourceFile representing a merger of both the main and patch files + if (expansionFile == null) { + Integer mainVersion = Integer.valueOf(nativeGetHint("SDL_ANDROID_APK_EXPANSION_MAIN_FILE_VERSION")); + Integer patchVersion = Integer.valueOf(nativeGetHint("SDL_ANDROID_APK_EXPANSION_PATCH_FILE_VERSION")); + + try { + // To avoid direct dependency on Google APK extension library that is + // not a part of Android SDK we access it using reflection + expansionFile = Class.forName("com.android.vending.expansion.zipfile.APKExpansionSupport") + .getMethod("getAPKExpansionZipFile", Context.class, int.class, int.class) + .invoke(null, this, mainVersion, patchVersion); + + expansionFileMethod = expansionFile.getClass() + .getMethod("getInputStream", String.class); + } catch (Exception ex) { + ex.printStackTrace(); + expansionFile = null; + expansionFileMethod = null; + } + } + + // Get an input stream for a known file inside the expansion file ZIPs + InputStream fileStream; + try { + fileStream = (InputStream)expansionFileMethod.invoke(expansionFile, fileName); + } catch (Exception ex) { + ex.printStackTrace(); + fileStream = null; + } + + if (fileStream == null) { + throw new IOException(); + } + + return fileStream; + } + + // Messagebox + + /** Result of current messagebox. Also used for blocking the calling thread. */ + protected final int[] messageboxSelection = new int[1]; + + /** Id of current dialog. */ + protected int dialogs = 0; + + /** + * This method is called by SDL using JNI. + * Shows the messagebox from UI thread and block calling thread. + * buttonFlags, buttonIds and buttonTexts must have same length. + * @param buttonFlags array containing flags for every button. + * @param buttonIds array containing id for every button. + * @param buttonTexts array containing text for every button. + * @param colors null for default or array of length 5 containing colors. + * @return button id or -1. + */ + public int messageboxShowMessageBox( + final int flags, + final String title, + final String message, + final int[] buttonFlags, + final int[] buttonIds, + final String[] buttonTexts, + final int[] colors) { + + messageboxSelection[0] = -1; + + // sanity checks + + if ((buttonFlags.length != buttonIds.length) && (buttonIds.length != buttonTexts.length)) { + return -1; // implementation broken + } + + // collect arguments for Dialog + + final Bundle args = new Bundle(); + args.putInt("flags", flags); + args.putString("title", title); + args.putString("message", message); + args.putIntArray("buttonFlags", buttonFlags); + args.putIntArray("buttonIds", buttonIds); + args.putStringArray("buttonTexts", buttonTexts); + args.putIntArray("colors", colors); + + // trigger Dialog creation on UI thread + + runOnUiThread(new Runnable() { + @Override + public void run() { + showDialog(dialogs++, args); + } + }); + + // block the calling thread + + synchronized (messageboxSelection) { + try { + messageboxSelection.wait(); + } catch (InterruptedException ex) { + ex.printStackTrace(); + return -1; + } + } + + // return selected value + + return messageboxSelection[0]; + } + + @Override + protected Dialog onCreateDialog(int ignore, Bundle args) { + + // TODO set values from "flags" to messagebox dialog + + // get colors + + int[] colors = args.getIntArray("colors"); + int backgroundColor; + int textColor; + int buttonBorderColor; + int buttonBackgroundColor; + int buttonSelectedColor; + if (colors != null) { + int i = -1; + backgroundColor = colors[++i]; + textColor = colors[++i]; + buttonBorderColor = colors[++i]; + buttonBackgroundColor = colors[++i]; + buttonSelectedColor = colors[++i]; + } else { + backgroundColor = Color.TRANSPARENT; + textColor = Color.TRANSPARENT; + buttonBorderColor = Color.TRANSPARENT; + buttonBackgroundColor = Color.TRANSPARENT; + buttonSelectedColor = Color.TRANSPARENT; + } + + // create dialog with title and a listener to wake up calling thread + + final Dialog dialog = new Dialog(this); + dialog.setTitle(args.getString("title")); + dialog.setCancelable(false); + dialog.setOnDismissListener(new DialogInterface.OnDismissListener() { + @Override + public void onDismiss(DialogInterface unused) { + synchronized (messageboxSelection) { + messageboxSelection.notify(); + } + } + }); + + // create text + + TextView message = new TextView(this); + message.setGravity(Gravity.CENTER); + message.setText(args.getString("message")); + if (textColor != Color.TRANSPARENT) { + message.setTextColor(textColor); + } + + // create buttons + + int[] buttonFlags = args.getIntArray("buttonFlags"); + int[] buttonIds = args.getIntArray("buttonIds"); + String[] buttonTexts = args.getStringArray("buttonTexts"); + + final SparseArray