ViewVC Help
View File | Revision Log | Show Annotations | Revision Graph | Root Listing
root/cebix/BasiliskII/src/MacOSX/Emulator.mm
(Generate patch)

Comparing BasiliskII/src/MacOSX/Emulator.mm (file contents):
Revision 1.12 by gbeauche, 2007-06-13T16:10:05Z vs.
Revision 1.14 by nigel, 2009-10-08T09:20:51Z

# Line 4 | Line 4
4   *
5   *      $Id$
6   *
7 < *  Basilisk II (C) 1997-2005 Christian Bauer
7 > *  Basilisk II (C) 1997-2008 Christian Bauer
8   *
9   *  This program is free software; you can redistribute it and/or modify
10   *  it under the terms of the GNU General Public License as published by
# Line 35 | Line 35
35   #import "prefs.h"
36   #import "timer.h"
37  
38 < #undef check                            // memory.h defines a check macro, clashes with an OS X one?
38 > #undef check                            // memory.h defines a check macro,
39 >                                                        // which may clash with an OS X one on 10.1 or 10.2
40   #import "cpu_emulation.h"
41  
42   #define DEBUG 0
# Line 218 | Line 219
219                  int     argc = 0;
220                  char **argv;
221  
222 <                PrefsInit(argc, argv);
222 >                PrefsInit(NULL, argc, argv);
223                  SysInit();
224  
225                  emul = [NNThread new];

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines