diff options
-rw-r--r-- | Makefile.mingw | 2 | ||||
-rw-r--r-- | scummsys.h | 23 |
2 files changed, 1 insertions, 24 deletions
diff --git a/Makefile.mingw b/Makefile.mingw index 9f1bdd0bc2..b4de3c58fc 100644 --- a/Makefile.mingw +++ b/Makefile.mingw @@ -14,7 +14,7 @@ DEFINES = -DCOMPRESSED_SOUND_FILE LDFLAGS :=-mwindows -mconsole INCLUDES:= $(SDL_CFLAGS) -I./ -I./sound CPPFLAGS= $(DEFINES) $(INCLUDES) -LIBS = -lmingw32 -lwinmm -lwsock32 -lmad $(SDL_LIBS) +LIBS = -lmingw32 -lwinmm -lmad $(SDL_LIBS) EXEEXT :=.exe OBJS = sdl.o diff --git a/scummsys.h b/scummsys.h index 8e154ba0d8..6da86834c2 100644 --- a/scummsys.h +++ b/scummsys.h @@ -58,29 +58,6 @@ typedef signed long int32; #define END_PACK_STRUCTS pack(pop) #define GCC_PACK -#elif defined(__CYGWIN__) - -#define scumm_stricmp stricmp -#define CHECK_HEAP -#define SCUMM_LITTLE_ENDIAN - -#define FORCEINLINE inline -#define NORETURN __attribute__((__noreturn__)) -#define GCC_PACK __attribute__((packed)) -#define CDECL - -typedef unsigned char byte; -typedef unsigned char uint8; -typedef unsigned short uint16; -typedef unsigned long uint32; -typedef unsigned int uint; -typedef signed char int8; -typedef signed short int16; -typedef signed long int32; - -#define START_PACK_STRUCTS pack (push,1) -#define END_PACK_STRUCTS pack(pop) - #elif defined(__MINGW32__) #define scumm_stricmp stricmp |