diff -u -r -w -N scummvm/scummvm/Makefile.cygwin myscummvm/scummvm/Makefile.cygwin
old
|
new
|
|
| 1 | # Makefile for CYGWIN 1.3.10 (gcc 2.95.3, sdl, mad) |
| 2 | # |
| 3 | CC = gcc |
| 4 | CFLAGS = -O2 -Wall -Wstrict-prototypes -Wuninitialized -Wno-long-long -Wno-multichar |
| 5 | DEFINES = -DUNIX -DUSE_WINDBG -DDUMP_SCRIPTS -DUSE_COMPRESSED_SOUND -DCOMPRESSED_SOUND_FILE |
| 6 | LDFLAGS := |
| 7 | INCLUDES:= `sdl-config --cflags` -I./ -I./sound |
| 8 | CPPFLAGS= $(DEFINES) $(INCLUDES) |
| 9 | EXEEXT := .exe |
| 10 | |
| 11 | LIBS = `sdl-config --libs` -lwinmm -lmad -mconsole |
| 12 | OBJS = sdl.o |
| 13 | |
| 14 | include Makefile.common |
| 15 | |
diff -u -r -w -N scummvm/scummvm/gameDetector.cpp myscummvm/scummvm/gameDetector.cpp
old
|
new
|
|
107 | 107 | |
108 | 108 | if ((val = scummcfg->get("cdrom"))) |
109 | 109 | _cdrom = atoi(val); |
| 110 | |
| 111 | if ((val = scummcfg->get("debug_level"))) { |
| 112 | _debugLevel = atoi(val); |
| 113 | _debugMode = true; |
| 114 | } |
110 | 115 | } |
111 | 116 | |
112 | 117 | void GameDetector::parseCommandLine(int argc, char **argv) |
… |
… |
|
150 | 150 | case 'd': |
151 | 151 | _debugMode = true; |
152 | 152 | s = GET_VALUE(); |
153 | | if (*s != '\0') |
| 153 | if (*s != '\0') { |
154 | 154 | _debugLevel = atoi(s); |
155 | 155 | debug(1,"Debugmode (level %d) on", _debugLevel); |
| 156 | scummcfg->set("debug_level", _debugLevel); |
| 157 | } |
156 | 158 | goto NextArg; |
157 | 159 | case 'e': |
158 | 160 | s = GET_VALUE(); |
diff -u -r -w -N scummvm/scummvm/scummsys.h myscummvm/scummvm/scummsys.h
old
|
new
|
|
67 | 67 | #define FORCEINLINE inline |
68 | 68 | #define NORETURN __attribute__((__noreturn__)) |
69 | 69 | #define GCC_PACK __attribute__((packed)) |
70 | | #define CDECL |
| 70 | /* #define CDECL */ |
| 71 | #define _HEAPOK 0 |
71 | 72 | |
72 | 73 | typedef unsigned char byte; |
73 | 74 | typedef unsigned char uint8; |
diff -u -r -w -N scummvm/scummvm/simon/simon.h myscummvm/scummvm/simon/simon.h
old
|
new
|
|
220 | 220 | }; |
221 | 221 | |
222 | 222 | /* dummy typedefs to make it compile in *nix */ |
| 223 | #if !defined(__CYGWIN__) |
223 | 224 | #if defined(UNIX) || defined(UNIX_X11) || defined(__MORPHOS__) || defined(__DC__) |
224 | 225 | typedef void* HMIDISTRM; |
225 | 226 | typedef void* HMIDIOUT; |
… |
… |
|
238 | 239 | |
239 | 240 | int GetAsyncKeyState(int key); |
240 | 241 | |
| 242 | #endif |
241 | 243 | #endif |
242 | 244 | |
243 | 245 | class MidiDriver; |