Merge with latest, official SDL code

This commit is contained in:
DavidLudwig 2012-11-04 09:46:59 -05:00
commit 5939e8424f
66 changed files with 2620 additions and 530 deletions

View file

@ -1216,6 +1216,14 @@
RelativePath="..\..\src\video\windows\SDL_windowskeyboard.h"
>
</File>
<File
RelativePath="..\..\src\video\windows\SDL_windowsmessagebox.c"
>
</File>
<File
RelativePath="..\..\src\video\windows\SDL_windowsmessagebox.h"
>
</File>
<File
RelativePath="..\..\src\video\windows\SDL_windowsmodes.c"
>

View file

@ -317,6 +317,7 @@
<ClInclude Include="..\..\src\video\windows\SDL_windowsevents.h" />
<ClInclude Include="..\..\src\video\windows\SDL_windowsframebuffer.h" />
<ClInclude Include="..\..\src\video\windows\SDL_windowskeyboard.h" />
<ClInclude Include="..\..\src\video\windows\SDL_windowsmessagebox.h" />
<ClInclude Include="..\..\src\video\windows\SDL_windowsmodes.h" />
<ClInclude Include="..\..\src\video\windows\SDL_windowsmouse.h" />
<ClInclude Include="..\..\src\video\windows\SDL_windowsopengl.h" />
@ -432,6 +433,7 @@
<ClCompile Include="..\..\src\video\windows\SDL_windowsevents.c" />
<ClCompile Include="..\..\src\video\windows\SDL_windowsframebuffer.c" />
<ClCompile Include="..\..\src\video\windows\SDL_windowskeyboard.c" />
<ClCompile Include="..\..\src\video\windows\SDL_windowsmessagebox.c" />
<ClCompile Include="..\..\src\video\windows\SDL_windowsmodes.c" />
<ClCompile Include="..\..\src\video\windows\SDL_windowsmouse.c" />
<ClCompile Include="..\..\src\video\windows\SDL_windowsopengl.c" />