Skip to content
This repository has been archived by the owner. It is now read-only.
Permalink
Browse files

Merged changes from the main SDL codebase

  • Loading branch information
slouken committed Jul 13, 2010
2 parents e289891 + 111d7b4 commit da580619619bb9845284400dc5631d68f7b8ac5e
Showing with 6,370 additions and 3,330 deletions.
  1. +13 −1 .hgignore
  2. +1 −1 Makefile.in
  3. +4 −3 Makefile.pandora
  4. +24 −4 VisualC/SDL/{SDL.vcproj → SDL_VS2005.vcproj}
  5. +24 −4 VisualC/SDL/SDL_VS2008.vcproj
  6. +4 −4 VisualC/{SDL.sln → SDL_VS2005.sln}
  7. +321 −1 VisualC/SDL_VS2008.sln
  8. 0 VisualC/SDLmain/{SDLmain.vcproj → SDLmain_VS2005.vcproj}
  9. +3 −3 VisualC/SDLmain/SDLmain_VS2008.vcproj
  10. +4 −0 VisualC/tests/automated/{automated.vcproj → automated_VS2008.vcproj}
  11. 0 VisualC/tests/checkkeys/{checkkeys.vcproj → checkkeys_VS2005.vcproj}
  12. +208 −0 VisualC/tests/checkkeys/checkkeys_VS2008.vcproj
  13. 0 VisualC/tests/graywin/{graywin.vcproj → graywin_VS2005.vcproj}
  14. +208 −0 VisualC/tests/graywin/graywin_VS2008.vcproj
  15. 0 VisualC/tests/loopwave/{loopwave.vcproj → loopwave_VS2005.vcproj}
  16. +208 −0 VisualC/tests/loopwave/loopwave_VS2008.vcproj
  17. 0 VisualC/tests/testalpha/{testalpha.vcproj → testalpha_VS2005.vcproj}
  18. +208 −0 VisualC/tests/testalpha/testalpha_VS2008.vcproj
  19. 0 VisualC/tests/testdraw2/{testdraw2.vcproj → testdraw2_VS2005.vcproj}
  20. +212 −0 VisualC/tests/testdraw2/testdraw2_VS2008.vcproj
  21. 0 VisualC/tests/testfile/{testfile.vcproj → testfile_VS2005.vcproj}
  22. +208 −0 VisualC/tests/testfile/testfile_VS2008.vcproj
  23. 0 VisualC/tests/testgamma/{testgamma.vcproj → testgamma_VS2005.vcproj}
  24. +208 −0 VisualC/tests/testgamma/testgamma_VS2008.vcproj
  25. 0 VisualC/tests/testgl/{testgl.vcproj → testgl_VS2005.vcproj}
  26. +210 −0 VisualC/tests/testgl/testgl_VS2008.vcproj
  27. 0 VisualC/tests/testgl2/{testgl2.vcproj → testgl2_VS2005.vcproj}
  28. +214 −0 VisualC/tests/testgl2/testgl2_VS2008.vcproj
  29. 0 VisualC/tests/testjoystick/{testjoystick.vcproj → testjoystick_VS2005.vcproj}
  30. +208 −0 VisualC/tests/testjoystick/testjoystick_VS2008.vcproj
  31. 0 VisualC/tests/testoverlay/{testoverlay.vcproj → testoverlay_VS2005.vcproj}
  32. +208 −0 VisualC/tests/testoverlay/testoverlay_VS2008.vcproj
  33. 0 VisualC/tests/testoverlay2/{testoverlay2.vcproj → testoverlay2_VS2005.vcproj}
  34. +208 −0 VisualC/tests/testoverlay2/testoverlay2_VS2008.vcproj
  35. 0 VisualC/tests/testpalette/{testpalette.vcproj → testpalette_VS2005.vcproj}
  36. +208 −0 VisualC/tests/testpalette/testpalette_VS2008.vcproj
  37. 0 VisualC/tests/testplatform/{testplatform.vcproj → testplatform_VS2005.vcproj}
  38. +212 −0 VisualC/tests/testplatform/testplatform_VS2008.vcproj
  39. 0 VisualC/tests/testpower/{testpower.vcproj → testpower_VS2005.vcproj}
  40. +209 −0 VisualC/tests/testpower/testpower_VS2008.vcproj
  41. 0 VisualC/tests/testsprite/{testsprite.vcproj → testsprite_VS2005.vcproj}
  42. +208 −0 VisualC/tests/testsprite/testsprite_VS2008.vcproj
  43. 0 VisualC/tests/testsprite2/{testsprite2.vcproj → testsprite2_VS2005.vcproj}
  44. +212 −0 VisualC/tests/testsprite2/testsprite2_VS2008.vcproj
  45. 0 VisualC/tests/testvidinfo/{testvidinfo.vcproj → testvidinfo_VS2005.vcproj}
  46. +208 −0 VisualC/tests/testvidinfo/testvidinfo_VS2008.vcproj
  47. 0 VisualC/tests/testwin/{testwin.vcproj → testwin_VS2005.vcproj}
  48. +208 −0 VisualC/tests/testwin/testwin_VS2008.vcproj
  49. 0 VisualC/tests/testwm/{testwm.vcproj → testwm_VS2005.vcproj}
  50. +208 −0 VisualC/tests/testwm/testwm_VS2008.vcproj
  51. +17 −2 Xcode-iPhoneOS/Demos/DemosiPhoneOS.xcodeproj/project.pbxproj
  52. +0 −2 Xcode-iPhoneOS/Demos/src/fireworks.c
  53. +2 −3 Xcode-iPhoneOS/Demos/src/mixer.c
  54. +0 −1 Xcode-iPhoneOS/Demos/src/touch.c
  55. +25 −5 Xcode-iPhoneOS/SDL/SDLiPhoneOS.xcodeproj/project.pbxproj
  56. +18 −7 Xcode-iPhoneOS/Test/TestiPhoneOS.xcodeproj/project.pbxproj
  57. +81 −3 Xcode/SDL/SDL.xcodeproj/project.pbxproj
  58. +28 −0 Xcode/SDL/testsdl-Info.plist
  59. +1 −1 configure.in
  60. +1 −0 include/SDL.h
  61. +1 −1 include/SDL_atomic.h
  62. +76 −0 include/SDL_clipboard.h
  63. +1 −0 include/SDL_compat.h
  64. +2 −5 include/SDL_config_iphoneos.h
  65. +6 −0 include/SDL_config_pandora.h
  66. +17 −44 include/SDL_events.h
  67. +88 −0 include/SDL_input.h
  68. +8 −20 include/SDL_keyboard.h
  69. +51 −98 include/SDL_mouse.h
  70. +1 −1 include/SDL_mutex.h
  71. +1 −2 include/SDL_pixels.h
  72. +7 −0 include/SDL_stdinc.h
  73. +0 −18 include/SDL_syswm.h
  74. +0 −10 include/SDL_thread.h
  75. +0 −1 include/SDL_video.h
  76. +3 −11 src/SDL.c
  77. +1 −0 src/SDL_assert.c
  78. +26 −0 src/SDL_assert_c.h
  79. +1 −6 src/SDL_compat.c
  80. +1 −1 src/SDL_error.c
  81. +1 −0 src/SDL_error_c.h
  82. +7 −5 src/audio/SDL_audio.c
  83. +1 −1 src/cpuinfo/SDL_cpuinfo.c
  84. +47 −0 src/events/SDL_clipboardevents.c
  85. +31 −0 src/events/SDL_clipboardevents_c.h
  86. +46 −161 src/events/SDL_keyboard.c
  87. +10 −37 src/events/SDL_keyboard_c.h
  88. +134 −418 src/events/SDL_mouse.c
  89. +9 −84 src/events/SDL_mouse_c.h
  90. +2 −0 src/file/cocoa/SDL_rwopsbundlesupport.m
  91. +1 −0 src/haptic/SDL_haptic.c
  92. +26 −0 src/haptic/SDL_haptic_c.h
  93. +4 −0 src/joystick/SDL_joystick_c.h
  94. +4 −1 src/main/dummy/SDL_dummy_main.c
  95. +2 −8 src/thread/SDL_thread.c
  96. +2 −2 src/thread/win32/SDL_syssem.c
  97. +1 −0 src/video/SDL_blit_slow.c
  98. +76 −0 src/video/SDL_clipboard.c
  99. +1 −0 src/video/SDL_renderer_sw.c
  100. +2 −2 src/video/SDL_stretch.c
  101. +1 −1 src/video/SDL_surface.c
  102. +7 −1 src/video/SDL_sysvideo.h
  103. +5 −11 src/video/SDL_video.c
  104. +37 −0 src/video/cocoa/SDL_cocoaclipboard.h
  105. +140 −0 src/video/cocoa/SDL_cocoaclipboard.m
  106. +1 −1 src/video/cocoa/SDL_cocoaevents.m
  107. +40 −58 src/video/cocoa/SDL_cocoakeyboard.m
  108. +1 −1 src/video/cocoa/SDL_cocoamodes.m
  109. +11 −27 src/video/cocoa/SDL_cocoamouse.m
  110. +1 −1 src/video/cocoa/SDL_cocoaopengl.m
  111. +2 −2 src/video/cocoa/SDL_cocoavideo.h
  112. +5 −1 src/video/cocoa/SDL_cocoavideo.m
  113. +30 −39 src/video/cocoa/SDL_cocoawindow.m
  114. +2 −2 src/video/pandora/SDL_pandora.h
  115. +2 −1 src/video/uikit/SDL_uikitappdelegate.m
  116. +7 −1 src/video/uikit/SDL_uikitopengles.m
  117. +0 −4 src/video/uikit/SDL_uikitview.h
  118. +2 −94 src/video/uikit/SDL_uikitview.m
  119. +1 −1 src/video/uikit/jumphack.c
  120. +1 −1 src/video/uikit/jumphack.h
  121. +161 −0 src/video/win32/SDL_win32clipboard.c
  122. +37 −0 src/video/win32/SDL_win32clipboard.h
  123. +19 −180 src/video/win32/SDL_win32events.c
  124. +0 −1 src/video/win32/SDL_win32events.h
  125. +3 −9 src/video/win32/SDL_win32keyboard.c
  126. +1 −1 src/video/win32/SDL_win32keyboard.h
  127. +0 −1 src/video/win32/SDL_win32modes.c
  128. +0 −168 src/video/win32/SDL_win32mouse.c
  129. +19 −36 src/video/win32/SDL_win32video.c
  130. +3 −14 src/video/win32/SDL_win32video.h
  131. +28 −76 src/video/win32/SDL_win32window.c
  132. +0 −237 src/video/win32/wactab/pktdef.h
  133. +0 −866 src/video/win32/wactab/wintab.h
  134. +0 −136 src/video/win32/wactab/wintabx.h
  135. +156 −0 src/video/x11/SDL_x11clipboard.c
  136. +33 −0 src/video/x11/SDL_x11clipboard.h
  137. +76 −90 src/video/x11/SDL_x11events.c
  138. +1 −7 src/video/x11/SDL_x11keyboard.c
  139. +0 −125 src/video/x11/SDL_x11mouse.c
  140. +1 −0 src/video/x11/SDL_x11render.c
  141. +7 −4 src/video/x11/SDL_x11sym.h
  142. +7 −1 src/video/x11/SDL_x11video.c
  143. +3 −2 src/video/x11/SDL_x11video.h
  144. +16 −40 src/video/x11/SDL_x11window.c
  145. +1 −4 test/Makefile.in
  146. +2 −2 test/automated/testsdl.c
  147. +39 −18 test/common.c
  148. +3 −4 test/testime.c
  149. +8 −12 test/testintersections.c
  150. +0 −67 test/testmmousetablet.c
@@ -14,7 +14,19 @@ build
build-deps
VisualC
VisualCE
Xcode
# for Xcode
*.orig
*.swp
*.tmp
*.rej
*~
*.o
*.mode1*
*.model*
*.perspective*
*.perspective*
*.pbxuser
(^|/)build($|/)
.DS_Store
sdl.pc
include/SDL_config.h
@@ -44,7 +44,7 @@ EMBEDSPU = @EMBEDSPU@

DIST = acinclude autogen.sh Borland.html Borland.zip BUGS build-scripts configure configure.in COPYING CREDITS include INSTALL Makefile.minimal Makefile.in README* sdl-config.in sdl.m4 sdl.pc.in SDL.spec SDL.spec.in src test TODO VisualC.html VisualC VisualCE Watcom-Win32.zip WhatsNew Xcode Xcode-iPhoneOS

HDRS = SDL.h SDL_assert.h SDL_atomic.h SDL_audio.h SDL_compat.h SDL_cpuinfo.h SDL_endian.h SDL_error.h SDL_events.h SDL_haptic.h SDL_joystick.h SDL_keyboard.h SDL_keysym.h SDL_loadso.h SDL_main.h SDL_mouse.h SDL_mutex.h SDL_name.h SDL_opengl.h SDL_opengles.h SDL_pixels.h SDL_platform.h SDL_power.h SDL_quit.h SDL_rect.h SDL_revision.h SDL_rwops.h SDL_scancode.h SDL_stdinc.h SDL_surface.h SDL_syswm.h SDL_thread.h SDL_timer.h SDL_types.h SDL_version.h SDL_video.h begin_code.h close_code.h SDL_touch.h SDL_gesture.h
HDRS = SDL.h SDL_assert.h SDL_atomic.h SDL_audio.h SDL_clipboard.h SDL_compat.h SDL_cpuinfo.h SDL_endian.h SDL_error.h SDL_events.h SDL_gesture.h SDL_haptic.h SDL_input.h SDL_joystick.h SDL_keyboard.h SDL_keysym.h SDL_loadso.h SDL_main.h SDL_mouse.h SDL_mutex.h SDL_name.h SDL_opengl.h SDL_opengles.h SDL_pixels.h SDL_platform.h SDL_power.h SDL_quit.h SDL_rect.h SDL_revision.h SDL_rwops.h SDL_scancode.h SDL_stdinc.h SDL_surface.h SDL_syswm.h SDL_thread.h SDL_timer.h SDL_touch.h SDL_types.h SDL_version.h SDL_video.h begin_code.h close_code.h

