game/arx/1.1.2-r1-aros.diff

   1 diff -ruN ArxLibertatis-1.1.2-r1/CMakeLists.txt ArxLibertatis-1.1.2-r1.aros/CMakeLists.txt
   2 --- ArxLibertatis-1.1.2-r1/CMakeLists.txt       2016-03-24 21:50:29.000000000 +0000
   3 +++ ArxLibertatis-1.1.2-r1.aros/CMakeLists.txt  2018-09-15 00:35:05.691554067 +0100
   4 @@ -127,7 +127,9 @@
   5  )
   6
   7  # Default runtime user and data directories
   8 -if(WIN32)
   9 +if(AROS)
  10 +# AROS uses binary dir for data.
  11 +elseif(WIN32)
  12         set(USER_DIR            "Arx Libertatis"                CACHE STRING "User dir names")
  13         set(USER_DIR_PREFIXES   "%FOLDERID_SavedGames%"         CACHE STRING "User dir paths")
  14  elseif(MACOSX)
  15 @@ -190,6 +192,7 @@
  16  include(PrintConfiguration)
  17  include(StyleCheck)
  18  include(VersionString)
  19 +include(CheckIncludeFiles)
  20
  21
  22  # Find required libraries
  23 diff -ruN ArxLibertatis-1.1.2-r1/src/core/ArxGame.cpp ArxLibertatis-1.1.2-r1.aros/src/core/ArxGame.cpp
  24 --- ArxLibertatis-1.1.2-r1/src/core/ArxGame.cpp 2016-03-24 21:50:29.000000000 +0000
  25 +++ ArxLibertatis-1.1.2-r1.aros/src/core/ArxGame.cpp    2018-09-15 00:35:05.691554067 +0100
  26 @@ -49,6 +49,11 @@
  27  #include <algorithm>
  28  #include <sstream>
  29
  30 +#ifdef __AROS__
  31 +#include <aros/preprocessor/variadic/size.hpp>
  32 +#include <aros/preprocessor/variadic/elem.hpp>
  33 +#endif
  34 +
  35  #include <boost/foreach.hpp>
  36
  37  #include "ai/PathFinderManager.h"
  38 diff -ruN ArxLibertatis-1.1.2-r1/src/gui/MenuWidgets.cpp ArxLibertatis-1.1.2-r1.aros/src/gui/MenuWidgets.cpp
  39 --- ArxLibertatis-1.1.2-r1/src/gui/MenuWidgets.cpp      2016-03-24 21:50:29.000000000 +0000
  40 +++ ArxLibertatis-1.1.2-r1.aros/src/gui/MenuWidgets.cpp 2018-09-15 00:35:05.691554067 +0100
  41 @@ -87,7 +87,7 @@
  42
  43  #include "window/RenderWindow.h"
  44
  45 -using std::wistringstream;
  46 +//using std::wistringstream;
  47  using std::min;
  48  using std::max;
  49  using std::string;
  50 diff -ruN ArxLibertatis-1.1.2-r1/src/input/Input.cpp ArxLibertatis-1.1.2-r1.aros/src/input/Input.cpp
  51 --- ArxLibertatis-1.1.2-r1/src/input/Input.cpp  2016-03-24 21:50:29.000000000 +0000
  52 +++ ArxLibertatis-1.1.2-r1.aros/src/input/Input.cpp     2018-09-15 00:35:05.691554067 +0100
  53 @@ -46,6 +46,11 @@
  54
  55  #include "input/Input.h"
  56
  57 +#ifdef __AROS__
  58 +#include <aros/preprocessor/variadic/size.hpp>
  59 +#include <aros/preprocessor/variadic/elem.hpp>
  60 +#endif
  61 +
  62  #include <string>
  63  #include <map>
  64
  65 diff -ruN ArxLibertatis-1.1.2-r1/src/io/fs/FilesystemPOSIX.cpp ArxLibertatis-1.1.2-r1.aros/src/io/fs/FilesystemPOSIX.cpp
  66 --- ArxLibertatis-1.1.2-r1/src/io/fs/FilesystemPOSIX.cpp        2016-03-24 21:50:29.000000000 +0000
  67 +++ ArxLibertatis-1.1.2-r1.aros/src/io/fs/FilesystemPOSIX.cpp   2018-09-15 00:35:05.691554067 +0100
  68 @@ -254,7 +254,12 @@
  69         do {
  70
  71                 dirent * entry;
  72 +#ifdef __AROS__
  73 +//FIXME:possibly mutex necessary
  74 +               if(readdir(handle)) {
  75 +#else
  76                 if(readdir_r(handle, buf, &entry) || !entry) {
  77 +#endif
  78                         std::free(_buf), _buf = NULL;
  79                         return;
  80                 }
  81 diff -ruN ArxLibertatis-1.1.2-r1/src/platform/Lock.cpp ArxLibertatis-1.1.2-r1.aros/src/platform/Lock.cpp
  82 --- ArxLibertatis-1.1.2-r1/src/platform/Lock.cpp        2016-03-24 21:50:29.000000000 +0000
  83 +++ ArxLibertatis-1.1.2-r1.aros/src/platform/Lock.cpp   2018-09-15 01:20:15.455282714 +0100
  84 @@ -24,10 +24,15 @@
  85  #if defined(ARX_HAVE_PTHREADS)
  86
  87  Lock::Lock() : locked(false) {
  88 +#if !defined(__AROS__)
  89         const pthread_mutex_t mutex_init = PTHREAD_MUTEX_INITIALIZER;
  90         mutex = mutex_init;
  91         const pthread_cond_t cond_init = PTHREAD_COND_INITIALIZER;
  92         cond = cond_init;
  93 +#else
  94 +       pthread_mutex_init(&mutex, NULL);
  95 +       pthread_cond_init(&cond, NULL);
  96 +#endif
  97  }
  98
  99  Lock::~Lock() {