create a slim version of mikmod library:

- disable the high quality mixer: slow, and we don't use it.
- disable the amiga module depackers: we don't need them.
- disable the sample player api: we don't want or need it.
- disable all drivers in dos, macosx, os2 and win32 makefiles.
- change zerobuf of drv_nos into a 1024 bytes array: we don't
  do MikMod_Update(), therefore it isn't actually used.
- disable the driver related MERR_ messages in mmio/mmerror.c:
  we disable all and not use any of the audio output drivers.

diff --git a/libmikmod/drivers/drv_nos.c b/libmikmod/drivers/drv_nos.c
index b870985..b92453c 100644
--- a/libmikmod/drivers/drv_nos.c
+++ b/libmikmod/drivers/drv_nos.c
@@ -42,9 +42,9 @@
 
 #include "mikmod_internals.h"
 
-#define ZEROLEN 32768
+#define ZEROLEN 1024/* meh... */
 
-static	SBYTE *zerobuf=NULL;
+static	SBYTE zerobuf[ZEROLEN];
 
 static BOOL NS_IsThere(void)
 {
@@ -53,20 +53,16 @@ static BOOL NS_IsThere(void)
 
 static int NS_Init(void)
 {
-	zerobuf=(SBYTE*)MikMod_malloc(ZEROLEN);
 	return VC_Init();
 }
 
 static void NS_Exit(void)
 {
 	VC_Exit();
-	MikMod_free(zerobuf);
-	zerobuf=NULL;
 }
 
 static void NS_Update(void)
 {
-	if (zerobuf)
 		VC_WriteBytes(zerobuf,ZEROLEN);
 }
 
diff --git a/libmikmod/playercode/mdriver.c b/libmikmod/playercode/mdriver.c
index 607f48f..7d2ff2a 100644
--- a/libmikmod/playercode/mdriver.c
+++ b/libmikmod/playercode/mdriver.c
@@ -762,6 +762,11 @@ MIKMODAPI BOOL MikMod_Active(void)
 	return result;
 }
 
+#if 1 /* not needed in uhexen2. */
+MIKMODAPI SBYTE Sample_Play(SAMPLE *s,ULONG start,UBYTE flags) {
+	return -1;
+}
+#else /* not needed in uhexen2. */
 /* Plays a sound effects sample.  Picks a voice from the number of voices
    allocated for use as sound effects (loops through voices, skipping all active
    criticals).
@@ -816,6 +821,7 @@ MIKMODAPI SBYTE Sample_Play(SAMPLE *s,ULONG start,UBYTE flags)
 
 	return result;
 }
+#endif
 
 MIKMODAPI long MikMod_GetVersion(void)
 {
diff --git a/libmikmod/playercode/mwav.c b/libmikmod/playercode/mwav.c
index 6f2394f..2bc6a25 100644
--- a/libmikmod/playercode/mwav.c
+++ b/libmikmod/playercode/mwav.c
@@ -45,6 +45,34 @@
 extern int fprintf(FILE *, const char *, ...);
 #endif
 
+#if 1 /* not needed in uhexen2. */
+MIKMODAPI SAMPLE* Sample_LoadRawGeneric(MREADER* reader, ULONG rate, ULONG channel, ULONG flags) {
+	return NULL;
+}
+MIKMODAPI SAMPLE *Sample_LoadRawMem(const char *buf, int len, ULONG rate, ULONG channel, ULONG flags) {
+	return NULL;
+}
+MIKMODAPI SAMPLE* Sample_LoadRawFP(FILE *fp, ULONG rate, ULONG channel, ULONG flags) {
+	return NULL;
+}
+MIKMODAPI SAMPLE* Sample_LoadRaw(const CHAR* filename, ULONG rate, ULONG channel, ULONG flags) {
+	return NULL;
+}
+MIKMODAPI SAMPLE* Sample_LoadGeneric(MREADER* reader) {
+	return NULL;
+}
+MIKMODAPI SAMPLE *Sample_LoadMem(const char *buf, int len) {
+	return NULL;
+}
+MIKMODAPI SAMPLE* Sample_LoadFP(FILE *fp) {
+	return NULL;
+}
+MIKMODAPI SAMPLE* Sample_Load(const CHAR* filename) {
+	return NULL;
+}
+MIKMODAPI void Sample_Free(SAMPLE* si) {
+}
+#else /* not needed in uhexen2. */
 static void extract_channel(const char *src, char *dst, int num_chan, int num_samples, int samp_size, int channel);
 
 
