| # | 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]; | |
| – | Removed lines |
| + | Added lines |
| < | Changed lines |
| > | Changed lines |