X-Moto 0.5.10 AmigaOS4

xmoto-0.5.10-src-amiga.patch

diff -Naur xmoto-0.5.10/configure xmoto-0.5.10-new/configure
--- xmoto-0.5.10/configure	2012-05-04 05:07:06 
+++ xmoto-0.5.10-new/configure	2012-06-23 05:19:03 
@@ -5974,7 +5974,7 @@
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lGLU  $LIBS"
+LIBS="-lGL -lGLU  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -6009,7 +6009,7 @@
 #define HAVE_LIBGLU 1
 _ACEOF
 
-  LIBS="-lGLU $LIBS"
+  LIBS="-lGL -lGLU $LIBS"
 
 else
   as_fn_error $? "glu required" "$LINENO" 5
@@ -6412,7 +6412,7 @@
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lSDL_mixer  $LIBS"
+LIBS="-lSDL_mixer -lflac -lvorbisfile -lvorbis -logg -lmikmod -lsmpeg -lstdc++ -lpthread -lSDL $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -6447,7 +6447,7 @@
 #define HAVE_LIBSDL_MIXER 1
 _ACEOF
 
-  LIBS="-lSDL_mixer $LIBS"
+  LIBS="-lSDL_mixer -lflac -lvorbisfile -lvorbis -logg -lmikmod -lsmpeg -lstdc++ -lpthread -lSDL $LIBS"
 
 else
   as_fn_error $? "SDL_mixer required" "$LINENO" 5
@@ -6598,7 +6598,7 @@
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lSDL_ttf  $LIBS"
+LIBS="-lSDL_ttf -lfreetype $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -6633,7 +6633,7 @@
 #define HAVE_LIBSDL_TTF 1
 _ACEOF
 
-  LIBS="-lSDL_ttf $LIBS"
+  LIBS="-lSDL_ttf -lfreetype $LIBS"
 
 else
   as_fn_error $? "SDL_ttf lib required" "$LINENO" 5
@@ -7767,7 +7767,7 @@
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lcurl  $LIBS"
+LIBS="-lcurl -lrtmp -lssl -lcrypto $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -7802,7 +7802,7 @@
 #define HAVE_LIBCURL 1
 _ACEOF
 
-  LIBS="-lcurl $LIBS"
+  LIBS="-lcurl -lrtmp -lssl -lcrypto $LIBS"
 
 else
   as_fn_error $? "libcurl required" "$LINENO" 5
diff -Naur xmoto-0.5.10/src/drawlib/DrawLibOpenGL.cpp xmoto-0.5.10-new/src/drawlib/DrawLibOpenGL.cpp
--- xmoto-0.5.10/src/drawlib/DrawLibOpenGL.cpp	2011-10-12 05:48:26 
+++ xmoto-0.5.10-new/src/drawlib/DrawLibOpenGL.cpp	2012-06-23 05:20:40 
@@ -145,21 +145,21 @@
 
 
 DrawLibOpenGL::~DrawLibOpenGL(){
-  if(m_fontSmall != NULL) {
-    delete m_fontSmall;
-  }
-
-  if(m_fontMedium != NULL) {
-    delete m_fontMedium;
-  }
-
-  if(m_fontBig != NULL) {
-    delete m_fontBig;
-  }
-
-  if(m_fontMonospace != NULL) {
-    delete m_fontMonospace;
-  }
+//  if(m_fontSmall != NULL) {
+//    delete m_fontSmall;
+//  }
+
+//  if(m_fontMedium != NULL) {
+//    delete m_fontMedium;
+//  }
+
+//  if(m_fontBig != NULL) {
+//    delete m_fontBig;
+//  }
+
+//  if(m_fontMonospace != NULL) {
+//    delete m_fontMonospace;
+//  }
 }
 
 DrawLibOpenGL::DrawLibOpenGL() : DrawLib(){
diff -Naur xmoto-0.5.10/src/GameInit.cpp xmoto-0.5.10-new/src/GameInit.cpp
--- xmoto-0.5.10/src/GameInit.cpp	2011-10-12 05:48:35 
+++ xmoto-0.5.10-new/src/GameInit.cpp	2012-06-24 01:02:18 
@@ -105,6 +105,8 @@
 #endif
 
 #ifdef __amigaos4__
+     static const char *__attribute__((used)) stackcookie = "$STACK: 3000000";
+
      /* checking for MiniGL 2.0 */
 
      if(!LibraryOK( "minigl.library", 2, 0 ))
@@ -264,7 +266,7 @@
   }
 
   // doesn't work on windows
