Skip to content
Permalink
Browse files

Merged 'default' into branch 'iOS-improvements'

  • Loading branch information
slime73 committed Jul 31, 2014
2 parents caad673 + 7552947 commit bde54b7f3461124504d184d79bbcea57f3d6b70e
Showing with 876 additions and 357 deletions.
  1. +1 −0 .hgignore
  2. +4 −4 INSTALL.txt
  3. +2 −23 README.txt
  4. +4 −0 VisualC/SDL/SDL_VS2008.vcproj
  5. +5 −1 VisualC/SDL/SDL_VS2010.vcxproj
  6. +5 −1 VisualC/SDL/SDL_VS2012.vcxproj
  7. +4 −0 VisualC/SDL/SDL_VS2013.vcxproj
  8. +4 −0 VisualC/SDLmain/SDLmain_VS2008.vcproj
  9. +167 −163 VisualC/SDLmain/SDLmain_VS2010.vcxproj
  10. +5 −1 VisualC/SDLmain/SDLmain_VS2012.vcxproj
  11. +4 −0 VisualC/SDLmain/SDLmain_VS2013.vcxproj
  12. +4 −0 VisualC/SDLtest/SDLtest_VS2008.vcproj
  13. +5 −1 VisualC/SDLtest/SDLtest_VS2010.vcxproj
  14. +5 −1 VisualC/SDLtest/SDLtest_VS2012.vcxproj
  15. +4 −0 VisualC/SDLtest/SDLtest_VS2013.vcxproj
  16. +1 −2 README-android.txt → docs/README-android.md
  17. +2 −2 README-cmake.txt → docs/README-cmake.md
  18. +2 −1 README-directfb.txt → docs/README-directfb.md
  19. +0 −1 README-dynapi.txt → docs/README-dynapi.md
  20. +0 −1 README-gesture.txt → docs/README-gesture.md
  21. +3 −0 README-hg.txt → docs/README-hg.md
  22. +3 −0 README-ios.txt → docs/README-ios.md
  23. +1 −2 README-linux.txt → docs/README-linux.md
  24. +1 −2 README-macosx.txt → docs/README-macosx.md
  25. +1 −2 README-nacl.txt → docs/README-nacl.md
  26. +3 −2 README-pandora.txt → docs/README-pandora.md
  27. +3 −0 README-platforms.txt → docs/README-platforms.md
  28. +2 −0 README-porting.txt → docs/README-porting.md
  29. +2 −0 README-psp.txt → docs/README-psp.md
  30. +1 −2 README-raspberrypi.txt → docs/README-raspberrypi.md
  31. +1 −0 README-touch.txt → docs/README-touch.md
  32. +2 −0 README-wince.txt → docs/README-wince.md
  33. +1 −2 README-windows.txt → docs/README-windows.md
  34. +1 −2 README-winrt.txt → docs/README-winrt.md
  35. +62 −0 docs/README.md
  36. +14 −10 {include → docs}/doxyfile
  37. +0 −35 include/SDL.h
  38. +4 −7 include/SDL_assert.h
  39. +103 −4 include/SDL_audio.h
  40. +226 −14 src/audio/SDL_audio.c
  41. +27 −0 src/audio/SDL_sysaudio.h
  42. +3 −3 src/audio/xaudio2/SDL_xaudio2.c
  43. +4 −4 src/core/linux/SDL_ibus.c
  44. +3 −0 src/dynapi/SDL_dynapi_overrides.h
  45. +3 −0 src/dynapi/SDL_dynapi_procs.h
  46. +2 −25 src/main/windows/SDL_windows_main.c
  47. +3 −0 src/render/opengl/SDL_render_gl.c
  48. +1 −1 src/render/software/SDL_draw.h
  49. +29 −38 src/stdlib/SDL_stdlib.c
  50. +1 −0 src/video/SDL_sysvideo.h
  51. +6 −0 src/video/SDL_video.c
  52. +4 −0 test/Makefile.in
  53. +1 −0 test/README
  54. +127 −0 test/loopwavequeue.c