@@ -384,5 +412,6 @@ static void extract_channel(const char *src, char *dst, int num_chan, int num_sa
 		dst += samp_size;
 	}
 }
+#endif
 
 /* ex:set ts=8: */
diff --git a/libmikmod/mmio/mmerror.c b/libmikmod/mmio/mmerror.c
index e8e4db8..48f4366 100644
--- a/libmikmod/mmio/mmerror.c
+++ b/libmikmod/mmio/mmerror.c
@@ -42,7 +42,7 @@
 
 #define _mmerr_invalid "Invalid error code"
 
-static const char *_mm_errmsg[MMERR_MAX+1] =
+static const char *_mm_errmsg[18] =
 {
 /* No error */
 
@@ -76,215 +76,11 @@ static const char *_mm_errmsg[MMERR_MAX+1] =
 	"Sound device not detected",
 	"Device number out of range",
 	"Software mixer failure",
-	"Could not open sound device",
-	"This driver supports 8 bit linear output only",
-	"This driver supports 16 bit linear output only",
-	"This driver supports stereo output only",
-	"This driver supports uLaw output (8 bit mono, 8 kHz) only",
-	"Unable to set non-blocking mode for audio device",
-
-/* AudioFile driver errors  */
-#ifdef DRV_AF
-	"Cannot find suitable AudioFile audio port",
-#else
-	_mmerr_invalid,
-#endif
-
-/* AIX driver errors */
-#ifdef DRV_AIX
-	"Configuration (init step) of audio device failed",
-	"Configuration (control step) of audio device failed",
-	"Configuration (start step) of audio device failed",
-#else
-	_mmerr_invalid, _mmerr_invalid, _mmerr_invalid,
-#endif
-
-/* Ultrasound driver errors */
-#ifdef DRV_ULTRA
-	"Ultrasound driver only works in 16 bit stereo 44 KHz",
-	"Ultrasound card could not be reset",
-	"Could not start Ultrasound timer",
-#else
-	_mmerr_invalid, _mmerr_invalid, _mmerr_invalid,
-#endif
-
-/* HP driver errors  */
-#ifdef DRV_HP
-	"Unable to select 16bit-linear sample format",
-	"Could not select requested sample-rate",
-	"Could not select requested number of channels",
-	"Unable to select audio output",
-	"Unable to get audio description",
-	"Could not set transmission buffer size",
-#else
-	_mmerr_invalid, _mmerr_invalid, _mmerr_invalid,
-	_mmerr_invalid, _mmerr_invalid, _mmerr_invalid,
-#endif
-
-/* Open Sound System driver errors */
-#ifdef DRV_OSS
-	"Could not set fragment size",
-	"Could not set sample size",
-	"Could not set mono/stereo setting",
-	"Could not set sample rate",
-#else
-	_mmerr_invalid, _mmerr_invalid, _mmerr_invalid,
-	_mmerr_invalid,
-#endif
-
-/* SGI driver errors */
-#ifdef DRV_SGI
-	"Unsupported sample rate",
-	"Hardware does not support 16 bit sound",
-	"Hardware does not support 8 bit sound",
-	"Hardware does not support stereo sound",
-	"Hardware does not support mono sound",
-#else
-	_mmerr_invalid, _mmerr_invalid, _mmerr_invalid,
-	_mmerr_invalid, _mmerr_invalid,
-#endif
-
-/* Sun driver errors */
-#ifdef DRV_SUN
-	"Sound device initialization failed",
-#else
-	_mmerr_invalid,
-#endif
-
-/* OS/2 drivers errors */
-#if defined(DRV_OS2) || defined(DRV_DART)
-	"Could not set mixing parameters",
-#else
-	_mmerr_invalid,
-#endif
-#ifdef DRV_OS2
-	"Could not create playback semaphores",
-	"Could not create playback timer",
-	"Could not create playback thread",
-#else
-	_mmerr_invalid, _mmerr_invalid, _mmerr_invalid,
-#endif
-
-/* DirectSound driver errors */
-#ifdef DRV_DS
-	"Could not set playback priority",
-	"Could not create playback buffers",
-	"Could not set playback format",
-	"Could not register callback",
-	"Could not register event",
-	"Could not create playback thread",
-	"Could not initialize playback thread",
-#else
-	_mmerr_invalid, _mmerr_invalid, _mmerr_invalid,
-	_mmerr_invalid, _mmerr_invalid, _mmerr_invalid,
-	_mmerr_invalid,
-#endif
-
-/* Windows Multimedia API driver errors */
-#ifdef DRV_WIN
-	"Invalid device handle",
-	"The resource is already allocated",
-	"Invalid device identifier",
-	"Unsupported output format",
-	"Unknown error",
-#else
-	_mmerr_invalid, _mmerr_invalid, _mmerr_invalid,
-	_mmerr_invalid, _mmerr_invalid,
-#endif
-
-/* Macintosh driver errors */
-#ifdef DRV_MAC
-	"Unsupported sample rate",
-	"Could not start playback",
-#else
-	_mmerr_invalid, _mmerr_invalid,
-#endif
-
-/* MacOS X/Darwin driver errors */
-#ifdef DRV_OSX
-	_mmerr_invalid,
-	_mmerr_invalid,
-	"Could not set playback format",
-	_mmerr_invalid,
-	_mmerr_invalid,
-	_mmerr_invalid,
-	"Could not start audio device",
-	_mmerr_invalid,
-#else
-	_mmerr_invalid, _mmerr_invalid, _mmerr_invalid,
-	_mmerr_invalid, _mmerr_invalid, _mmerr_invalid,
-	_mmerr_invalid, _mmerr_invalid,
-#endif
-
-/* DOS driver errors */
-#ifdef DRV_WSS
-	"WSS_STARTDMA",
-#else
-	_mmerr_invalid,
-#endif
-#ifdef DRV_SB
-	"SB_STARTDMA",
-#else
-	_mmerr_invalid,
-#endif
-
-/* float32 output */
-
-	"This driver doesn't support 32 bit float output",
-
-/* OpenAL driver errors */
-#ifdef DRV_OPENAL
-	"Could not create context",
-	"Could not make context current",
-	"Could not create buffers",
-	"Could not create sources",
-	"Could not change source parameters",
-	"Could not queue buffers",
-	"Could not unqueue buffers",
-	"Could not copy buffer data",
-	"Could not get source parameters",
-	"Could not play source",
-	"Could not stop source",
-#else
-	_mmerr_invalid, _mmerr_invalid, _mmerr_invalid,
-	_mmerr_invalid, _mmerr_invalid, _mmerr_invalid,
-	_mmerr_invalid, _mmerr_invalid, _mmerr_invalid,
-	_mmerr_invalid, _mmerr_invalid,
-#endif
-
-/* ALSA driver errors */
-#ifdef DRV_ALSA
-	"No ALSA configurations available",
-	"Could not set ALSA output params",
-	"Could not set playback format",
-	"Could not set sample rate",
-	"Could not set mono/stereo setting",
-	"Could not get buffer size from ALSA",
-	"ALSA PCM start error",
-	"ALSA PCM write error",
-	"ALSA PCM recovery failure",
-#else
-	_mmerr_invalid, _mmerr_invalid, _mmerr_invalid,
-	_mmerr_invalid, _mmerr_invalid, _mmerr_invalid,
-	_mmerr_invalid, _mmerr_invalid, _mmerr_invalid,
-#endif
-
-/* Sndio errors */
-#ifdef DRV_SNDIO
-	"Could not set SNDIO output params",
-	"Unsupported SNDIO output params",
-#else
-	_mmerr_invalid, _mmerr_invalid,
-#endif
-
-/* Invalid error */
-
-	_mmerr_invalid
 };
 
 MIKMODAPI const char *MikMod_strerror(int code)
 {
-	if ((code<0)||(code>MMERR_MAX)) code=MMERR_MAX;
+	if ((code<0)||(code>17)) return _mmerr_invalid;
 	return _mm_errmsg[code];
 }
 