-#if !defined(WIN32)
+#if !defined(WIN32) && !defined(__amigaos4__)
   if(v_xmArgs.isOptServerOnly()) {
     struct sigaction v_act;
 
diff -Naur xmoto-0.5.10/src/helpers/System.cpp xmoto-0.5.10-new/src/helpers/System.cpp
--- xmoto-0.5.10/src/helpers/System.cpp	2011-10-12 05:48:14 
+++ xmoto-0.5.10-new/src/helpers/System.cpp	2012-06-23 05:21:47 
@@ -81,7 +81,7 @@
   std::string v_res;
 
 // note that apple don't know getline
-#if defined(WIN32) || defined(__APPLE__)
+#if defined(WIN32) || defined(__APPLE__) || defined(__amigaos4__)
   return "No available information";
 #else
   // grep -E '^Vm' /proc/2532/status
diff -Naur xmoto-0.5.10/src/ode/odeconfig.h xmoto-0.5.10-new/src/ode/odeconfig.h
--- xmoto-0.5.10/src/ode/odeconfig.h	2012-05-03 06:38:34 
+++ xmoto-0.5.10-new/src/ode/odeconfig.h	2012-06-23 06:05:30 
@@ -47,8 +47,8 @@
   typedef signed char     int8;
   typedef unsigned char   uint8;
 #else
-  typedef int             int32;
-  typedef unsigned int    uint32;
+  typedef unsigned long uint32;
+  typedef   signed long  int32;
   typedef short           int16;
   typedef unsigned short  uint16;
   typedef signed char     int8;
diff -Naur xmoto-0.5.10/src/Sound.cpp xmoto-0.5.10-new/src/Sound.cpp
--- xmoto-0.5.10/src/Sound.cpp	2011-10-12 05:48:35 
+++ xmoto-0.5.10-new/src/Sound.cpp	2012-06-23 05:29:06 
@@ -74,7 +74,7 @@
  
   int nFormat;
   if(m_nSampleBits == 8) nFormat = AUDIO_S8;
-  else nFormat = AUDIO_S16;
+  else nFormat = AUDIO_S16MSB;
   
   if(Mix_OpenAudio(m_nSampleRate,nFormat,m_nChannels,2048) < 0) {
     LogWarning("failed to open mixer device (%s)",Mix_GetError());
diff -Naur xmoto-0.5.10/src/thread/SyncThread.cpp xmoto-0.5.10-new/src/thread/SyncThread.cpp
--- xmoto-0.5.10/src/thread/SyncThread.cpp	2012-05-05 05:13:53 
+++ xmoto-0.5.10-new/src/thread/SyncThread.cpp	2012-06-23 05:24:46 
@@ -60,7 +60,7 @@
     /* first, remove in case of windows */
     remove(std::string(SYNC_UP_TMPFILE).c_str());
     remove(std::string(SYNC_UP_TMPFILEBZ2).c_str());
-    m_pDb->sync_buildServerFile(SYNC_UP_TMPFILE, XMSession::instance()->sitekey(), XMSession::instance()->profile());
+    m_pDb->sync_buildServerFile("sync_up.xml", XMSession::instance()->sitekey(), XMSession::instance()->profile());
     FileCompression::bzip2(SYNC_UP_TMPFILE, SYNC_UP_TMPFILEBZ2);
     remove(std::string(SYNC_UP_TMPFILE).c_str());
   } catch(Exception &e) {
@@ -115,7 +115,7 @@
   // sync down
   try {
     m_pDb->sync_updateDB(XMSession::instance()->profile(), XMSession::instance()->sitekey(),
-			 v_syncDownFile, XMSession::instance()->dbSyncServer(m_pDb, XMSession::instance()->profile()));
+			 "sync_down.xml", XMSession::instance()->dbSyncServer(m_pDb, XMSession::instance()->profile()));
   } catch(Exception &e) {
     m_msg = e.getMsg();
     remove(v_syncDownFile.c_str());
diff -Naur xmoto-0.5.10/src/VFileIO.cpp xmoto-0.5.10-new/src/VFileIO.cpp
--- xmoto-0.5.10/src/VFileIO.cpp	2011-10-12 05:48:35 
+++ xmoto-0.5.10-new/src/VFileIO.cpp	2012-06-23 05:28:13 
@@ -114,7 +114,7 @@
 
 bool       XMFS::m_isInitialized = false;
 
-#ifndef WIN32
+#if !defined(WIN32) && !defined(__amigaos4__)
 xdgHandle* XMFS::m_xdgHd         = NULL;
 #endif
 
@@ -1105,7 +1105,7 @@
     }
   }
 
-#ifndef WIN32
+#if !defined(WIN32) && !defined(__amigaos4__)
   // xdg
   if( (m_xdgHd = (xdgHandle*) malloc(sizeof(xdgHandle))) == NULL) {
     throw Exception("xdgbasedir allocation failed");
@@ -1320,7 +1320,7 @@
 }     
 
 void XMFS::uninit() {
-#ifndef WIN32
+#if !defined(WIN32) && !defined(__amigaos4__)
   if(m_xdgHd != NULL) {
     xdgWipeHandle(m_xdgHd);
     free(m_xdgHd);
@@ -1523,10 +1523,12 @@
 void XMFS::migrateFSToXdgBaseDirIfRequired(const std::string& AppDir) {
   std::string v_oldUserDir;
 
-#ifndef WIN32
+#if !defined(WIN32) && !defined(__amigaos4__)
   v_oldUserDir = getenv("HOME") + std::string("/.") + AppDir;
-#else
+#elif defined(WIN32)
   v_oldUserDir =  win32_getHomeDir() + std::string("/.") + AppDir;
+#elif defined(__amigaos4__)
+  v_oldUserDir = "PROGDIR:userdata";
 #endif
 
   if(isDir(v_oldUserDir) == false) {
diff -Naur xmoto-0.5.10/src/xdgbasedir/src/basedir.c xmoto-0.5.10-new/src/xdgbasedir/src/basedir.c
--- xmoto-0.5.10/src/xdgbasedir/src/basedir.c	2011-10-12 05:48:24 
+++ xmoto-0.5.10-new/src/xdgbasedir/src/basedir.c	2012-06-23 06:19:08 
@@ -33,7 +33,7 @@
 #  include <stdlib.h>
 #endif
 #if HAVE_MEMORY_H || !defined(HAVE_CONFIG_H)
-#  include <memory.h>
+//#  include <memory.h>
 #endif
 #if HAVE_STRING_H || !defined(HAVE_CONFIG_H)
 #  include <string.h>

zzz.md

http://os4depot.net/index.php?function=showfile&file=game/driving/xmoto.lha