Skip to content

Commit

Permalink
remove homebrew CDVDFSV on arcade builds
Browse files Browse the repository at this point in the history
  • Loading branch information
israpps committed Feb 22, 2024
1 parent 82f5293 commit fb48ff1
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 2 deletions.
10 changes: 9 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ COH ?= 0
# 0: on-board version, 1: homebrew version
SIO2MAN ?= 0
MCMAN ?= 1
CDVDFSV ?= 1
# ----------------------------- #
.SILENT:

Expand All @@ -33,7 +34,7 @@ endif
EE_OBJS = main.o config.o elf.o draw.o loader_elf.o filer.o \
poweroff_irx.o iomanx_irx.o filexio_irx.o ps2atad_irx.o ps2dev9_irx.o \
ps2hdd_irx.o ps2fs_irx.o usbd_irx.o \
cdvd_irx.o vmc_fs_irx.o ps2kbd_irx.o \
vmc_fs_irx.o ps2kbd_irx.o \
hdd.o hdl_rpc.o hdl_info_irx.o editor.o timer.o jpgviewer.o icon.o lang.o \
font_uLE.o makeicon.o chkesr.o allowdvdv_irx.o

Expand All @@ -54,6 +55,7 @@ ifeq ($(SMB),1)
endif

ifeq ($(COH), 1)
CDVDFSV = 0
SIO2MAN = 0
MCMAN = 0
EE_OBJS += ioprp.o
Expand Down Expand Up @@ -109,6 +111,12 @@ else
EE_CLFAGS += -DUSE_ROM_MCMAN
endif

ifeq ($(CDVDFSV),1)
EE_OBJS += cdvd_irx.o
else
EE_CLFAGS += -DUSE_ROM_CDVDFSV
endif

ifeq ($(LIBPAD),2)
EE_LIBS += -lpadx
else
Expand Down
2 changes: 1 addition & 1 deletion src/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -1187,7 +1187,7 @@ static void loadCdModules(void)
int ret, id;

if (!have_cdvd) {
#ifdef SUPPORT_SYSTEM_2X6
#ifdef USE_ROM_CDVDFSV //so far only recommended for arcade?
id = SifLoadStartModule("rom0:CDVDFSV", 0, NULL, &ret);
DPRINTF(" [rom0:CDVDFSV]: ID=%d, ret=%d\n", id, ret);
#else
Expand Down

0 comments on commit fb48ff1

Please sign in to comment.