Ticket #7977: scummvmqnx.patch

Makefile.qnx

@@ +1 @@
+# $Header: /cvsroot/scummvm/scummvm/Makefile,v 1.50 2002/06/17 13:16:50 kirben Exp $
+
+CC       = qcc
+CFLAGS   = -g -O -Wall -Wstrict-prototypes -Wuninitialized -Wno-long-long -Wno-multichar
+DEFINES  =
+LDFLAGS :=
+INCLUDES:= -I./ -I./sound
+LIBS     = -lncurses
+
+# Uncomment this to activate the MAD lib for compressed sound files
+DEFINES += -DCOMPRESSED_SOUND_FILE
+LIBS    += -lmad
+
+# Now, please choose a graphical output system between SDL, SDL/GL and X11.
+# Beware, only define one of them, otherwise the compilation will blow up.
+
+# Comment this if you want to disable SDL output
+OBJS     = sdl.o
+INCLUDES += `sdl-config --cflags`
+LIBS    += `sdl-config --libs`
+DEFINES += -DUNIX
+
+# Uncomment this (instead of the above) to activate the SDL with OpenGL output
+#OBJS    = sdl_gl.o
+#INCLUDES += `sdl-config --cflags`
+#LIBS    += `sdl-config --libs` -lGL
+#DEFINES += -DUNIX
+
+# Uncomment this if you rather want X11 output
+# OBJS     = x11.o
+# DEFINES += -DUNIX_X11
+# LDFLAGS := -L/usr/X11R6/lib -L/usr/local/lib
+# INCLUDES+= -I/usr/X11R6/include
+# LIBS    += -lpthread -lXext -lX11
+
+# Enable this if you want ScummVM to dump all scripts it runs.
+# This is mainly interesting for developers.
+# DEFINES += -DDUMP_SCRIPTS
+
+CPPFLAGS= $(DEFINES) $(INCLUDES)
+
+include Makefile.common
+
+dist:
+        rm -f $(ZIPFILE)
+        zip -q $(ZIPFILE) $(DISTFILES)

actor.cpp

@@ -103 +103 @@
         }
 }
 
-int Scumm::getAngleFromPos(int x, int y)
+int Scumm::getAngleFromPos(double x, double y)
 {
         if (_gameId == GID_DIG) {
                 double temp = atan2(x, -y);
@@ -125 +125 @@
 {
         int actorX, actorY;
         int diffX, diffY;
-        int32 XYFactor, YXFactor;
+        int XYFactor, YXFactor;
 
         actorX = x;
         actorY = y;

boxes.cpp

@@ -907 +907 @@
         int i;
         int Closest1 = 0, Closest2 = 0, Closest3 = 0;
         int Dist[8];
-        int Dist1, Dist2, Dist3;
+        float Dist1, Dist2, Dist3;
         int Box1, Box2, Box3;
         BoxCoords box;
         int polyx[8];

scumm.h

@@ -988 +988 @@
         static int oldDirToNewDir(int dir);
 
         static int normalizeAngle(int angle);
-        int getAngleFromPos(int x, int y);
+        int getAngleFromPos(double x, double y);
         static int fromSimpleDir(int dirtype, int dir);
         static int toSimpleDir(int dirtype, int dir);
         static int numSimpleDirDirections(int dirType);

stdafx.h

@@ -122 +122 @@
 #include <stdio.h>
 #include <fcntl.h>
 #include <stdlib.h>
+#ifndef __QNXNTO__
 #include <string.h>
+#else
+#include <strings.h>
+#endif /* __QNXNTO__ */
 #include <stdarg.h>
 #include <assert.h>
 #include <ctype.h>