game/naev/naev-0.7.0-aros.diff

   1 diff -ruN naev-0.7.0/lib/lua/luaconf.h naev-0.7.0.aros/lib/lua/luaconf.h
   2 --- naev-0.7.0/lib/lua/luaconf.h        2017-07-16 00:51:22.000000000 +0200
   3 +++ naev-0.7.0.aros/lib/lua/luaconf.h   2018-07-29 02:46:05.377669697 +0200
   4 @@ -55,7 +55,7 @@
   5  #define LUA_USE_MKSTEMP
   6  #define LUA_USE_ISATTY
   7  #define LUA_USE_POPEN
   8 -#define LUA_USE_ULONGJMP
   9 +//#define LUA_USE_ULONGJMP
  10  #endif
  11
  12
  13 diff -ruN naev-0.7.0/src/naev.c naev-0.7.0.aros/src/naev.c
  14 --- naev-0.7.0/src/naev.c       2017-07-16 00:51:22.000000000 +0200
  15 +++ naev-0.7.0.aros/src/naev.c  2018-07-28 11:55:34.255841964 +0200
  16 @@ -884,7 +884,7 @@
  17   */
  18  static void fps_init (void)
  19  {
  20 -#if HAS_POSIX && defined(CLOCK_MONOTONIC)
  21 +#if HAS_POSIX && defined(CLOCK_MONOTONIC) && !defined(__AROS__)
  22     use_posix_time = 1;
  23     /* We must use clock_gettime here instead of gettimeofday mainly because this
  24      * way we are not influenced by changes to the time source like say ntp which
  25 @@ -906,7 +906,7 @@
  26     double dt;
  27     unsigned int t;
  28
  29 -#if HAS_POSIX && defined(CLOCK_MONOTONIC)
  30 +#if HAS_POSIX && defined(CLOCK_MONOTONIC) && !defined(__AROS__)
  31     struct timespec ts;
  32
  33     if (use_posix_time) {
  34 diff -ruN naev-0.7.0/src/ndata.c naev-0.7.0.aros/src/ndata.c
  35 --- naev-0.7.0/src/ndata.c      2017-07-16 00:51:22.000000000 +0200
  36 +++ naev-0.7.0.aros/src/ndata.c 2018-07-28 11:55:34.255841964 +0200
  37 @@ -209,7 +209,11 @@
  38  #endif /* SDL_VERSION_ATLEAST(2,0,0) */
  39
  40     /* Create the surface. */
  41 +#if SDL_VERSION_ATLEAST(2,0,0)
  42     rw    = SDL_RWFromConstMem( nondata_png, sizeof(nondata_png) );
  43 +#else
  44 +   rw    = SDL_RWFromMem( (void *)nondata_png, sizeof(nondata_png) );
  45 +#endif /* SDL_VERSION_ATLEAST(2,0,0) */
  46     npng  = npng_open( rw );
  47     sur   = npng_readSurface( npng, 0, 0 );
  48     npng_close( npng );