| diff -ur playmidi-2.4.orig/Makefile playmidi-2.4/Makefile |
| --- playmidi-2.4.orig/Makefile 1998-10-01 05:39:18.000000000 +0300 |
| +++ playmidi-2.4/Makefile 2007-07-25 16:22:23.000000000 +0300 |
| @@ -12,38 +12,38 @@ |
| |
| # ncurses usually /usr/lib, -L/usr/local/lib doesn't hurt |
| # unless there's more than one ncurses floating around on your system |
| -LIBNC = -L/usr/local/lib -lncurses |
| +LIBNC = -L/usr/lib -lncurses |
| |
| ######### NOTE: X11R6 or newer REQUIRED |
| -LIBX11 = -L/usr/X11R6/lib -lXaw -lXmu -lXt -lX11 -lXext -lSM -lICE |
| -LIBGTK = -L/usr/X11R6/lib -lgtk-1.1 -lgdk-1.1 -lglib-1.1 -lX11 -lXext -lm |
| -LIBVGA = -L/usr/local/lib -lvgagl -lvga |
| +LIBX11 = -L/usr/lib -lXaw -lXmu -lXt -lX11 -lXext -lSM -lICE |
| +LIBGTK = -L/usr/lib -lgtk-1.1 -lgdk-1.1 -lglib-1.1 -lX11 -lXext -lm |
| +LIBVGA = -L/usr/lib -lvgagl -lvga |
| |
| # ncurses is usually in /usr/include/ncurses, but you may need |
| # to use /usr/local/include/ncurses depending on your setup. |
| INCNC = -I/usr/include/ncurses |
| |
| # just in case you keep your X includes in an odd location. |
| -INCX11 = -I/usr/X11R6/include -DNARROWPROTO |
| +INCX11 = -I/usr/include -DNARROWPROTO |
| |
| # stuff for sound blaster awe32 |
| INCAWE = -DVOXWARE_CONTROLLER_7_WORKING |
| # awe_voice.h path |
| -INCAWE += -I/usr/lib/oss/include/sys |
| +INCAWE += -I. |
| |
| # usually in /usr/include, but -I/usr/local/include doesn't hurt |
| # unless there's more than one svgalib floating around your system. |
| -INCVGA = -I/usr/local/include |
| +INCVGA = -I/usr/include |
| |
| # Directory where application defaults files are stored for X11 version |
| -XAPPDEFAULTS = /usr/X11R6/lib/X11/app-defaults |
| +XAPPDEFAULTS = /usr/share/X11/app-defaults |
| |
| INCLUDES= $(INCNC) $(INCX11) $(INCVGA) $(INCAWE) |
| INSTALLDIR = /usr/bin |
| INSTALL = install -s |
| |
| # if you are using the GUS Ultra driver module, add -DULTRA_DRIVER |
| -CFLAGS = -Wall -pipe -fomit-frame-pointer -O2 -m486 $(INCAWE) |
| +CFLAGS = -Wall $(INCAWE) |
| LDFLAGS = |
| |
| OBJECTS = playmidi.o readmidi.o playevents.o \ |
| diff -ur playmidi-2.4.orig/playmidi.h-dist playmidi-2.4/playmidi.h-dist |
| --- playmidi-2.4.orig/playmidi.h-dist 1997-05-12 00:26:36.000000000 +0300 |
| +++ playmidi-2.4/playmidi.h-dist 2007-07-25 16:22:44.000000000 +0300 |
| @@ -52,11 +52,7 @@ |
| #include <stdlib.h> |
| #include <sys/soundcard.h> |
| #include <sys/ioctl.h> |
| -#ifdef linux |
| -#include <linux/awe_voice.h> |
| -#else |
| #include <awe_voice.h> |
| -#endif |
| |
| struct chanstate { |
| int program; |