@@ -76,6 +76,7 @@ test/Makefile
test/SDL2.dll
test/checkkeys
test/loopwave
test/loopwavequeue
test/testatomic
test/testaudioinfo
test/testautomation
@@ -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/
@@ -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)

@@ -61,6 +61,7 @@
Detect64BitPortabilityProblems="false"
DebugInformationFormat="4"
CompileAs="0"
OmitDefaultLibName="true"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -144,6 +145,7 @@
Detect64BitPortabilityProblems="false"
DebugInformationFormat="4"
CompileAs="0"
OmitDefaultLibName="true"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -232,6 +234,7 @@
Detect64BitPortabilityProblems="false"
DebugInformationFormat="3"
CompileAs="0"
OmitDefaultLibName="true"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -320,6 +323,7 @@
Detect64BitPortabilityProblems="false"
DebugInformationFormat="3"
CompileAs="0"
OmitDefaultLibName="true"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -94,6 +94,7 @@
<CompileAs>Default</CompileAs>
<ExceptionHandling>false</ExceptionHandling>
<EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
<OmitDefaultLibName>true</OmitDefaultLibName>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -127,6 +128,7 @@
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<ExceptionHandling>false</ExceptionHandling>
<OmitDefaultLibName>true</OmitDefaultLibName>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -167,6 +169,7 @@
<ExceptionHandling>false</ExceptionHandling>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
<OmitDefaultLibName>true</OmitDefaultLibName>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -203,6 +206,7 @@
<WarningLevel>Level3</WarningLevel>
<ExceptionHandling>false</ExceptionHandling>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<OmitDefaultLibName>true</OmitDefaultLibName>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -510,4 +514,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
</Project>
@@ -98,6 +98,7 @@
<CompileAs>Default</CompileAs>
<ExceptionHandling>false</ExceptionHandling>
<EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
<OmitDefaultLibName>true</OmitDefaultLibName>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -131,6 +132,7 @@
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<ExceptionHandling>false</ExceptionHandling>
<OmitDefaultLibName>true</OmitDefaultLibName>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -171,6 +173,7 @@
<ExceptionHandling>false</ExceptionHandling>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
<OmitDefaultLibName>true</OmitDefaultLibName>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -207,6 +210,7 @@
<WarningLevel>Level3</WarningLevel>
<ExceptionHandling>false</ExceptionHandling>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<OmitDefaultLibName>true</OmitDefaultLibName>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -514,4 +518,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
</Project>
@@ -98,6 +98,7 @@
<CompileAs>Default</CompileAs>
<ExceptionHandling>false</ExceptionHandling>
<EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
<OmitDefaultLibName>true</OmitDefaultLibName>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -131,6 +132,7 @@
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<ExceptionHandling>false</ExceptionHandling>
<OmitDefaultLibName>true</OmitDefaultLibName>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -171,6 +173,7 @@
<ExceptionHandling>false</ExceptionHandling>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
<OmitDefaultLibName>true</OmitDefaultLibName>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -207,6 +210,7 @@
<WarningLevel>Level3</WarningLevel>
<ExceptionHandling>false</ExceptionHandling>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<OmitDefaultLibName>true</OmitDefaultLibName>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -56,6 +56,7 @@
SuppressStartupBanner="true"
DebugInformationFormat="1"
CompileAs="0"
OmitDefaultLibName="true"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -123,6 +124,7 @@
SuppressStartupBanner="true"
DebugInformationFormat="1"
CompileAs="0"
OmitDefaultLibName="true"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -316,6 +318,7 @@
SuppressStartupBanner="true"
DebugInformationFormat="1"
CompileAs="0"
OmitDefaultLibName="true"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -381,6 +384,7 @@
SuppressStartupBanner="true"
DebugInformationFormat="1"
CompileAs="0"
OmitDefaultLibName="true"
/>
<Tool
Name="VCManagedResourceCompilerTool"

0 comments on commit bde54b7

Please sign in to comment.