Ticket #7947: cygwin.diff

scummvm/Makefile.cygwin

@@ +1 @@
+# Makefile for CYGWIN 1.3.10 (gcc 2.95.3, sdl, mad)
+#
+CC      = gcc
+CFLAGS  = -O2 -Wall -Wstrict-prototypes -Wuninitialized -Wno-long-long -Wno-multichar
+DEFINES = -DUNIX -DUSE_WINDBG -DDUMP_SCRIPTS -DUSE_COMPRESSED_SOUND -DCOMPRESSED_SOUND_FILE
+LDFLAGS :=
+INCLUDES:= `sdl-config --cflags` -I./ -I./sound
+CPPFLAGS= $(DEFINES) $(INCLUDES)
+EXEEXT  := .exe
+
+LIBS    = `sdl-config --libs` -lwinmm -lmad -mconsole
+OBJS    = sdl.o
+
+include Makefile.common
+

scummvm/gameDetector.cpp

@@ -107 +107 @@
 
         if ((val = scummcfg->get("cdrom")))
                 _cdrom = atoi(val);
+
+        if ((val = scummcfg->get("debug_level"))) {
+          _debugLevel = atoi(val);
+          _debugMode = true;
+        }
 }
 
 void GameDetector::parseCommandLine(int argc, char **argv)
@@ -150 +150 @@
                                 case 'd':
                                         _debugMode = true;
                                         s = GET_VALUE();
-                                        if (*s != '\0')
+                                        if (*s != '\0') {
                                                 _debugLevel = atoi(s);
                                         debug(1,"Debugmode (level %d) on", _debugLevel);
+                                                scummcfg->set("debug_level", _debugLevel);
+                                        }
                                         goto NextArg;
                                 case 'e':
                                         s = GET_VALUE();

scummvm/scummsys.h

@@ -67 +67 @@
 #define FORCEINLINE inline
 #define NORETURN __attribute__((__noreturn__))
 #define GCC_PACK __attribute__((packed))
-#define CDECL
+/* #define CDECL */
+#define _HEAPOK 0
 
 typedef unsigned char byte;
 typedef unsigned char uint8;

scummvm/simon/simon.h

@@ -220 +220 @@
 };
 
 /* dummy typedefs to make it compile in *nix */
+#if !defined(__CYGWIN__)
 #if defined(UNIX) || defined(UNIX_X11) || defined(__MORPHOS__) || defined(__DC__)
 typedef void* HMIDISTRM;
 typedef void* HMIDIOUT;
@@ -238 +239 @@
 
 int GetAsyncKeyState(int key);
 
+#endif
 #endif
 
 class MidiDriver;