LT_AGE = @LT_AGE@
LT_CURRENT = @LT_CURRENT@
@@ -12,14 +12,15 @@ CFLAGS = -O3 -march=armv7-a -mcpu=cortex-a8 -mtune=cortex-a8 -mfloat-abi=softfp

TARGET = libSDL.a

SOURCES = ./src/*.c ./src/audio/*.c ./src/cdrom/*.c ./src/cpuinfo/*.c ./src/events/*.c \
SOURCES = ./src/*.c ./src/audio/*.c ./src/cpuinfo/*.c ./src/events/*.c \
./src/file/*.c ./src/stdlib/*.c ./src/thread/*.c ./src/timer/*.c ./src/video/*.c \
./src/joystick/*.c ./src/haptic/*.c ./src/power/*.c ./src/video/dummy/*.c ./src/audio/disk/*.c \
./src/audio/dummy/*.c ./src/loadso/dlopen/*.c ./src/audio/dsp/*.c ./src/audio/dma/*.c \
./src/thread/pthread/SDL_systhread.c ./src/thread/pthread/SDL_syssem.c \
./src/thread/pthread/SDL_sysmutex.c ./src/thread/pthread/SDL_syscond.c \
./src/joystick/linux/*.c ./src/haptic/linux/*.c ./src/timer/unix/*.c ./src/cdrom/dummy/*.c \
./src/video/pandora/SDL_pandora.o ./src/video/pandora/SDL_pandora_events.o ./src/video/x11/*.c
./src/joystick/linux/*.c ./src/haptic/linux/*.c ./src/timer/unix/*.c \
./src/atomic/linux/*.c \
./src/video/pandora/SDL_pandora.o ./src/video/pandora/SDL_pandora_events.o ./src/video/x11/*.c


OBJECTS = $(shell echo $(SOURCES) | sed -e 's,\.c,\.o,g')
@@ -237,6 +237,10 @@
RelativePath="..\..\include\SDL_audio.h"
>
</File>
<File
RelativePath="..\..\include\SDL_clipboard.h"
>
</File>
<File
RelativePath="..\..\include\SDL_compat.h"
>
@@ -562,6 +566,18 @@
RelativePath="..\..\src\video\SDL_bmp.c"
>
</File>
<File
RelativePath="..\..\src\video\SDL_clipboard.c"
>
</File>
<File
RelativePath="..\..\src\events\SDL_clipboardevents.c"
>
</File>
<File
RelativePath="..\..\src\events\SDL_clipboardevents_c.h"
>
</File>
<File
RelativePath="..\..\src\SDL_compat.c"
>
@@ -842,10 +858,6 @@
RelativePath="..\..\src\video\SDL_stretch.c"
>
</File>
<File
RelativePath="..\..\src\video\SDL_stretch_c.h"
>
</File>
<File
RelativePath="..\..\src\stdlib\SDL_string.c"
>
@@ -954,6 +966,14 @@
RelativePath="..\..\src\audio\SDL_wave.h"
>
</File>
<File
RelativePath="..\..\src\video\win32\SDL_win32clipboard.c"
>
</File>
<File
RelativePath="..\..\src\video\win32\SDL_win32clipboard.h"
>
</File>
<File
RelativePath="..\..\src\video\win32\SDL_win32events.c"
>
@@ -382,6 +382,10 @@
RelativePath="..\..\include\SDL_audio.h"
>
</File>
<File
RelativePath="..\..\include\SDL_clipboard.h"
>
</File>
<File
RelativePath="..\..\include\SDL_compat.h"
>
@@ -715,6 +719,18 @@
RelativePath="..\..\src\video\SDL_bmp.c"
>
</File>
<File
RelativePath="..\..\src\video\SDL_clipboard.c"
>
</File>
<File
RelativePath="..\..\src\events\SDL_clipboardevents.c"
>
</File>
<File
RelativePath="..\..\src\events\SDL_clipboardevents_c.h"
>
</File>
<File
RelativePath="..\..\src\SDL_compat.c"
>
@@ -995,10 +1011,6 @@
RelativePath="..\..\src\video\SDL_stretch.c"
>
</File>
<File
RelativePath="..\..\src\video\SDL_stretch_c.h"
>
</File>
<File
RelativePath="..\..\src\stdlib\SDL_string.c"
>
@@ -1099,6 +1111,14 @@
RelativePath="..\..\src\audio\SDL_wave.h"
>
</File>
<File
RelativePath="..\..\src\video\win32\SDL_win32clipboard.c"
>
</File>
<File
RelativePath="..\..\src\video\win32\SDL_win32clipboard.h"
>
</File>
<File
RelativePath="..\..\src\video\win32\SDL_win32events.c"
>
@@ -1,8 +1,8 @@
Microsoft Visual Studio Solution File, Format Version 10.00
# Visual Studio 2008
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL", "SDL\SDL.vcproj", "{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}"
Microsoft Visual Studio Solution File, Format Version 9.00
# Visual C++ Express 2005
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL", "SDL\SDL_VS2005.vcproj", "{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDLmain", "SDLmain\SDLmain.vcproj", "{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDLmain", "SDLmain\SDLmain_VS2005.vcproj", "{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution

0 comments on commit da58061

Please sign in to comment.