*** mpg123-0.59r/Makefile.orig	Mon Dec 17 16:56:54 2001
--- mpg123-0.59r/Makefile	Mon Dec 17 17:22:38 2001
***************
*** 8,13 ****
--- 8,14 ----
  BINDIR=$(PREFIX)/bin
  MANDIR=$(PREFIX)/man
  SECTION=1
+ BINSUF=.exe
  
  ###################################################
  ######                                       ######
***************
*** 20,25 ****
--- 21,27 ----
  	@echo "You must specify the system which you want to compile for:"
  	@echo ""
  	@echo "make linux-help     Linux, more help"
+ 	@echo "make cygwin-help    cygwin, more help"
  	@echo "make freebsd-help   FreeBSD more help"
  	@echo "make solaris        Solaris 2.x (tested: 2.5 and 2.5.1) using SparcWorks cc"
  	@echo "make solaris-gcc    Solaris 2.x using GNU cc (somewhat slower)"
***************
*** 48,53 ****
--- 50,66 ----
  	@echo "Please read the file INSTALL for additional information."
  	@echo ""
  
+ cygwin-help:
+ 	@echo ""
+ 	@echo "There are several Cygwin flavours. Choose one:"
+ 	@echo ""
+ 	@echo "make cygwin          cygwin (i386, Pentium or unlisted platform)"
+ 	@echo "make cygwin-i486     cygwin (optimized for i486 ONLY)"
+ 	@echo "make cygwin-esd      cygwin, output to EsounD"
+ 	@echo "    NOTE: esd require libaudiofile"
+ 	@echo ""
+ 	@echo "Please read the file INSTALL for additional information."
+ 
  linux-help:
  	@echo ""
  	@echo "There are several Linux flavours. Choose one:"
***************
*** 86,91 ****
--- 99,139 ----
  	@echo "Please read the file INSTALL for additional information."
  	@echo ""
  
+ cygwin:
+ 	$(MAKE) CC=gcc LDFLAGS= \
+ 		OBJECTS='decode_i386.o dct64_i386.o decode_i586.o \
+ 			audio_oss.o term.o' \
+ 		CFLAGS='-DI386_ASSEM -DPENTIUM_OPT -DREAL_IS_FLOAT \
+ 			-DUSE_MMAP -DREAD_MMAP -DOSS -DTERM_CONTROL\
+ 			-Wall -O4 -m486 \
+ 			-fomit-frame-pointer -funroll-all-loops \
+ 			-finline-functions -ffast-math' \
+ 		mpg123-make
+ 
+ cygwin-i486:
+ 	$(MAKE) CC=gcc LDFLAGS= \
+ 		OBJECTS='decode_i386.o dct64_i386.o decode_i586.o \
+ 			decode_i486.o dct64_i486.o audio_oss.o term.o' \
+ 		CFLAGS='-DI386_ASSEM -DREAL_IS_FLOAT -DI486_OPT \
+ 			-DUSE_MMAP -DREAD_MMAP -DOSS -DTERM_CONTROL\
+ 			-Wall -O2 -m486 \
+ 			-fomit-frame-pointer -funroll-all-loops \
+ 			-finline-functions -ffast-math' \
+ 		mpg123-make
+ 
+ cygwin-esd:
+ 	$(MAKE) CC=gcc LDFLAGS= \
+ 		AUDIO_LIB='-lesd -laudiofile' \
+ 		OBJECTS='decode_i386.o dct64_i386.o decode_i586.o \
+ 			audio_esd.o' \
+ 		CFLAGS='-DI386_ASSEM -DREAL_IS_FLOAT -DPENTIUM_OPT \
+ 			-DUSE_MMAP -DREAD_MMAP -DOSS -DUSE_ESD \
+ 			-Wall  -O2 -m486 \
+ 			-fomit-frame-pointer -funroll-all-loops \
+ 			-finline-functions -ffast-math \
+ 			$(RPM_OPT_FLAGS)' \
+ 		mpg123-make
+ 
  linux-devel:
  	$(MAKE) OBJECTS='decode_i386.o dct64_i386.o audio_oss.o' \
          CC=gcc LDFLAGS= \
***************
*** 627,638 ****
  	$(CC) -o $@ -Wall -O2 system.c
  
  install:	prepared-for-install
! 	strip mpg123
  	if [ -x /usr/ccs/bin/mcs ]; then /usr/ccs/bin/mcs -d mpg123; fi
  	mkdir -p $(BINDIR)
  	mkdir -p $(MANDIR)/man$(SECTION)
  	cp -f mpg123 $(BINDIR)