diff --git a/libmikmod/dos/Makefile.dj b/libmikmod/dos/Makefile.dj
index 301127c..36fd5d0 100644
--- a/libmikmod/dos/Makefile.dj
+++ b/libmikmod/dos/Makefile.dj
@@ -36,20 +36,9 @@ endif
 
 COMPILE=$(CC) -c $(CFLAGS)
 
-OBJ=out/dosdma.o \
-    out/dosirq.o \
-    out/dosutil.o \
-    out/dosgus.o \
-    out/drv_ultra.o \
-    out/dossb.o \
-    out/drv_sb.o \
-    out/doswss.o \
-    out/drv_wss.o \
-    out/drv_wav.o \
+OBJ=out/drv_wav.o \
     out/drv_aiff.o \
     out/drv_raw.o \
-    out/drv_stdout.o \
-    out/drv_pipe.o \
     out/drv_nos.o \
     out/strcasecmp.o \
     out/load_669.o \
@@ -78,10 +67,6 @@ OBJ=out/dosdma.o \
     out/mmio.o \
     out/mdriver.o \
     out/mdreg.o \
-    out/mmcmp.o \
-    out/pp20.o \
-    out/s404.o \
-    out/xpk.o \
     out/mloader.o \
     out/mlreg.o \
     out/mlutil.o \
