--- src/math/sintab.h.orig	2003-03-03 12:18:21 +0300
+++ src/math/sintab.h	2006-06-26 10:44:07 +0400
@@ -19,12 +19,12 @@
 
     static SinTab &Obj(void);
 
-    float SinTab::Sin(int discrete_angle)
+    float Sin(int discrete_angle)
     {
       assert(discrete_angle < SINTABSIZE);
       return rotsin[discrete_angle];
     }
-    float SinTab::Cos(int discrete_angle)
+    float Cos(int discrete_angle)
     {
       assert(discrete_angle < SINTABSIZE);
       return rotcos[discrete_angle];
--- src/rot/im8.h.orig	2003-03-03 12:15:18 +0300
+++ src/rot/im8.h	2006-06-26 10:47:39 +0400
@@ -19,7 +19,7 @@
     ~Image8();
     void Write(const char *fname) const;
     void Invert(void);
-    Image8 *Image8::Smooth(void) const;
+    Image8 *Smooth(void) const;
 
     int w,h,maxval;
     unsigned char *data;

--- src/wld/Makefile.in.orig	2006-09-03 22:46:08 +0400
+++ src/wld/Makefile.in	2006-09-03 22:48:56 +0400
@@ -125,7 +125,7 @@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
 libwld_la_LDFLAGS = 
-libwld_la_LIBADD = 
+libwld_la_LIBADD = ../rot/librot.la ../math/libmath.la ../auxil/libauxil.la
 libwld_la_OBJECTS =  wldprim.lo wldcell.lo primdb.lo world.lo
 noinst_PROGRAMS =  tst$(EXEEXT)
 PROGRAMS =  $(noinst_PROGRAMS)

--- src/inp/Makefile.in.orig	2004-08-30 19:12:23 +0400
+++ src/inp/Makefile.in	2006-09-03 22:51:11 +0400
@@ -124,7 +124,7 @@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
 libinp_la_LDFLAGS = 
-libinp_la_LIBADD = 
+libinp_la_LIBADD = ../math/libmath.la ../auxil/libauxil.la $(SDL_LIBS) $(L_X11)
 libinp_la_OBJECTS =  inppad.lo inpsdl.lo inpkey.lo
 noinst_PROGRAMS =  tst$(EXEEXT)
 PROGRAMS =  $(noinst_PROGRAMS)

--- src/pres/Makefile.in.orig	2004-08-30 19:12:23 +0400
+++ src/pres/Makefile.in	2006-09-03 22:55:04 +0400
@@ -124,7 +124,7 @@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
 libpres_la_LDFLAGS = 
-libpres_la_LIBADD = 
+libpres_la_LIBADD = ../snd/libsnd.la ../wld/libwld.la ../rot/librot.la ../math/libmath.la ../auxil/libauxil.la
 libpres_la_OBJECTS =  scorecounter.lo presence.lo animpres.lo presdb.lo \
 spritedb.lo colmap.lo collisionhandlers.lo bullet.lo player.lo enemy.lo \
 shield.lo generator.lo

--- src/auxil/auxil.cxx.orig	2003-03-03 12:13:00 +0300
+++ src/auxil/auxil.cxx	2006-09-03 23:05:44 +0400
@@ -93,7 +93,7 @@
   if (path)
     return path;
 
-  return GetRootPath() + "/sprite/";
+  return std::string("REPLACEME") + "/sprite/";
 }
 
 //

--- src/math/Makefile.in.orig	2004-08-30 19:12:22 +0400
+++ src/math/Makefile.in	2006-09-03 23:09:46 +0400
@@ -96,7 +96,7 @@
 
 pkglib_LTLIBRARIES = libmath.la
 
-libmath_la_LIBADD =  $(L_MATH)
+libmath_la_LIBADD =  $(L_MATH) ../auxil/libauxil.la
 
 
 libmath_la_SOURCES =  sintab.cxx sintab.h const.h dregion2.h dregion2.inl dvector2.h dvector2.inl fixed.h fixed.inl maths.h matrix44.h matrix44.inl noise.h quat.h quat.inl utils.h vecc.h vecc.inl vector2.h vector2.inl vector3.h vector3.inl vector4.h vector4.inl

--- src/snd/soundengineoss.cxx.orig	2003-03-04 20:16:22 +0300
+++ src/snd/soundengineoss.cxx	2006-11-12 14:58:44 +0300
@@ -13,6 +13,7 @@
 #include <sys/ioctl.h>
 #include <fcntl.h>
 #include <linux/soundcard.h>
+#include <signal.h>
 
 #include "auxil.h"
 #include "soundclip.h"
@@ -110,7 +111,7 @@
   }
   else
   {
-    printf("threadid = %d\n", thread_id);
+    printf("threadid = %d\n", (int)thread_id);
   }
 
   retval = pthread_detach(thread_id);
@@ -261,7 +262,7 @@
   //printf("delay=%d\n", delay);
   if (delay==0)
     auxil_log(LOG_ERR,"Audio underrun detected");
-  if (delay > 0 && delay < SOUNDPACKETSIZE*sizeof(short))
+  if (delay > 0 && delay < int(SOUNDPACKETSIZE*sizeof(short)))
   {
     GetSemaphore();
     Send();