summaryrefslogtreecommitdiffstatshomepage
path: root/.gitattributes
diff options
context:
space:
mode:
author Couriersud <couriersud@users.noreply.github.com>2012-02-12 20:59:24 +0000
committer Couriersud <couriersud@users.noreply.github.com>2012-02-12 20:59:24 +0000
commit534416655539c77a6817cc3a3fd5352389997b39 (patch)
treea7d68c4a45c9530ee293ab14578243a0b131dc4e /.gitattributes
parentd75dbab0de7da33196f08f0cf7992d906ffbb832 (diff)
updated sdl os-core to compile against stock SDL-2.0 [couriersud].
- The SDL team has moved from 1.3 to 2.0. At the same time, changes were made to allow SDL1.2 and SDL2.0 to coexist. All SDL2.0 include files are now in /usr/include/SDL2. - Added sdlinc.h to avoid having tons of #ifdef .. #include in the code. - Scalemode is no longer a per-window setting - Fixed a bug in YUV rendering. - Use SDL_GetClipboard (SDL2.0) - Updated README_SDL20.txt Currently, SDL 2.0 is only supported on *nix. Volunteers welcome.
Diffstat (limited to '.gitattributes')
-rw-r--r--.gitattributes3
1 files changed, 2 insertions, 1 deletions
diff --git a/.gitattributes b/.gitattributes
index ac199588120..3408438cb26 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -5110,7 +5110,7 @@ src/osd/osdmini/osdmini.h svneol=native#text/plain
src/osd/osdmini/osdmini.mak svneol=native#text/plain
src/osd/osdnet.c svneol=native#text/plain
src/osd/osdnet.h svneol=native#text/plain
-src/osd/sdl/README_SDL13.txt svneol=native#text/plain
+src/osd/sdl/README_SDL20.txt svneol=native#text/plain
src/osd/sdl/SDL1211_opengl.h svneol=native#text/plain
src/osd/sdl/SDLMain_tmpl.h svneol=native#text/plain
src/osd/sdl/SDLMain_tmpl.m svneol=native#text/plain
@@ -5171,6 +5171,7 @@ src/osd/sdl/sdl.mak svneol=native#text/plain
src/osd/sdl/sdldir.c svneol=native#text/plain
src/osd/sdl/sdlfile.c svneol=native#text/plain
src/osd/sdl/sdlfile.h svneol=native#text/plain
+src/osd/sdl/sdlinc.h svneol=native#text/plain
src/osd/sdl/sdlmain.c svneol=native#text/plain
src/osd/sdl/sdlmisc_macosx.c svneol=native#text/plain
src/osd/sdl/sdlmisc_os2.c svneol=native#text/plain