Ticket #7947: cygwin.diff

File cygwin.diff, 2.5 KB (added by SF/mnepomuk, 18 years ago)

Cygwin compile + _debugLevel in config

  • scummvm/Makefile.cygwin

    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#
     3CC      = gcc
     4CFLAGS  = -O2 -Wall -Wstrict-prototypes -Wuninitialized -Wno-long-long -Wno-multichar
     5DEFINES = -DUNIX -DUSE_WINDBG -DDUMP_SCRIPTS -DUSE_COMPRESSED_SOUND -DCOMPRESSED_SOUND_FILE
     6LDFLAGS :=
     7INCLUDES:= `sdl-config --cflags` -I./ -I./sound
     8CPPFLAGS= $(DEFINES) $(INCLUDES)
     9EXEEXT  := .exe
     10
     11LIBS    = `sdl-config --libs` -lwinmm -lmad -mconsole
     12OBJS    = sdl.o
     13
     14include Makefile.common
     15
  • scummvm/gameDetector.cpp

    diff -u -r -w -N scummvm/scummvm/gameDetector.cpp myscummvm/scummvm/gameDetector.cpp
    old new  
    107107
    108108        if ((val = scummcfg->get("cdrom")))
    109109                _cdrom = atoi(val);
     110
     111        if ((val = scummcfg->get("debug_level"))) {
     112          _debugLevel = atoi(val);
     113          _debugMode = true;
     114        }
    110115}
    111116
    112117void GameDetector::parseCommandLine(int argc, char **argv)
     
    150150                                case 'd':
    151151                                        _debugMode = true;
    152152                                        s = GET_VALUE();
    153                                         if (*s != '\0')
     153                                        if (*s != '\0') {
    154154                                                _debugLevel = atoi(s);
    155155                                        debug(1,"Debugmode (level %d) on", _debugLevel);
     156                                                scummcfg->set("debug_level", _debugLevel);
     157                                        }
    156158                                        goto NextArg;
    157159                                case 'e':
    158160                                        s = GET_VALUE();
  • scummvm/scummsys.h

    diff -u -r -w -N scummvm/scummvm/scummsys.h myscummvm/scummvm/scummsys.h
    old new  
    6767#define FORCEINLINE inline
    6868#define NORETURN __attribute__((__noreturn__))
    6969#define GCC_PACK __attribute__((packed))
    70 #define CDECL
     70/* #define CDECL */
     71#define _HEAPOK 0
    7172
    7273typedef unsigned char byte;
    7374typedef unsigned char uint8;
  • scummvm/simon/simon.h

    diff -u -r -w -N scummvm/scummvm/simon/simon.h myscummvm/scummvm/simon/simon.h
    old new  
    220220};
    221221
    222222/* dummy typedefs to make it compile in *nix */
     223#if !defined(__CYGWIN__)
    223224#if defined(UNIX) || defined(UNIX_X11) || defined(__MORPHOS__) || defined(__DC__)
    224225typedef void* HMIDISTRM;
    225226typedef void* HMIDIOUT;
     
    238239
    239240int GetAsyncKeyState(int key);
    240241
     242#endif
    241243#endif
    242244
    243245class MidiDriver;