@@ -93,6 +78,11 @@ OBJ=out/dosdma.o \
     out/virtch.o \
     out/virtch2.o \
     out/virtch_common.o
+# out/dosdma.o out/dosirq.o out/dosutil.o out/dosgus.o out/drv_ultra.o out/dossb.o out/drv_sb.o out/doswss.o out/drv_wss.o out/drv_stdout.o out/drv_pipe.o
+#   out/mmcmp.o
+#   out/pp20.o
+#   out/s404.o
+#   out/xpk.o
 #   out/mdulaw.o
 
 .PHONY: clean
diff --git a/libmikmod/dos/config.h b/libmikmod/dos/config.h
index 0bf2893..3ed7f5c 100644
--- a/libmikmod/dos/config.h
+++ b/libmikmod/dos/config.h
@@ -9,10 +9,10 @@
 #define HAVE_VSNPRINTF
 
 /* Define to disable the high quality mixer (build only with the standart mixer) */
-/*#define NO_HQMIXER*/
+#define NO_HQMIXER
 
 /* disable support for module depackers */
-/*#define NO_DEPACKERS*/
+#define NO_DEPACKERS
 
 /* Define if your system supports binary pipes (i.e. Unix) */
 /*#define DRV_PIPE*/
@@ -20,18 +20,18 @@
 /*#define DRV_STDOUT*/
 
 /* Define if you want an .aiff file writer driver */
-#define DRV_AIFF
+/*#define DRV_AIFF*/
 /* Define if you want a raw pcm data file writer driver */
-#define DRV_RAW
+/*#define DRV_RAW*/
 /* Define if you want a .wav file writer driver */
-#define DRV_WAV
+/*#define DRV_WAV*/
 
 /* Define if the Gravis UltraSound driver is compiled */
-#define DRV_ULTRA
+/*#define DRV_ULTRA*/
 /* Define if the Windows Sound System driver is compiled */
-#define DRV_WSS
+/*#define DRV_WSS*/
 /* Define if the SoundBlaster driver is compiled */
-#define DRV_SB
+/*#define DRV_SB*/
 
 /* Define if you want a debug version of the library */
 #undef MIKMOD_DEBUG
diff --git a/libmikmod/macosx/Makefile.darwin b/libmikmod/macosx/Makefile.darwin
index f93f793..d4311a3 100644
--- a/libmikmod/macosx/Makefile.darwin
+++ b/libmikmod/macosx/Makefile.darwin
@@ -30,25 +30,25 @@ SSE2FLAGS=-msse2
 VECFLAGS=-faltivec
 
 # support for CoreAudio sound output:
-LDLIBS+= -Wl,-framework,AudioToolbox -Wl,-framework,AudioUnit -Wl,-framework,CoreServices
-CPPFLAGS+=-DDRV_OSX
+#LDLIBS+=-Wl,-framework,CoreAudio
+#CPPFLAGS+=-DDRV_OSX
 
 # support for output via a pipe to another command:
-CPPFLAGS+=-DDRV_PIPE
+#CPPFLAGS+=-DDRV_PIPE
 # support for output to stdout:
-CPPFLAGS+=-DDRV_STDOUT
+#CPPFLAGS+=-DDRV_STDOUT
 
 # support for aiff file output:
-CPPFLAGS+=-DDRV_AIFF
+#CPPFLAGS+=-DDRV_AIFF
 # support for wav file output:
-CPPFLAGS+=-DDRV_WAV
+#CPPFLAGS+=-DDRV_WAV
 # support for output raw data to a file:
-CPPFLAGS+=-DDRV_RAW
+#CPPFLAGS+=-DDRV_RAW
 
 # disable support for module depackers
-#CPPFLAGS+=-DNO_DEPACKERS
+CPPFLAGS+=-DNO_DEPACKERS
 # disable the high quality mixer (build only with the standart mixer)
-#CPPFLAGS+=-DNO_HQMIXER
+CPPFLAGS+=-DNO_HQMIXER
 
 CPPFLAGS+=-DHAVE_FCNTL_H -DHAVE_LIMITS_H -DHAVE_UNISTD_H -DHAVE_SNPRINTF -DHAVE_PTHREAD -DHAVE_SRANDOM
 
@@ -82,9 +82,9 @@ LIBSTATIC=libmikmod.a
 
 LIBS=$(LIBSHARED)
 
-OBJ=drv_osx.o drv_openal.o drv_sdl.o \
+OBJ=drv_osx.o \
     drv_raw.o drv_aiff.o drv_wav.o \
-    drv_nos.o drv_pipe.o drv_stdout.o \
+    drv_nos.o \
     load_669.o load_amf.o load_asy.o load_dsm.o load_far.o load_gdm.o load_gt2.o \
     load_it.o load_imf.o load_m15.o load_med.o load_mod.o load_mtm.o load_okt.o \
     load_s3m.o load_stm.o load_stx.o load_ult.o load_umx.o load_uni.o load_xm.o \
@@ -92,7 +92,7 @@ OBJ=drv_osx.o drv_openal.o drv_sdl.o \
     mmcmp.o pp20.o s404.o xpk.o strcasecmp.o \
     mloader.o mlreg.o mlutil.o mplayer.o munitrk.o mwav.o \
     npertab.o sloader.o virtch.o virtch2.o virtch_common.o
-#   mdulaw.o
+# drv_openal.o drv_sdl.o drv_pipe.o drv_stdout.o mdulaw.o
 
 help:
 	@echo ""
diff --git a/libmikmod/os2/Makefile.emx b/libmikmod/os2/Makefile.emx
index 25ca668..c4336d0 100644
--- a/libmikmod/os2/Makefile.emx
+++ b/libmikmod/os2/Makefile.emx
@@ -1,38 +1,37 @@
 # GNU Makefile for OS/2 -- using GCC/EMX-0.9d environment
 #
-# make dll    : builds mikmod.dll and its import lib mikmod.lib
-# make static : builds the static library mikmod_static.lib
 
 INCLUDES=-I../os2 -I../include
 CC=gcc
-AR=emxomfar
+AR=ar
+RANLIB=ranlib
 ARFLAGS=cr
 IMPLIB=emximp
 
-CFLAGS=-O2 -Wall -funroll-loops -ffast-math -fno-strength-reduce -Zomf -Zmt
-CPPFLAGS=-DMIKMOD_BUILD -DHAVE_FCNTL_H -DHAVE_LIMITS_H -DHAVE_UNISTD_H -DHAVE_SYS_IOCTL_H -DHAVE_SYS_TIME_H
+CFLAGS=-O2 -Wall -ffast-math -Zmt
+CPPFLAGS=-DMIKMOD_BUILD -DHAVE_FCNTL_H -DHAVE_LIMITS_H -DHAVE_UNISTD_H -DHAVE_SYS_TIME_H
 
 # To build a debug version:
 #CPPFLAGS+= -DMIKMOD_DEBUG
 
 # MMPM/2 driver (will work with any OS/2 version starting from 2.1.)
-CPPFLAGS+= -DDRV_OS2
+#CPPFLAGS+= -DDRV_OS2
 # DART (Direct Audio Real Time) driver (uses less CPU time than the
 #                          standard MMPM/2 drivers, requires Warp4.)
-CPPFLAGS+= -DDRV_DART
+#CPPFLAGS+= -DDRV_DART
 # support for aiff file output:
-CPPFLAGS+= -DDRV_AIFF
+#CPPFLAGS+= -DDRV_AIFF
 # support for wav file output:
-CPPFLAGS+= -DDRV_WAV
+#CPPFLAGS+= -DDRV_WAV
 # support for output raw data to a file:
-CPPFLAGS+= -DDRV_RAW
+#CPPFLAGS+= -DDRV_RAW
 # support for output to stdout (not needed by everyone)
 #CPPFLAGS+= -DDRV_STDOUT
 
 # disable support for module depackers
