Retro/pcem
Watch
1
0
Fork
You've already forked pcem
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Removed dependency on ALUT. Patch from Battler.

Browse source
This commit is contained in:
SarahW 2017-02-05 21:09:31 +00:00
commit eb96970fb2
5 changed files with 4 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/Makefile.am
View file

@ -12,7 +12,7 @@ amrefresh:
pcem_CFLAGS = $(allegro_CFLAGS) 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 \ 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 \ allegro-gui-configure.c allegro-gui-deviceconfig.c allegro-gui-hdconf.c allegro-joystick.c allegro-keyboard.c allegro-main.c \

2
src/Makefile.linux32
View file

@ -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 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) PCem: $(OBJ) $(DBOBJ) $(SIDOBJ)
$(CC) $(LDFLAGS) $(OBJ) $(DBOBJ) $(SIDOBJ) -o "PCem" $(LIBS) $(CC) $(LDFLAGS) $(OBJ) $(DBOBJ) $(SIDOBJ) -o "PCem" $(LIBS)

2
src/Makefile.linux64
View file

@ -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 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) PCem64: $(OBJ) $(DBOBJ) $(SIDOBJ)
$(CC) $(OBJ) $(DBOBJ) $(SIDOBJ) -o "PCem64" $(LIBS) $(CC) $(OBJ) $(DBOBJ) $(SIDOBJ) -o "PCem64" $(LIBS)

2
src/Makefile.mingw
View file

@ -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 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) PCem.exe: $(OBJ) $(DBOBJ) $(SIDOBJ)
$(CC) $(OBJ) $(DBOBJ) $(SIDOBJ) -o "PCem.exe" $(LIBS) $(CC) $(OBJ) $(DBOBJ) $(SIDOBJ) -o "PCem.exe" $(LIBS)

6
src/soundopenal.c
View file

@ -4,11 +4,7 @@
#include <stdlib.h> #include <stdlib.h>
#ifdef USE_OPENAL #ifdef USE_OPENAL
#include <AL/al.h> #include <AL/al.h>
#ifdef __MINGW64__
#include <AL/alc.h> #include <AL/alc.h>
#else
#include <AL/alut.h>
#endif
#endif #endif
#include "ibm.h" #include "ibm.h"
#include "sound.h" #include "sound.h"
@ -23,7 +19,6 @@ static ALuint source[2]; // audio source
#define BUFLEN SOUNDBUFLEN #define BUFLEN SOUNDBUFLEN
void closeal(); void closeal();
#ifdef __MINGW64__
ALvoid alutInit(ALint *argc,ALbyte **argv) ALvoid alutInit(ALint *argc,ALbyte **argv)
{ {
ALCcontext *Context; ALCcontext *Context;
@ -56,7 +51,6 @@ ALvoid alutExit(ALvoid)
//Close device //Close device
alcCloseDevice(Device); alcCloseDevice(Device);
} }
#endif
void initalmain(int argc, char *argv[]) void initalmain(int argc, char *argv[])
{ {
#ifdef USE_OPENAL #ifdef USE_OPENAL