diff options
| author | Sam Lantinga <slouken@libsdl.org> | 2011-10-31 05:56:58 -0400 |
|---|---|---|
| committer | Sam Lantinga <slouken@libsdl.org> | 2011-10-31 05:56:58 -0400 |
| commit | 07b4a2ffe6a33667d09fbe4693d4c977b2f3d100 (patch) | |
| tree | 0c97c27488f1b550ada2af5270b321833378a7ac /include | |
| parent | e19a2fbe61685250e0db0d972253250cc85c4809 (diff) | |
Lots of fixes importing SDL source wholesale into a new iOS project
--HG--
rename : src/libm/math.h => src/libm/math_libm.h
Diffstat (limited to 'include')
| -rw-r--r-- | include/SDL_config.h.in | 1 | ||||
| -rw-r--r-- | include/SDL_opengl.h | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/include/SDL_config.h.in b/include/SDL_config.h.in index 60aade2c..9eed823d 100644 --- a/include/SDL_config.h.in +++ b/include/SDL_config.h.in @@ -233,7 +233,6 @@ #undef SDL_THREAD_PTHREAD #undef SDL_THREAD_PTHREAD_RECURSIVE_MUTEX #undef SDL_THREAD_PTHREAD_RECURSIVE_MUTEX_NP -#undef SDL_THREAD_SPROC #undef SDL_THREAD_WINDOWS /* Enable various timer systems */ diff --git a/include/SDL_opengl.h b/include/SDL_opengl.h index 54836df7..fad97447 100644 --- a/include/SDL_opengl.h +++ b/include/SDL_opengl.h @@ -30,6 +30,8 @@ #include "SDL_config.h" +#ifndef __IPHONEOS__ + #ifdef __WIN32__ #define WIN32_LEAN_AND_MEAN #ifndef NOMINMAX @@ -11123,6 +11125,8 @@ typedef void (APIENTRYP PFNGLVDPAUUNMAPSURFACESNVPROC) (GLsizei numSurface, cons /* *INDENT-ON* */ #endif /* NO_SDL_GLEXT */ +#endif /* !__IPHONEOS__ */ + #endif /* _SDL_opengl_h */ /* vi: set ts=4 sw=4 expandtab: */ |