1
0
Fork 0
mirror of https://github.com/AquariaOSE/Aquaria.git synced 2025-10-18 20:39:27 +00:00

Hopefully fix build against SDL 1.2. Does not yet run!

Also: Recently introduced key names in usersettings.xml will no longer work.
But this should automatically detect key names as they used to be,
and convert automatically. Needs testing.
This commit is contained in:
fgenesis 2017-02-15 04:34:32 +01:00
commit 3dda97d32a
14 changed files with 461 additions and 51 deletions

View file

@ -9,13 +9,18 @@
#include <limits.h>
#if defined(_MSC_VER) && _MSC_VER < 1600
#include "SDL_version.h"
#if SDL_VERSION_ATLEAST(2, 0, 0) // AQUARIA HACK: Included SDL 1.2 includes define some of these, SDL does not. Avoid conflicts.
typedef signed __int8 int8_t;
typedef signed __int16 int16_t;
typedef signed __int32 int32_t;
typedef signed __int64 int64_t;
typedef unsigned __int8 uint8_t;
typedef signed __int16 int16_t;
typedef unsigned __int16 uint16_t;
typedef signed __int32 int32_t;
typedef unsigned __int32 uint32_t;
#else
#include "SDL_config.h"
#endif
typedef signed __int64 int64_t;
typedef unsigned __int64 uint64_t;
# ifdef __cplusplus
namespace std