summaryrefslogtreecommitdiffstatshomepage
path: root/.gitattributes
diff options
context:
space:
mode:
author Couriersud <couriersud@users.noreply.github.com>2010-01-21 22:54:49 +0000
committer Couriersud <couriersud@users.noreply.github.com>2010-01-21 22:54:49 +0000
commit10bee5ce7812d7faaecf238cf9570b802e02d56e (patch)
treecf71fbbc9cb1fb53efefef35bb916df2860fad15 /.gitattributes
parenta63d3b5de485918abd8bca4079ac221fe62f1d15 (diff)
The return of the "misc"
- Added sdlmisc_<targetos>.c again. This was necessary since certain tools create stubs for e.g. osd_break_into_debugger. If we do not have this in a separate file, the link stage may break. - Applied OS/2 patch [Credit: KO Myung-Hun] - Cleaned up #includes. Removed stdlib.h were possible. - More malloc to osd_malloc rename. - SDL monitor modes are read now when they are needed. This is now consistent across platforms.
Diffstat (limited to '.gitattributes')
-rw-r--r--.gitattributes4
1 files changed, 4 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes
index b18c59f8b37..d0f20233a2c 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -3967,6 +3967,10 @@ 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/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
+src/osd/sdl/sdlmisc_unix.c svneol=native#text/plain
+src/osd/sdl/sdlmisc_win32.c svneol=native#text/plain
src/osd/sdl/sdlos.h svneol=native#text/plain
src/osd/sdl/sdlos_macosx.c svneol=native#text/plain
src/osd/sdl/sdlos_os2.c svneol=native#text/plain