thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Small fixes to satisfy GCC with the new MOS includes

Browse source 
svn-id: r5370
This commit is contained in:
Ruediger Hanke 2002-11-01 23:09:07 +00:00
parent a15e6df2bd
commit 2dcff5fe85
4 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
backends/morphos/build.rules
View file

@ -1,8 +1,8 @@
CXX = g++ CXX = g++
CFLAGS = -Wno-multichar -fstrength-reduce -fno-rtti -O2 CFLAGS = -Wno-multichar -fstrength-reduce -fno-rtti -O2
DEFINES = -DNO_PPCINLINE_STDARG -DNO_PPCINLINE_VARARGS DEFINES =
LDFLAGS = -noixemul -s LDFLAGS = -noixemul -s
LIBS = -lamiga -lamigastubs -lcdda LIBS = -lamiga -lamigastubs -lcdda -lcybergraphics
INCLUDES += -Ibackends/morphos INCLUDES += -Ibackends/morphos
MODULES += backends/morphos MODULES += backends/morphos
OBJS += backends/morphos/morphos.o backends/morphos/morphos_scaler.o \ OBJS += backends/morphos/morphos.o backends/morphos/morphos_scaler.o \

2
backends/morphos/morphos.cpp
View file

@ -131,7 +131,7 @@ OSystem_MorphOS::OSystem_MorphOS(int game_id, SCALERTYPE gfx_mode, bool full_scr
OvlBitMap = NULL; OvlBitMap = NULL;
OvlSavedBuffer = NULL; OvlSavedBuffer = NULL;
TimerBase = TimerIORequest->tr_node.io_Device; TimerBase = (Library*) TimerIORequest->tr_node.io_Device;
ScummNoCursor = (UWORD *) AllocVec(16, MEMF_CLEAR); ScummNoCursor = (UWORD *) AllocVec(16, MEMF_CLEAR);
UpdateRegion = NewRegion(); UpdateRegion = NewRegion();
NewUpdateRegion = NewRegion(); NewUpdateRegion = NewRegion();

6
backends/morphos/morphos_start.cpp
View file

@ -42,6 +42,7 @@
#include "morphos_sound.h" #include "morphos_sound.h"
extern "C" WBStartup *_WBenchMsg; extern "C" WBStartup *_WBenchMsg;
struct Library* CyberGfxBase;
// For command line parsing // For command line parsing
static STRPTR usageTemplate = "STORY/A,DATAPATH/K,WINDOW/S,SCALER/K,AMIGA/S,MIDIUNIT/K/N,MUSIC/K,MUSICVOL/K/N,SFXVOL/K/N,TEMPO/K/N,TALKSPEED/K/N,NOSUBTITLES=NST/S"; static STRPTR usageTemplate = "STORY/A,DATAPATH/K,WINDOW/S,SCALER/K,AMIGA/S,MIDIUNIT/K/N,MUSIC/K,MUSICVOL/K/N,SFXVOL/K/N,TEMPO/K/N,TALKSPEED/K/N,NOSUBTITLES=NST/S";
@ -63,7 +64,7 @@ static SCALERTYPE ScummGfxScaler = ST_INVALID;
static BPTR OrigDirLock = 0; static BPTR OrigDirLock = 0;
Library *CDDABase = NULL; Library *CDDABase = NULL;
Device *TimerBase = NULL; Library *TimerBase = NULL;
OSystem_MorphOS *TheSystem = NULL; OSystem_MorphOS *TheSystem = NULL;
@ -137,7 +138,7 @@ static void ReadToolTypes(WBArg *OfFile)
char IconPath[256]; char IconPath[256];
NameFromLock(OfFile->wa_Lock, IconPath, 256); NameFromLock(OfFile->wa_Lock, IconPath, 256);
AddPart(IconPath, OfFile->wa_Name, 256); AddPart(IconPath, (STRPTR) OfFile->wa_Name, 256);
dobj = GetDiskObject(IconPath); dobj = GetDiskObject(IconPath);
if (dobj == NULL) if (dobj == NULL)
@ -250,6 +251,7 @@ int main()
char *argv[20]; char *argv[20];
char musicvol[6], sfxvol[6], talkspeed[12], tempo[12], scaler[14]; char musicvol[6], sfxvol[6], talkspeed[12], tempo[12], scaler[14];
int argc = 0; int argc = 0;
CyberGfxBase = OpenLibrary("cybergraphics.library",50);
InitSemaphore(&ScummSoundThreadRunning); InitSemaphore(&ScummSoundThreadRunning);
InitSemaphore(&ScummMusicThreadRunning); InitSemaphore(&ScummMusicThreadRunning);

6
backends/morphos/morphos_timer.cpp
View file

@ -106,7 +106,7 @@ bool Timer::SendMsg(ULONG msg_id, TimerProc procedure, LONG interval)
tmsg->tsm_MsgID = msg_id; tmsg->tsm_MsgID = msg_id;
tmsg->tsm_Callback = procedure; tmsg->tsm_Callback = procedure;
tmsg->tsm_Interval = interval; tmsg->tsm_Interval = interval;
PutMsg(&TimerServiceThread->pr_MsgPort, tmsg); PutMsg(&TimerServiceThread->pr_MsgPort, (Message*) tmsg);
WaitPort(reply_port); WaitPort(reply_port);
GetMsg(reply_port); GetMsg(reply_port);
@ -167,7 +167,7 @@ void Timer::TimerService(Timer *this_ptr, Engine *engine)
req->tr_node.io_Command = TR_ADDREQUEST; req->tr_node.io_Command = TR_ADDREQUEST;
req->tr_time.tv_secs = interval/1000; req->tr_time.tv_secs = interval/1000;
req->tr_time.tv_micro = (interval%1000)*1000; req->tr_time.tv_micro = (interval%1000)*1000;
SendIO(req); SendIO((IORequest*) req);
timers++; timers++;
} }
@ -224,7 +224,7 @@ void Timer::TimerService(Timer *this_ptr, Engine *engine)
req->tr_node.io_Command = TR_ADDREQUEST; req->tr_node.io_Command = TR_ADDREQUEST;
req->tr_time.tv_secs = interval/1000; req->tr_time.tv_secs = interval/1000;
req->tr_time.tv_micro = (interval%1000)*1000; req->tr_time.tv_micro = (interval%1000)*1000;
SendIO(req); SendIO((IORequest*) req);
} }
} }
} }