Skip to content

Commit

Permalink
avoid bailing if roms are missing
Browse files Browse the repository at this point in the history
  • Loading branch information
unknown committed Sep 12, 2021
1 parent 7004092 commit 54b35a8
Show file tree
Hide file tree
Showing 4 changed files with 106 additions and 27 deletions.
24 changes: 24 additions & 0 deletions allmakes.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
#!/bin/bash
make all TARGET=capcom; cp EBOOT.PBP CAPCOM.PBP;
make all TARGET=cps1; cp EBOOT.PBP CPS1.PBP;
make all TARGET=deco; cp EBOOT.PBP DECO.PBP;
make all TARGET=dynax; cp EBOOT.PBP DYNAX.PBP
make all TARGET=irem; cp EBOOT.PBP IREM.PBP;
make all TARGET=konami; cp EBOOT.PBP KONAMI.PBP;
make all TARGET=konami2; cp EBOOT.PBP KONAMI2.PBP;
make all TARGET=namco; cp EBOOT.PBP NAMCO.PBP;
make all TARGET=namco2; cp EBOOT.PBP NAMCO2.PBP;
make all TARGET=Nichibutsu; cp EBOOT.PBP NICHIBUTSU.PBP;
make all TARGET=nintendo; cp EBOOT.PBP NINTENDO.PBP;
make all TARGET=sega; cp EBOOT.PBP SEGA.PBP;
make all TARGET=sega2; cp EBOOT.PBP SEGA2.PBP;
make all TARGET=sega3; cp EBOOT.PBP SEGA3.PBP;
make all TARGET=snk; cp EBOOT.PBP SNK.PBP;
make all TARGET=system1; cp EBOOT.PBP SYSTEM1.PBP;
make all TARGET=taito; cp EBOOT.PBP TAITO.PBP;
make all TARGET=taito2; cp EBOOT.PBP TAITO2.PBP;
make all TARGET=technos; cp EBOOT.PBP TECHNOS.PBP;
make all TARGET=Universal; cp EBOOT.PBP UNIVERSAL.PBP;
make all TARGET=upl; cp EBOOT.PBP UPL.PBP;


24 changes: 0 additions & 24 deletions conv.sh

This file was deleted.

79 changes: 79 additions & 0 deletions makes/dynax.mak
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
# a tiny compile is without Neogeo games
COREDEFS += -DTINY_COMPILE=1
COREDEFS += -DTINY_NAME="driver_7jigen,driver_asylum,driver_ataxxj,driver_ataxx,driver_ataxxa,driver_brutforc,driver_indyheat,driver_ddenlovr,driver_drgpunch,driver_gfire2,driver_hnfubuki,driver_hnkochou,driver_hanamai,driver_hnoridur,driver_hanakanz,driver_jantouki,driver_kothello,driver_mjangels,driver_mcnpshnt,driver_mjderngr,driver_mjdialq2,driver_mjdiplob,driver_mjelct3a,driver_mjelct3,driver_mjelctrn,driver_mjfriday,driver_mjifb,driver_neruton,driver_majs101b,driver_yarunara,driver_mmpanic,driver_mosaic,driver_mosaica,driver_nettoqc,driver_othldrby,driver_pkgnsh,driver_pkgnshdx,driver_quiz365t,driver_quiz365,driver_quizchq,driver_quizchql,driver_quiztvqq,driver_rongrong,driver_rongrngg,driver_shanghai,driver_shangha2,driver_sprtmtch,driver_tontonb,driver_untoucha,driver_wsf"

COREDEFS += -DTINY_POINTER="&driver_7jigen,&driver_asylum,&driver_ataxxj,&driver_ataxx,&driver_ataxxa,&driver_brutforc,&driver_indyheat,&driver_ddenlovr,&driver_drgpunch,&driver_gfire2,&driver_hnfubuki,&driver_hnkochou,&driver_hanamai,&driver_hnoridur,&driver_hanakanz,&driver_jantouki,&driver_kothello,&driver_mjangels,&driver_mcnpshnt,&driver_mjderngr,&driver_mjdialq2,&driver_mjdiplob,&driver_mjelct3a,&driver_mjelct3,&driver_mjelctrn,&driver_mjfriday,&driver_mjifb,&driver_neruton,&driver_majs101b,&driver_yarunara,&driver_mmpanic,&driver_mosaic,&driver_mosaica,&driver_nettoqc,&driver_othldrby,&driver_pkgnsh,&driver_pkgnshdx,&driver_quiz365t,&driver_quiz365,&driver_quizchq,&driver_quizchql,&driver_quiztvqq,&driver_rongrong,&driver_rongrngg,&driver_shanghai,&driver_shangha2,&driver_sprtmtch,&driver_tontonb,&driver_untoucha,&driver_wsf"


# uses these CPUs
CPUS+=Z80@
CPUS+=I186@
CPUS+=M68000@
CPUS+=Z180@
CPUS+=V30@


# uses these SOUNDs
SOUNDS+=AY8910@
SOUNDS+=YM2413@
SOUNDS+=MSM5205@
SOUNDS+=CUSTOM@
SOUNDS+=YM2151@
SOUNDS+=OKIM6295@
SOUNDS+=YM2203@
SOUNDS+=YMZ280B@