! 	chmod 755 $(BINDIR)/mpg123
  	cp -f mpg123.1 $(MANDIR)/man$(SECTION)
  	chmod 644 $(MANDIR)/man$(SECTION)/mpg123.1
  
--- 675,686 ----
  	$(CC) -o $@ -Wall -O2 system.c
  
  install:	prepared-for-install
! 	strip mpg123$(BINSUF)
  	if [ -x /usr/ccs/bin/mcs ]; then /usr/ccs/bin/mcs -d mpg123; fi
  	mkdir -p $(BINDIR)
  	mkdir -p $(MANDIR)/man$(SECTION)
  	cp -f mpg123 $(BINDIR)
! 	chmod 755 $(BINDIR)/mpg123$(BINSUF)
  	cp -f mpg123.1 $(MANDIR)/man$(SECTION)
  	chmod 644 $(MANDIR)/man$(SECTION)/mpg123.1
  
*** mpg123-0.59r/mpg123.c.orig	Mon Dec 17 17:03:08 2001
--- mpg123-0.59r/mpg123.c	Mon Dec 17 17:04:18 2001
***************
*** 865,871 ****
  			fprintf(stderr,"Can't open equalizer file '%s'\n",equalfile);
  	}
  
! #if !defined(WIN32) && !defined(GENERIC) && !defined(MINT) && !defined(__EMX__) && !defined(OS2)
  	if(param.aggressive) { /* tst */
  		int mypid = getpid();
  		setpriority(PRIO_PROCESS,mypid,-20);
--- 865,871 ----
  			fprintf(stderr,"Can't open equalizer file '%s'\n",equalfile);
  	}
  
! #if !defined(WIN32) && !defined(GENERIC) && !defined(MINT) && !defined(__EMX__) && !defined(OS2) && !defined(__CYGWIN__)
  	if(param.aggressive) { /* tst */
  		int mypid = getpid();
  		setpriority(PRIO_PROCESS,mypid,-20);
*** mpg123-0.59r/audio_oss.c.orig	Mon Dec 17 17:05:58 2001
--- mpg123-0.59r/audio_oss.c	Mon Dec 17 17:06:10 2001
***************
*** 28,34 ****
  #include <sys/ioctl.h>
  #ifdef LINUX
  #include <linux/soundcard.h>
! #elif defined(__bsdi__)
  #include <sys/soundcard.h>
  #else
  #include <machine/soundcard.h>
--- 28,34 ----
  #include <sys/ioctl.h>
  #ifdef LINUX
  #include <linux/soundcard.h>
! #elif defined(__bsdi__) || defined(__CYGWIN__)
  #include <sys/soundcard.h>
  #else
  #include <machine/soundcard.h>
*** mpg123-0.59r/control_generic.c.orig	Mon Dec 17 17:12:42 2001
--- mpg123-0.59r/control_generic.c	Mon Dec 17 17:12:52 2001
***************
*** 139,145 ****
--- 139,147 ----
  	int init = 0;
  	int framecnt = 0;
  
+ 	#ifndef __CYGWIN__
  	setlinebuf(stdout);
+ 	#endif
  	printf("@R MPG123\n");
  	while (1) {
  		tv.tv_sec = 0;
*** mpg123-0.59r/decode_i586.s.orig	Mon Dec 17 17:14:02 2001
--- mpg123-0.59r/decode_i586.s	Mon Dec 17 17:16:12 2001
***************
*** 38,45 ****
  	.long 0x0,0xc0e00000
  	.align 8
  .text
! .globl synth_1to1_pent
! synth_1to1_pent:
  	subl $12,%esp
  	pushl %ebp
  	pushl %edi
--- 38,45 ----
  	.long 0x0,0xc0e00000
  	.align 8
  .text
! .globl _synth_1to1_pent
! _synth_1to1_pent:
  	subl $12,%esp
  	pushl %ebp
  	pushl %edi
***************
*** 84,94 ****
  	leal (%ecx,%ebp,4),%eax
  .L74:
  	pushl %eax
! 	call dct64
  	addl $12,%esp
  	movl 16(%esp),%edx
  	leal 0(,%edx,4),%edx
! 	movl $decwin+64,%eax
  	movl %eax,%ecx
  	subl %edx,%ecx
  	movl $16,%ebp
--- 84,94 ----
  	leal (%ecx,%ebp,4),%eax
  .L74:
  	pushl %eax
! 	call _dct64
  	addl $12,%esp
  	movl 16(%esp),%edx
  	leal 0(,%edx,4),%edx
! 	movl $_decwin+64,%eax
  	movl %eax,%ecx
  	subl %edx,%ecx
  	movl $16,%ebp