-#CPPFLAGS+= -DNO_DEPACKERS
+CPPFLAGS+= -DNO_DEPACKERS
 # disable the high quality mixer (build only with the standart mixer)
-#CPPFLAGS+= -DNO_HQMIXER
+CPPFLAGS+= -DNO_HQMIXER
 
 # drv_os2 and drv_dart require mmpm2
 LIBS = -lmmpm2
@@ -43,44 +42,32 @@ COMPILE=$(CC) $(CFLAGS) $(CPPFLAGS) $(INCLUDES)
 .SUFFIXES: .o .c
 
 LIBNAME=mikmod3.lib
-LIBSTATIC=mikmod_static.lib
-DLLNAME=mikmod3.dll
-DEFNAME=mikmod.def
+LIBSTATIC=mikmod.a
 
 OBJ=drv_os2.o drv_dart.o \
     drv_raw.o drv_aiff.o drv_wav.o \
-    drv_nos.o drv_stdout.o \
+    drv_nos.o \
     load_669.o load_amf.o load_asy.o load_dsm.o load_far.o load_gdm.o load_gt2.o \
     load_it.o load_imf.o load_m15.o load_med.o load_mod.o load_mtm.o load_okt.o \
     load_s3m.o load_stm.o load_stx.o load_ult.o load_umx.o load_uni.o load_xm.o \
     mmalloc.o mmerror.o mmio.o \
-    mmcmp.o pp20.o s404.o xpk.o strcasecmp.o \
+    strcasecmp.o \
     mdriver.o mdreg.o mloader.o mlreg.o mlutil.o mplayer.o munitrk.o mwav.o \
     npertab.o sloader.o virtch.o virtch2.o virtch_common.o
+#mmcmp.o pp20.o s404.o xpk.o
+#drv_stdout.o
 
-help:
-	@echo ""
-	@echo "Valid targets:"
-	@echo ""
-	@echo "  $(MAKE) dll    : build dll and import library."
-	@echo "  $(MAKE) static : build static library."
-	@echo ""
+all:  $(LIBSTATIC)
 
 clean: FORCE
-	FOR %F IN ( $(LIBNAME) $(DLLNAME) $(OBJ) ) DO IF EXIST %F ERASE %F
+	FOR %F IN ( $(LIBNAME) $(OBJ) ) DO IF EXIST %F ERASE %F
 
-dll: $(DLLNAME) $(LIBNAME)
 static: $(LIBSTATIC)
 
-$(DLLNAME): CFLAGS+=-Zdll
-$(LIBNAME): $(DLLNAME)
-$(DLLNAME): $(OBJ) $(DEFNAME)
-	$(CC) $(CFLAGS) -Zso -Zsys -o $(DLLNAME) $(DEFNAME) $(OBJ) $(LIBS)
-	$(IMPLIB) -o $(LIBNAME) $(DEFNAME)
-
 $(LIBSTATIC): CPPFLAGS+=-DMIKMOD_STATIC
 $(LIBSTATIC): $(OBJ)
 	$(AR) $(ARFLAGS) $(LIBSTATIC) $(OBJ)
+	$(RANLIB) $(LIBSTATIC)
 
 HEADER_DEPS=../include/mikmod.h ../include/mikmod_internals.h ../include/mikmod_ctype.h
 drv_dart.o: ../drivers/drv_dart.c $(HEADER_DEPS)
diff --git a/libmikmod/os2/Makefile.wat b/libmikmod/os2/Makefile.wat
index bdcd847..390c50c 100644
--- a/libmikmod/os2/Makefile.wat
+++ b/libmikmod/os2/Makefile.wat
@@ -17,23 +17,23 @@ CPPFLAGS=-DMIKMOD_BUILD -DHAVE_FCNTL_H -DHAVE_LIMITS_H -DHAVE_MALLOC_H
 #CPPFLAGS+= -DMIKMOD_DEBUG
 
 # MMPM/2 driver (will work with any OS/2 version starting from 2.1.)
-CPPFLAGS+= -DDRV_OS2
+#CPPFLAGS+= -DDRV_OS2
 # DART (Direct Audio Real Time) driver (uses less CPU time than the
 #                          standard MMPM/2 drivers, requires Warp4.)
-CPPFLAGS+= -DDRV_DART
+#CPPFLAGS+= -DDRV_DART
 # support for aiff file output:
-CPPFLAGS+= -DDRV_AIFF
+#CPPFLAGS+= -DDRV_AIFF
 # support for wav file output:
-CPPFLAGS+= -DDRV_WAV
+#CPPFLAGS+= -DDRV_WAV
 # support for output raw data to a file:
-CPPFLAGS+= -DDRV_RAW
+#CPPFLAGS+= -DDRV_RAW
 # support for output to stdout (not needed by everyone)
 #CPPFLAGS+= -DDRV_STDOUT
 
 # disable support for module depackers
-#CPPFLAGS+= -DNO_DEPACKERS
+CPPFLAGS+= -DNO_DEPACKERS
 # disable the high quality mixer (build only with the standart mixer)
-#CPPFLAGS+= -DNO_HQMIXER
+CPPFLAGS+= -DNO_HQMIXER
 
 # drv_os2 and drv_dart require mmpm2
 LIBS = mmpm2.lib
@@ -66,7 +66,7 @@ COMPILE=wcc386 $(CFLAGS) $(CPPFLAGS) $(INCLUDES)
 
 OBJ=drv_os2.obj drv_dart.obj &
     drv_raw.obj drv_aiff.obj drv_wav.obj &
-    drv_nos.obj drv_stdout.obj &
+    drv_nos.obj &
     load_669.obj load_amf.obj load_asy.obj load_dsm.obj load_far.obj load_gdm.obj load_gt2.obj &
     load_it.obj load_imf.obj load_m15.obj load_med.obj load_mod.obj load_mtm.obj load_okt.obj &
     load_s3m.obj load_stm.obj load_stx.obj load_ult.obj load_umx.obj load_uni.obj load_xm.obj &
@@ -74,7 +74,7 @@ OBJ=drv_os2.obj drv_dart.obj &
     mmcmp.obj pp20.obj s404.obj xpk.obj strcasecmp.obj &
     mdriver.obj mdreg.obj mloader.obj mlreg.obj mlutil.obj mplayer.obj munitrk.obj mwav.obj &
     npertab.obj sloader.obj virtch.obj virtch2.obj virtch_common.obj
-
+# drv_stdout.obj
 all: $(BLD_TARGET)
 
 # rely on symbol name, not ordinal: -irn switch of wlib is default, but -inn is not.
diff --git a/libmikmod/win32/Makefile.mingw b/libmikmod/win32/Makefile.mingw
index bf9d077..cd778a1 100644
--- a/libmikmod/win32/Makefile.mingw
+++ b/libmikmod/win32/Makefile.mingw
@@ -25,17 +25,17 @@ LDLIBS=
 SSE2FLAGS=-msse2
 
 # support for WinMM sound output:
-LDLIBS+=-lwinmm
-CPPFLAGS+=-DDRV_WIN
+#LDLIBS+=-lwinmm
+#CPPFLAGS+=-DDRV_WIN
 
 # support for Direct Sound output:
-LDLIBS+=-ldsound
-CPPFLAGS+=-DDRV_DS
+#LDLIBS+=-ldsound
+#CPPFLAGS+=-DDRV_DS
 
 # disable support for module depackers
-#CPPFLAGS+=-DNO_DEPACKERS
+CPPFLAGS+=-DNO_DEPACKERS
 # disable the high quality mixer (build only with the standart mixer)
-#CPPFLAGS+=-DNO_HQMIXER
+CPPFLAGS+=-DNO_HQMIXER
 
 # support for output through OpenAL (see drv_openal.c
 # for notes about OpenAL header location issues.)
@@ -55,11 +55,11 @@ CPPFLAGS+=-DDRV_DS
 #CPPFLAGS+=-DDRV_XAUDIO28
 
 # support for aiff file output:
-CPPFLAGS+=-DDRV_AIFF
+#CPPFLAGS+=-DDRV_AIFF
 # support for wav file output:
-CPPFLAGS+=-DDRV_WAV
+#CPPFLAGS+=-DDRV_WAV
 # support for output raw data to a file:
-CPPFLAGS+=-DDRV_RAW
+#CPPFLAGS+=-DDRV_RAW
 
 # support for output to stdout:
 #CPPFLAGS+=-DDRV_STDOUT
@@ -88,9 +88,9 @@ DEFNAME=libmikmod-$(DLL_VER).def
 
 LIBS=$(LIBNAME) $(DLLNAME)
 