SOUNDS+=ADPCM@
SOUNDS+=YM3812@


OBJS= $(OBJ)/sndhrdw/seibu.o


DRVLIBS = \
obj/drivers/pacman.a obj/drivers/epos.a obj/drivers/nichibut.a \
obj/drivers/phoenix.a obj/drivers/namco.a obj/drivers/univers.a obj/drivers/nintendo.a \
obj/drivers/midw8080.a obj/drivers/meadows.a obj/drivers/cvs.a obj/drivers/midway.a \
obj/drivers/irem.a obj/drivers/gottlieb.a obj/drivers/taito.a obj/drivers/toaplan.a obj/drivers/cave.a \
obj/drivers/kyugo.a obj/drivers/williams.a obj/drivers/gremlin.a obj/drivers/vicdual.a \
obj/drivers/capcom.a obj/drivers/itech.a obj/drivers/leland.a obj/drivers/sega.a \
obj/drivers/dataeast.a obj/drivers/tehkan.a obj/drivers/konami.a \
obj/drivers/exidy.a obj/drivers/atari.a obj/drivers/snk.a obj/drivers/alpha.a obj/drivers/technos.a \
obj/drivers/stern.a obj/drivers/gameplan.a obj/drivers/zaccaria.a \
obj/drivers/upl.a obj/drivers/nmk.a obj/drivers/cinemar.a obj/drivers/cinemav.a \
obj/drivers/thepit.a obj/drivers/valadon.a obj/drivers/seibu.a obj/drivers/tad.a obj/drivers/jaleco.a \
obj/drivers/vsystem.a obj/drivers/psikyo.a obj/drivers/orca.a obj/drivers/gaelco.a \
obj/drivers/kaneko.a obj/drivers/seta.a obj/drivers/atlus.a \
obj/drivers/sun.a obj/drivers/suna.a obj/drivers/dooyong.a obj/drivers/tong.a \
obj/drivers/comad.a obj/drivers/playmark.a obj/drivers/pacific.a obj/drivers/tecfri.a \
obj/drivers/metro.a obj/drivers/venture.a obj/drivers/yunsung.a obj/drivers/zilec.a \
obj/drivers/fuuki.a obj/drivers/unico.a obj/drivers/dynax.a \
obj/drivers/sigma.a obj/drivers/igs.a obj/drivers/ramtek.a obj/drivers/omori.a obj/drivers/tch.a \
obj/drivers/usgames.a obj/drivers/sanritsu.a obj/drivers/rare.a \
obj/drivers/alba.a obj/drivers/homedata.a obj/drivers/artmagic.a \
obj/drivers/taiyo.a obj/drivers/edevices.a obj/drivers/other.a obj/drivers/excelent.a obj/drivers/nix.a \
obj/drivers/arcadia.a obj/drivers/othertrv.a obj/drivers/other68k.a obj/drivers/otherz80.a \
obj/drivers/neogeo.a $(OBJ)/shared.a \

$(OBJ)/shared.a: \
$(OBJ)/machine/segacrpt.o \
$(OBJ)/machine/tmp68301.o \
$(OBJ)/machine/6532riot.o \
$(OBJ)/machine/z80fmly.o \
$(OBJ)/machine/6821pia.o \
$(OBJ)/machine/8255ppi.o \
$(OBJ)/machine/6522via.o \
$(OBJ)/machine/7474.o \
$(OBJ)/machine/idectrl.o \
$(OBJ)/machine/ticket.o \
$(OBJ)/machine/random.o \
$(OBJ)/machine/adc083x.o \
$(OBJ)/vidhrdw/crtc6845.o \
$(OBJ)/vidhrdw/avgdvg.o \
$(OBJ)/vidhrdw/poly.o \
$(OBJ)/vidhrdw/tlc34076.o \
$(OBJ)/vidhrdw/res_net.o \


# MAME specific core objs
COREOBJS += $(OBJ)/tiny.o $(OBJ)/cheat.o $(DESCJ)
6 changes: 3 additions & 3 deletions src/common.c
Original file line number Diff line number Diff line change
Expand Up @@ -1075,13 +1075,13 @@ static int display_rom_load_results(struct rom_load_data *romdata)
/* only display if we have warnings or errors */
if (romdata->warnings || romdata->errors)
{
extern int bailing;
// extern int bailing;

/* display either an error message or a warning message */
if (romdata->errors)
{
strcat(romdata->errorbuf, "ERROR: required files are missing, the game cannot be run.\n");
bailing = 1;
// bailing = 1;
}
else
strcat(romdata->errorbuf, "WARNING: the game might not run correctly.\n");
Expand All @@ -1090,7 +1090,7 @@ static int display_rom_load_results(struct rom_load_data *romdata)
printf("%s", romdata->errorbuf);

/* if we're not getting out of here, wait for a keypress */
if (!options.gui_host && !options.skip_warnings && !bailing)
if (!options.gui_host && !options.skip_warnings /*&& !bailing */)
{
int k;

Expand Down

0 comments on commit 54b35a8

Please sign in to comment.