From eb96970fb29e5f676c675d71e5d9a6558813a3a1 Mon Sep 17 00:00:00 2001
From: SarahW <SarahW@localhost>
Date: Sun, 5 Feb 2017 21:09:31 +0000
Subject: [PATCH] Removed dependency on ALUT. Patch from Battler.

---
 src/Makefile.am      | 2 +-
 src/Makefile.linux32 | 2 +-
 src/Makefile.linux64 | 2 +-
 src/Makefile.mingw   | 2 +-
 src/soundopenal.c    | 6 ------
 5 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index 65aeb3b..7de1e42 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -12,7 +12,7 @@ amrefresh:
 
 pcem_CFLAGS = $(allegro_CFLAGS)
 
-pcem_LDADD = $(allegro_LIBS) -lopenal -lalut
+pcem_LDADD = $(allegro_LIBS) -lopenal
 
 pcem_SOURCES = 386.c 386_dynarec.c 386_dynarec_ops.c 808x.c acer386sx.c ali1429.c allegro-gui.c \
 allegro-gui-configure.c allegro-gui-deviceconfig.c allegro-gui-hdconf.c allegro-joystick.c allegro-keyboard.c allegro-main.c  \
diff --git a/src/Makefile.linux32 b/src/Makefile.linux32
index 259f52b..8a5dbf0 100644
--- a/src/Makefile.linux32
+++ b/src/Makefile.linux32
@@ -26,7 +26,7 @@ DBOBJ = dbopl.o vid_cga_comp.o
 SIDOBJ = convolve.o convolve-sse.o envelope.o extfilt.o filter.o pot.o sid.o voice.o wave6581__ST.o wave6581_P_T.o wave6581_PS_.o wave6581_PST.o wave8580__ST.o wave8580_P_T.o wave8580_PS_.o wave8580_PST.o wave.o
 
 
-LIBS = -lopenal -lstdc++ -lalleg -lalut -lpthread -lm
+LIBS = -lopenal -lstdc++ -lalleg -lpthread -lm
 
 PCem: $(OBJ) $(DBOBJ) $(SIDOBJ)
 	$(CC) $(LDFLAGS) $(OBJ) $(DBOBJ) $(SIDOBJ) -o "PCem" $(LIBS)
diff --git a/src/Makefile.linux64 b/src/Makefile.linux64
index 1ff211a..47e9604 100644
--- a/src/Makefile.linux64
+++ b/src/Makefile.linux64
@@ -25,7 +25,7 @@ DBOBJ = dbopl.o vid_cga_comp.o
 SIDOBJ = convolve.o convolve-sse.o envelope.o extfilt.o filter.o pot.o sid.o voice.o wave6581__ST.o wave6581_P_T.o wave6581_PS_.o wave6581_PST.o wave8580__ST.o wave8580_P_T.o wave8580_PS_.o wave8580_PST.o wave.o
 
 
-LIBS = -lopenal -lstdc++ -lalleg -lalut -lpthread -lm
+LIBS = -lopenal -lstdc++ -lalleg -lpthread -lm
 
 PCem64: $(OBJ) $(DBOBJ) $(SIDOBJ)
 	$(CC) $(OBJ) $(DBOBJ) $(SIDOBJ) -o "PCem64" $(LIBS)
diff --git a/src/Makefile.mingw b/src/Makefile.mingw
index 09328bb..908b29e 100644
--- a/src/Makefile.mingw
+++ b/src/Makefile.mingw
@@ -25,7 +25,7 @@ DBOBJ = dbopl.o vid_cga_comp.o
 SIDOBJ = convolve.o convolve-sse.o envelope.o extfilt.o filter.o pot.o sid.o voice.o wave6581__ST.o wave6581_P_T.o wave6581_PS_.o wave6581_PST.o wave8580__ST.o wave8580_P_T.o wave8580_PS_.o wave8580_PST.o wave.o
 
 
-LIBS = -mwindows -lwinmm -lalut -lopenal32 -lddraw -ldinput -ldxguid -ld3d9 -lstdc++
+LIBS = -mwindows -lwinmm -lopenal32 -lddraw -ldinput -ldxguid -ld3d9 -lstdc++
 
 PCem.exe: $(OBJ) $(DBOBJ) $(SIDOBJ)
 	$(CC) $(OBJ) $(DBOBJ) $(SIDOBJ) -o "PCem.exe" $(LIBS)
diff --git a/src/soundopenal.c b/src/soundopenal.c
index f87d1c2..03c7d04 100644
--- a/src/soundopenal.c
+++ b/src/soundopenal.c
@@ -4,11 +4,7 @@
 #include <stdlib.h>
 #ifdef USE_OPENAL
 #include <AL/al.h>
-#ifdef __MINGW64__
 #include <AL/alc.h>
-#else
-#include <AL/alut.h>
-#endif
 #endif
 #include "ibm.h"
 #include "sound.h"
@@ -23,7 +19,6 @@ static ALuint source[2];     // audio source
 #define BUFLEN SOUNDBUFLEN
 
 void closeal();
-#ifdef __MINGW64__
 ALvoid  alutInit(ALint *argc,ALbyte **argv) 
 {
 	ALCcontext *Context;
@@ -56,7 +51,6 @@ ALvoid  alutExit(ALvoid)
 	//Close device
 	alcCloseDevice(Device);
 }
-#endif
 void initalmain(int argc, char *argv[])
 {
 #ifdef USE_OPENAL