diff options
| author | Max Horn | 2002-07-08 13:34:14 +0000 |
|---|---|---|
| committer | Max Horn | 2002-07-08 13:34:14 +0000 |
| commit | 6538be45fa7e21036515aa63da6f5b384de52198 (patch) | |
| tree | 30014d6d5942645acd5d41545baf6a2a6d7ade81 /mac | |
| parent | 204a5394199b4b0a37686d4919a0255f29eb9cdb (diff) | |
| download | scummvm-rg350-6538be45fa7e21036515aa63da6f5b384de52198.tar.gz scummvm-rg350-6538be45fa7e21036515aa63da6f5b384de52198.tar.bz2 scummvm-rg350-6538be45fa7e21036515aa63da6f5b384de52198.zip | |
made mac port compile & link with current source; however, it doesn't work at all, so don't be to excited about this checkin :-)
svn-id: r4494
Diffstat (limited to 'mac')
| -rw-r--r-- | mac/mac.cpp | 19 | ||||
| -rw-r--r-- | mac/scummvm.mcp | bin | 158716 -> 158716 bytes |
2 files changed, 12 insertions, 7 deletions
diff --git a/mac/mac.cpp b/mac/mac.cpp index 1339e3b031..5b5450cc83 100644 --- a/mac/mac.cpp +++ b/mac/mac.cpp @@ -92,10 +92,13 @@ public: void update_cdrom(); // Add a new callback timer - void set_timer(int timer, int (*callback)(int)) - { - // FIXME - TODO - } + void set_timer(int timer, int (*callback)(int)) { /* FIXME - TODO */ } + + // Mutex handling + void *create_mutex(void) { return NULL; /* FIXME - TODO */ } + void lock_mutex(void *mutex) { /* FIXME - TODO */ } + void unlock_mutex(void *mutex) { /* FIXME - TODO */ } + void delete_mutex(void *mutex) { /* FIXME - TODO */ } // Quit void quit(); @@ -1199,7 +1202,8 @@ bool OSystem_MAC::poll_event(Event *event) if(wref != FrontWindow()) { - ActivateWindow(wref, true); +// FIXME - seems some versions of the CarbonLib stub are missing ActivateWindow +// ActivateWindow(wref, true); BringToFront(wref); } return true; @@ -1274,7 +1278,8 @@ bool OSystem_MAC::poll_event(Event *event) NULL, &theWin); if(theWin != FrontWindow()) { - ActivateWindow(theWin, true); +// FIXME - seems some versions of the CarbonLib stub are missing ActivateWindow +// ActivateWindow(theWin, true); BringToFront(theWin); } @@ -1797,4 +1802,4 @@ void OSystem_MAC::update_rects() GetPortBitMapForCopyBits(GetWindowPort(wref)), &rec, &rec, srcCopy, 0L); } -}
\ No newline at end of file +} diff --git a/mac/scummvm.mcp b/mac/scummvm.mcp Binary files differindex f11c90083a..f233f7c539 100644 --- a/mac/scummvm.mcp +++ b/mac/scummvm.mcp |