-OBJ=drv_ds.o drv_xaudio2.o drv_win.o drv_openal.o drv_sdl.o \
+OBJ=drv_ds.o drv_win.o \
     drv_raw.o drv_aiff.o drv_wav.o \
-    drv_nos.o drv_stdout.o \
+    drv_nos.o \
     load_669.o load_amf.o load_asy.o load_dsm.o load_far.o load_gdm.o load_gt2.o \
     load_it.o load_imf.o load_m15.o load_med.o load_mod.o load_mtm.o load_okt.o \
     load_s3m.o load_stm.o load_stx.o load_ult.o load_umx.o load_uni.o load_xm.o \
@@ -98,7 +98,7 @@ OBJ=drv_ds.o drv_xaudio2.o drv_win.o drv_openal.o drv_sdl.o \
     mmcmp.o pp20.o s404.o xpk.o strcasecmp.o \
     mloader.o mlreg.o mlutil.o mplayer.o munitrk.o mwav.o \
     npertab.o sloader.o virtch.o virtch2.o virtch_common.o
-#   mdulaw.o
+# drv_xaudio2.o drv_openal.o drv_sdl.o drv_stdout.o mdulaw.o
 
 help:
 	@echo ""
diff --git a/libmikmod/win32/Makefile.wat b/libmikmod/win32/Makefile.wat
index 7066998..584b198 100644
--- a/libmikmod/win32/Makefile.wat
+++ b/libmikmod/win32/Makefile.wat
@@ -26,22 +26,22 @@ CPPFLAGS=-DMIKMOD_BUILD -DHAVE_FCNTL_H -DHAVE_LIMITS_H -DHAVE_MALLOC_H
 #CPPFLAGS+= -DMIKMOD_DEBUG
 
 # support for WinMM sound output:
-CPPFLAGS+=-DDRV_WIN
+#CPPFLAGS+=-DDRV_WIN
 # support for Direct Sound output:
-CPPFLAGS+=-DDRV_DS
+#CPPFLAGS+=-DDRV_DS
 # support for aiff file output:
-CPPFLAGS+= -DDRV_AIFF
+#CPPFLAGS+= -DDRV_AIFF
 # support for wav file output:
-CPPFLAGS+= -DDRV_WAV
+#CPPFLAGS+= -DDRV_WAV
 # support for output raw data to a file:
-CPPFLAGS+= -DDRV_RAW
+#CPPFLAGS+= -DDRV_RAW
 # support for output to stdout (not needed by everyone)
 #CPPFLAGS+= -DDRV_STDOUT
 
 # disable support for module depackers
-#CPPFLAGS+= -DNO_DEPACKERS
+CPPFLAGS+= -DNO_DEPACKERS
 # disable the high quality mixer (build only with the standart mixer)
-#CPPFLAGS+= -DNO_HQMIXER
+CPPFLAGS+= -DNO_HQMIXER
 
 # for WinMM and Direct Sound output drivers
 LIBS = winmm.lib dsound.lib dxguid.lib
@@ -75,7 +75,7 @@ COMPILE=wcc386 $(CFLAGS) $(CPPFLAGS) $(INCLUDES)
 
 OBJ=drv_win.obj drv_ds.obj &
     drv_raw.obj drv_aiff.obj drv_wav.obj &
-    drv_nos.obj drv_stdout.obj &
+    drv_nos.obj &
     load_669.obj load_amf.obj load_asy.obj load_dsm.obj load_far.obj load_gdm.obj load_gt2.obj &
     load_it.obj load_imf.obj load_m15.obj load_med.obj load_mod.obj load_mtm.obj load_okt.obj &
     load_s3m.obj load_stm.obj load_stx.obj load_ult.obj load_umx.obj load_uni.obj load_xm.obj &
@@ -83,7 +83,7 @@ OBJ=drv_win.obj drv_ds.obj &
     mmcmp.obj pp20.obj s404.obj xpk.obj strcasecmp.obj &
     mdriver.obj mdreg.obj mloader.obj mlreg.obj mlutil.obj mplayer.obj munitrk.obj mwav.obj &
     npertab.obj sloader.obj virtch.obj virtch2.obj virtch_common.obj
-
+# drv_stdout.obj
 all: $(BLD_TARGET)
 
 # rely on symbol name, not ordinal: -irn switch of wlib is default, but -inn is not.