Rev 1 | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 1 | Rev 7 | ||
|---|---|---|---|
| Line 20... | Line 20... | ||
| 20 | 20 | ||
| 21 | #ifndef TYPES_H | 21 | #ifndef TYPES_H | 
| 22 | #define TYPES_H | 22 | #define TYPES_H | 
| 23 | 23 | ||
| 24 | #if !defined(_MSC_VER) | 24 | #if !defined(_MSC_VER) | 
| - | 25 | #ifdef __APPLE__ | |
| - | 26 | # include <SDL2.framework/Headers/SDL.h> | |
| - | 27 | # include <SDL2_image.framework/Headers/SDL_image.h> | |
| - | 28 | # ifdef USE_MIXER | |
| - | 29 | # include <SDL2_mixer.framework/Headers/SDL_mixer.h> | |
| - | 30 | # endif | |
| - | 31 | #else | |
| 25 | # include <SDL2/SDL.h> | 32 | # include <SDL2/SDL.h> | 
| 26 | # include <SDL2_image/SDL_image.h> | 33 | # include <SDL2_image/SDL_image.h> | 
| 27 | # ifdef USE_MIXER | 34 | # ifdef USE_MIXER | 
| 28 | # include <SDL2_mixer/SDL_mixer.h> | 35 | # include <SDL2_mixer/SDL_mixer.h> | 
| 29 | # endif | 36 | # endif | 
| - | 37 | #endif | |
| 30 | #else | 38 | #else | 
| 31 | # include <SDL.h> | 39 | # include <SDL.h> | 
| 32 | # include <SDL_image.h> | 40 | # include <SDL_image.h> | 
| 33 | # ifdef USE_MIXER | 41 | # ifdef USE_MIXER | 
| 34 | # include <SDL_mixer.h> | 42 | # include <SDL_mixer.h> | 
| Line 60... | Line 68... | ||
| 60 | #define memset_near memset | 68 | #define memset_near memset | 
| 61 | #define memset_far  memset | 69 | #define memset_far  memset | 
| 62 | #define memcpy_near memcpy | 70 | #define memcpy_near memcpy | 
| 63 | #define memcpy_far  memcpy | 71 | #define memcpy_far  memcpy | 
| 64 | 72 | ||
| - | 73 | #ifndef Uint8 | |
| - | 74 | #define Uint8 uint8_t | |
| - | 75 | #endif // !Uint8 | |
| - | 76 | #ifndef Sint8 | |
| - | 77 | #define Sint8 int8_t | |
| - | 78 | #endif // !Sint8 | |
| - | 79 | #ifndef Uint16 | |
| - | 80 | #define Uint16 uint16_t | |
| - | 81 | #endif // !Uint16 | |
| - | 82 | #ifndef Uint32 | |
| - | 83 | #define Uint32 uint32_t | |
| - | 84 | #endif // !Uint32 | |
| 65 | typedef Uint8 byte; | 85 | typedef Uint8 byte; | 
| 66 | typedef Sint8 sbyte; | 86 | typedef Sint8 sbyte; | 
| 67 | typedef Uint16 word; | 87 | typedef Uint16 word; | 
| 68 | typedef Uint32 dword; | 88 | typedef Uint32 dword; | 
| 69 | 89 | ||