diff options
| -rw-r--r-- | backends/morphos/build.rules | 4 | ||||
| -rw-r--r-- | backends/morphos/morphos.cpp | 2 | ||||
| -rw-r--r-- | backends/morphos/morphos_start.cpp | 6 | ||||
| -rw-r--r-- | backends/morphos/morphos_timer.cpp | 6 |
4 files changed, 10 insertions, 8 deletions
diff --git a/backends/morphos/build.rules b/backends/morphos/build.rules index 29bf59d1b3..feedd62111 100644 --- a/backends/morphos/build.rules +++ b/backends/morphos/build.rules @@ -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 \ diff --git a/backends/morphos/morphos.cpp b/backends/morphos/morphos.cpp index e6356f7c29..c27609d085 100644 --- a/backends/morphos/morphos.cpp +++ b/backends/morphos/morphos.cpp @@ -131,7 +131,7 @@ OSystem_MorphOS::OSystem_MorphOS(int game_id, SCALERTYPE gfx_mode, bool full_scr 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(); diff --git a/backends/morphos/morphos_start.cpp b/backends/morphos/morphos_start.cpp index 305cfc0b02..e94bd71e04 100644 --- a/backends/morphos/morphos_start.cpp +++ b/backends/morphos/morphos_start.cpp @@ -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 SCALERTYPE ScummGfxScaler = ST_INVALID; static BPTR OrigDirLock = 0; Library *CDDABase = NULL; -Device *TimerBase = NULL; +Library *TimerBase = NULL; OSystem_MorphOS *TheSystem = NULL; @@ -137,7 +138,7 @@ static void ReadToolTypes(WBArg *OfFile) 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 @@ int main() 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); diff --git a/backends/morphos/morphos_timer.cpp b/backends/morphos/morphos_timer.cpp index 451aff654c..da501563f0 100644 --- a/backends/morphos/morphos_timer.cpp +++ b/backends/morphos/morphos_timer.cpp @@ -106,7 +106,7 @@ bool Timer::SendMsg(ULONG msg_id, TimerProc procedure, LONG interval) 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 @@ void Timer::TimerService(Timer *this_ptr, Engine *engine) 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 @@ void Timer::TimerService(Timer *this_ptr, Engine *engine) 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); } } } |