[Scummvm-cvs-logs] CVS: scummvm/backends/morphos morphos.cpp,1.11,1.12 morphos_timer.cpp,1.4,1.5 morphos_start.cpp,1.6,1.7 build.rules,1.2,1.3

[Ruediger Hanke]

Update of /cvsroot/scummvm/scummvm/backends/morphos
In directory usw-pr-cvs1:/tmp/cvs-serv29541

Modified Files:
	morphos.cpp morphos_timer.cpp morphos_start.cpp build.rules 
Log Message:
Small fixes to satisfy GCC with the new MOS includes

Index: morphos.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/morphos/morphos.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- morphos.cpp	28 Oct 2002 20:22:26 -0000	1.11
+++ morphos.cpp	1 Nov 2002 23:09:06 -0000	1.12
@@ -131,7 +131,7 @@
 	OvlBitMap = NULL;
 	OvlSavedBuffer = NULL;
 
-	TimerBase = TimerIORequest->tr_node.io_Device;
+	TimerBase = (Library*) TimerIORequest->tr_node.io_Device;
 	ScummNoCursor = (UWORD *) AllocVec(16, MEMF_CLEAR);
 	UpdateRegion = NewRegion();
 	NewUpdateRegion = NewRegion();

Index: morphos_timer.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/morphos/morphos_timer.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- morphos_timer.cpp	23 Sep 2002 16:31:05 -0000	1.4
+++ morphos_timer.cpp	1 Nov 2002 23:09:06 -0000	1.5
@@ -106,7 +106,7 @@
 	tmsg->tsm_MsgID = msg_id;
 	tmsg->tsm_Callback = procedure;
 	tmsg->tsm_Interval = interval;
-	PutMsg(&TimerServiceThread->pr_MsgPort, tmsg);
+	PutMsg(&TimerServiceThread->pr_MsgPort, (Message*) tmsg);
 	WaitPort(reply_port);
 	GetMsg(reply_port);
 	
@@ -167,7 +167,7 @@
 									req->tr_node.io_Command  = TR_ADDREQUEST;
 									req->tr_time.tv_secs  = interval/1000;
 									req->tr_time.tv_micro = (interval%1000)*1000;
-									SendIO(req);
+									SendIO((IORequest*) req);
 
 									timers++;
 								}
@@ -224,7 +224,7 @@
 					req->tr_node.io_Command  = TR_ADDREQUEST;
 					req->tr_time.tv_secs  = interval/1000;
 					req->tr_time.tv_micro = (interval%1000)*1000;
-					SendIO(req);
+					SendIO((IORequest*) req);
 				}
 			}
 		}

Index: morphos_start.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/morphos/morphos_start.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- morphos_start.cpp	11 Oct 2002 13:08:02 -0000	1.6
+++ morphos_start.cpp	1 Nov 2002 23:09:07 -0000	1.7
@@ -42,6 +42,7 @@
 #include "morphos_sound.h"
 
 extern "C" WBStartup *_WBenchMsg;
+struct Library* CyberGfxBase;
 
 // 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";
@@ -63,7 +64,7 @@
 static BPTR OrigDirLock = 0;
 
 Library *CDDABase = NULL;
-Device *TimerBase = NULL;
+Library *TimerBase = NULL;
 
 OSystem_MorphOS *TheSystem = NULL;
 
@@ -137,7 +138,7 @@
 	char IconPath[256];
 
 	NameFromLock(OfFile->wa_Lock, IconPath, 256);
-	AddPart(IconPath, OfFile->wa_Name, 256);
+	AddPart(IconPath, (STRPTR) OfFile->wa_Name, 256);
 
 	dobj = GetDiskObject(IconPath);
 	if (dobj == NULL)
@@ -250,6 +251,7 @@
 	char *argv[20];
 	char musicvol[6], sfxvol[6], talkspeed[12], tempo[12], scaler[14];
 	int argc = 0;
+	CyberGfxBase = OpenLibrary("cybergraphics.library",50);
 
 	InitSemaphore(&ScummSoundThreadRunning);
 	InitSemaphore(&ScummMusicThreadRunning);

Index: build.rules
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/morphos/build.rules,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- build.rules	22 Aug 2002 10:43:50 -0000	1.2
+++ build.rules	1 Nov 2002 23:09:07 -0000	1.3
@@ -1,8 +1,8 @@
 CXX     = g++
 CFLAGS  = -Wno-multichar -fstrength-reduce -fno-rtti -O2
-DEFINES = -DNO_PPCINLINE_STDARG -DNO_PPCINLINE_VARARGS
+DEFINES =
 LDFLAGS = -noixemul -s
-LIBS	= -lamiga -lamigastubs -lcdda
+LIBS	= -lamiga -lamigastubs -lcdda -lcybergraphics
 INCLUDES += -Ibackends/morphos
 MODULES  += backends/morphos
 OBJS	 += backends/morphos/morphos.o backends/morphos/morphos_scaler.o \