Ticket #7977: scummvmqnx.patch

File scummvmqnx.patch, 4.0 KB (added by SF/theealien, 19 years ago)

Allows for building of ScummVM on QNX 6.x

  • Makefile.qnx

    Common subdirectories: scummvmold/CVS and scummvmnew/CVS
    diff -N -u scummvmold/Makefile.qnx scummvmnew/Makefile.qnx
    old new  
     1# $Header: /cvsroot/scummvm/scummvm/Makefile,v 1.50 2002/06/17 13:16:50 kirben Exp $
     2
     3CC       = qcc
     4CFLAGS   = -g -O -Wall -Wstrict-prototypes -Wuninitialized -Wno-long-long -Wno-multichar
     5DEFINES  =
     6LDFLAGS :=
     7INCLUDES:= -I./ -I./sound
     8LIBS     = -lncurses
     9
     10# Uncomment this to activate the MAD lib for compressed sound files
     11DEFINES += -DCOMPRESSED_SOUND_FILE
     12LIBS    += -lmad
     13
     14# Now, please choose a graphical output system between SDL, SDL/GL and X11.
     15# Beware, only define one of them, otherwise the compilation will blow up.
     16
     17# Comment this if you want to disable SDL output
     18OBJS     = sdl.o
     19INCLUDES += `sdl-config --cflags`
     20LIBS    += `sdl-config --libs`
     21DEFINES += -DUNIX
     22
     23# Uncomment this (instead of the above) to activate the SDL with OpenGL output
     24#OBJS    = sdl_gl.o
     25#INCLUDES += `sdl-config --cflags`
     26#LIBS    += `sdl-config --libs` -lGL
     27#DEFINES += -DUNIX
     28
     29# Uncomment this if you rather want X11 output
     30# OBJS     = x11.o
     31# DEFINES += -DUNIX_X11
     32# LDFLAGS := -L/usr/X11R6/lib -L/usr/local/lib
     33# INCLUDES+= -I/usr/X11R6/include
     34# LIBS    += -lpthread -lXext -lX11
     35
     36# Enable this if you want ScummVM to dump all scripts it runs.
     37# This is mainly interesting for developers.
     38# DEFINES += -DDUMP_SCRIPTS
     39
     40CPPFLAGS= $(DEFINES) $(INCLUDES)
     41
     42include Makefile.common
     43
     44dist:
     45        rm -f $(ZIPFILE)
     46        zip -q $(ZIPFILE) $(DISTFILES)
  • actor.cpp

    Common subdirectories: scummvmold/PocketSCUMM and scummvmnew/PocketSCUMM
    diff -N -u scummvmold/actor.cpp scummvmnew/actor.cpp
    old new  
    103103        }
    104104}
    105105
    106 int Scumm::getAngleFromPos(int x, int y)
     106int Scumm::getAngleFromPos(double x, double y)
    107107{
    108108        if (_gameId == GID_DIG) {
    109109                double temp = atan2(x, -y);
     
    125125{
    126126        int actorX, actorY;
    127127        int diffX, diffY;
    128         int32 XYFactor, YXFactor;
     128        int XYFactor, YXFactor;
    129129
    130130        actorX = x;
    131131        actorY = y;
  • boxes.cpp

    diff -N -u scummvmold/boxes.cpp scummvmnew/boxes.cpp
    old new  
    907907        int i;
    908908        int Closest1 = 0, Closest2 = 0, Closest3 = 0;
    909909        int Dist[8];
    910         int Dist1, Dist2, Dist3;
     910        float Dist1, Dist2, Dist3;
    911911        int Box1, Box2, Box3;
    912912        BoxCoords box;
    913913        int polyx[8];
  • scumm.h

    Common subdirectories: scummvmold/dc and scummvmnew/dc
    Common subdirectories: scummvmold/debian and scummvmnew/debian
    Common subdirectories: scummvmold/gui and scummvmnew/gui
    Common subdirectories: scummvmold/mac and scummvmnew/mac
    Common subdirectories: scummvmold/macosclassic and scummvmnew/macosclassic
    Common subdirectories: scummvmold/morphos and scummvmnew/morphos
    diff -N -u scummvmold/scumm.h scummvmnew/scumm.h
    old new  
    988988        static int oldDirToNewDir(int dir);
    989989
    990990        static int normalizeAngle(int angle);
    991         int getAngleFromPos(int x, int y);
     991        int getAngleFromPos(double x, double y);
    992992        static int fromSimpleDir(int dirtype, int dir);
    993993        static int toSimpleDir(int dirtype, int dir);
    994994        static int numSimpleDirDirections(int dirType);
  • stdafx.h

    Common subdirectories: scummvmold/simon and scummvmnew/simon
    Common subdirectories: scummvmold/sound and scummvmnew/sound
    diff -N -u scummvmold/stdafx.h scummvmnew/stdafx.h
    old new  
    122122#include <stdio.h>
    123123#include <fcntl.h>
    124124#include <stdlib.h>
     125#ifndef __QNXNTO__
    125126#include <string.h>
     127#else
     128#include <strings.h>
     129#endif /* __QNXNTO__ */
    126130#include <stdarg.h>
    127131#include <assert.h>
    128132#include <ctype.h>