Macintosh-Tools/macemu
1
0
Fork 0
mirror of https://github.com/kanjitalk755/macemu.git synced 2024-12-24 10:32:32 +00:00
Code Issues Projects Releases Wiki Activity

fixed compilation problems

Browse Source
This commit is contained in:
cebix 2000-10-16 17:37:58 +00:00
parent 10f4035c6e
commit 1158d091da
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
BasiliskII/src/AmigaOS/main_amiga.cpp
View File

@ -125,6 +125,7 @@ extern "C" void ExceptionHandlerAsm(void);
extern "C" void IllInstrHandler(trap_regs *regs); extern "C" void IllInstrHandler(trap_regs *regs);
extern "C" void PrivViolHandler(trap_regs *regs); extern "C" void PrivViolHandler(trap_regs *regs);
extern "C" void quit_emulator(void); extern "C" void quit_emulator(void);
extern "C" void AsmTriggerNMI(void);
uint16 EmulatedSR; // Emulated SR (supervisor bit and interrupt mask) uint16 EmulatedSR; // Emulated SR (supervisor bit and interrupt mask)

2
BasiliskII/src/AmigaOS/prefs_editor_amiga.cpp
View File

@ -27,7 +27,7 @@
#include <libraries/asl.h> #include <libraries/asl.h>
#include <libraries/gtlayout.h> #include <libraries/gtlayout.h>
#include <libraries/Picasso96.h> #include <libraries/Picasso96.h>
#include <cybergraphx/cybergraphics.h> #include <cybergraphics/cybergraphics.h>
#include <graphics/displayinfo.h> #include <graphics/displayinfo.h>
#include <devices/ahi.h> #include <devices/ahi.h>
#include <proto/exec.h> #include <proto/exec.h>

3
BasiliskII/src/AmigaOS/video_amiga.cpp
View File

@ -656,8 +656,7 @@ static __saveds void periodic_func(void)
if (qualifier & IEQUALIFIER_REPEAT) // Keyboard repeat is done by MacOS if (qualifier & IEQUALIFIER_REPEAT) // Keyboard repeat is done by MacOS
break; break;
if ((qualifier & (IEQUALIFIER_LALT | IEQUALIFIER_LSHIFT | IEQUALIFIER_CONTROL)) == if ((qualifier & (IEQUALIFIER_LALT | IEQUALIFIER_LSHIFT | IEQUALIFIER_CONTROL)) ==
(IEQUALIFIER_LALT | IEQUALIFIER_LSHIFT | IEQUALIFIER_CONTROL)) (IEQUALIFIER_LALT | IEQUALIFIER_LSHIFT | IEQUALIFIER_CONTROL) && code == 0x5f) {
&& code == 0x5f) {
SetInterruptFlag(INTFLAG_NMI); SetInterruptFlag(INTFLAG_NMI);
TriggerInterrupt(); TriggerInterrupt();
break; break;