From 20f88902300cc2db48f7748b844b810b26c69922 Mon Sep 17 00:00:00 2001 From: SarahW Date: Tue, 15 Oct 2019 20:41:52 +0100 Subject: [PATCH] Fix AKA31 on Linux. --- podules/aka31/src/Makefile.linux | 7 ++++--- podules/aka31/src/scsi_cd.c | 1 + 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/podules/aka31/src/Makefile.linux b/podules/aka31/src/Makefile.linux index 3771aa1..db9835d 100644 --- a/podules/aka31/src/Makefile.linux +++ b/podules/aka31/src/Makefile.linux @@ -1,8 +1,9 @@ +VPATH = . ../../common/cdrom ../../common/sound CPP = g++ CC = gcc -OBJ = aka31.o d71071l.o hdd_file.o scsi.o scsi_config.o scsi_hd.o wd33c93a.o -LIBS = -shared -CFLAGS = $(INCS) -DBUILDING_DLL=1 -I../../../src -fPIC -Wall -Werror +OBJ = aka31.o cdrom-linux-ioctl.o d71071l.o hdd_file.o scsi.o scsi_config.o scsi_cd.o scsi_hd.o sound_openal.o wd33c93a.o +LIBS = -shared -lopenal +CFLAGS = $(INCS) -DBUILDING_DLL=1 -I../../../src -I../../common/cdrom -I../../common/sound -g3 -fPIC all: aka31 diff --git a/podules/aka31/src/scsi_cd.c b/podules/aka31/src/scsi_cd.c index 53f4424..ad463b0 100644 --- a/podules/aka31/src/scsi_cd.c +++ b/podules/aka31/src/scsi_cd.c @@ -435,6 +435,7 @@ static void *scsi_cd_init(scsi_bus_t *bus, int id, podule_t *podule) sprintf(config_name, "device%i_fn", id); fn = podule_callbacks->config_get_string(podule, config_name, ""); ioctl_set_drive(fn); + ioctl_open(0); page_flags[GPMODE_CDROM_AUDIO_PAGE] &= 0xFD; /* Clear changed flag for CDROM AUDIO mode page. */ memset(mode_pages_in[GPMODE_CDROM_AUDIO_PAGE], 0, 256); /* Clear the page itself. */