ShuriZma
/
fbneo
mirror of https://github.com/finalburnneo/FBNeo.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

makefile/makefile.mingw: add 'mingw' target, fix exe's built with latest msys2 (work around non-ms-conforming swprintf that they recently broke)

This commit is contained in:
dinkc64 2022-01-16 21:02:51 -05:00
parent 1d6b38768a
commit 1c3c89d381
3 changed files with 21 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
makefile
View File

@ -89,6 +89,12 @@ mingw471: FORCE
mingw510: FORCE mingw510: FORCE
@$(MAKE) -s -f makefile.mingw GCC510=1 @$(MAKE) -s -f makefile.mingw GCC510=1
# MinGW w/gcc 5.1.x to gcc 11.x (present)
# note: BORKYCRT fixes swprintf() which MSYS2 broke some time 2021
mingw: FORCE
@$(MAKE) -s -f makefile.mingw GCC510=1 BORKYCRT=1
#cross compile in linux only 32 bit for now #cross compile in linux only 32 bit for now
mingwcc: FORCE mingwcc: FORCE
@$(MAKE) -s -f makefile.mingw GCC510=1 CC=i686-w64-mingw32-gcc CXX=i686-w64-mingw32-g++-win32 WINDRES=i686-w64-mingw32-windres @$(MAKE) -s -f makefile.mingw GCC510=1 CC=i686-w64-mingw32-gcc CXX=i686-w64-mingw32-g++-win32 WINDRES=i686-w64-mingw32-windres

11
makefile.mingw
View File

@ -12,9 +12,10 @@ unexport
# Check for changes in header files # Check for changes in header files
ifndef SKIPDEPEND ifndef SKIPDEPEND
DEPEND = 1 #DEPEND = 1
endif endif
# Note: DEPEND = 1 is a hassle and slows build time by about 500x
# it's easier to "rm -rf obj" and rebuild than deal with DEPEND = 1
# #
# Declare variables # Declare variables
@ -281,6 +282,12 @@ CXXFLAGS = -pipe \
-Wno-unused-but-set-variable -Wno-sequence-point -Wno-narrowing -Wno-extra \ -Wno-unused-but-set-variable -Wno-sequence-point -Wno-narrowing -Wno-extra \
-Wno-pedantic \ -Wno-pedantic \
$(DEF) $(incdir) $(DEF) $(incdir)
ifdef BORKYCRT
#return back to msvcrt-style swprintf
CFLAGS += -D__USE_MINGW_ANSI_STDIO=0
CXXFLAGS += -D__USE_MINGW_ANSI_STDIO=0
endif
ifdef BUILD_X64_EXE ifdef BUILD_X64_EXE
CFLAGS += -m64 CFLAGS += -m64
CXXFLAGS += -m64 CXXFLAGS += -m64

31
src/burn/drv/spectrum/d_spectrum.cpp
View File

@ -1676,35 +1676,16 @@ struct BurnDriver BurnSpec720deg = {
// Abu Simbel Profanation (Spanish) (48K) // Abu Simbel Profanation (Spanish) (48K)
static struct BurnRomInfo SpecabusimprdRomDesc[] = {
{ "Abu Simbel Profanation (1985)(Dinamic Software)(es).z80", 0x08dbc, 0xa18b280f, BRF_ESS | BRF_PRG },
};
STDROMPICKEXT(Specabusimprd, Specabusimprd, Spectrum)
STD_ROM_FN(Specabusimprd)
struct BurnDriver BurnSpecabusimprd = {
"spec_abusimprd", "spec_abusimpr", "spec_spectrum", NULL, "1985",
"Abu Simbel Profanation (Spanish) (48K)\0", NULL, "Dinamic Software", "ZX Spectrum",
NULL, NULL, NULL, NULL,
BDF_GAME_WORKING | BDF_CLONE, 1, HARDWARE_SPECTRUM, GBF_PLATFORM, 0,
SpectrumGetZipName, SpecabusimprdRomInfo, SpecabusimprdRomName, NULL, NULL, NULL, NULL, SpecInputInfo, SpecDIPInfo,
SpecInit, SpecExit, SpecFrame, SpecDraw, SpecScan,
&SpecRecalc, 0x10, 288, 224, 4, 3
};
// Abu Simbel Profanation (English) (48K)
static struct BurnRomInfo SpecabusimprRomDesc[] = { static struct BurnRomInfo SpecabusimprRomDesc[] = {
{ "Abu Simbel Profanation (1987)(Gremlin Graphics Software)[re-release].tap", 46362, 0x7849893d, BRF_ESS | BRF_PRG }, { "Abu Simbel Profanation (1985)(Dinamic Software).tap", 46362, 0x7849893d, BRF_ESS | BRF_PRG },
}; };
STDROMPICKEXT(Specabusimpr, Specabusimpr, Spectrum) STDROMPICKEXT(Specabusimpr, Specabusimpr, Spectrum)
STD_ROM_FN(Specabusimpr) STD_ROM_FN(Specabusimpr)
struct BurnDriver BurnSpecabusimpr = { struct BurnDriver BurnSpecabusimpr = {
"spec_abusimpr", NULL, "spec_spectrum", NULL, "1987", "spec_abusimpr", NULL, "spec_spectrum", NULL, "1985",
"Abu Simbel Profanation (English) (48K)\0", NULL, "Gremlin Graphics", "ZX Spectrum", "Abu Simbel Profanation (Spanish) (48K)\0", NULL, "Dinamic Software", "ZX Spectrum",
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
BDF_GAME_WORKING, 1, HARDWARE_SPECTRUM, GBF_PLATFORM, 0, BDF_GAME_WORKING, 1, HARDWARE_SPECTRUM, GBF_PLATFORM, 0,
SpectrumGetZipName, SpecabusimprRomInfo, SpecabusimprRomName, NULL, NULL, NULL, NULL, SpecInputInfo, SpecDIPInfo, SpectrumGetZipName, SpecabusimprRomInfo, SpecabusimprRomName, NULL, NULL, NULL, NULL, SpecInputInfo, SpecDIPInfo,
@ -32327,7 +32308,7 @@ struct BurnDriver BurnSpecCyclus2 = {
&SpecRecalc, 0x10, 288, 224, 4, 3 &SpecRecalc, 0x10, 288, 224, 4, 3
}; };
// Get Out Of Mars (128K) (HB) // Get Out Of Mars (128K) (HB, v1.1)
static struct BurnRomInfo SpecGetmarsRomDesc[] = { static struct BurnRomInfo SpecGetmarsRomDesc[] = {
{ "Get Out Of Mars (2021)(Noentiendo).tap", 69762, 0xc699ac83, BRF_ESS | BRF_PRG }, { "Get Out Of Mars (2021)(Noentiendo).tap", 69762, 0xc699ac83, BRF_ESS | BRF_PRG },
@ -32338,7 +32319,7 @@ STD_ROM_FN(SpecGetmars)
struct BurnDriver BurnSpecGetmars = { struct BurnDriver BurnSpecGetmars = {
"spec_getmars", NULL, "spec_spec128", NULL, "2021", "spec_getmars", NULL, "spec_spec128", NULL, "2021",
"Get Out Of Mars (128K) (HB)\0", NULL, "Noentiendo", "ZX Spectrum", "Get Out Of Mars (128K) (HB, v1.1)\0", NULL, "Noentiendo", "ZX Spectrum",
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
BDF_GAME_WORKING | BDF_HOMEBREW, 1, HARDWARE_SPECTRUM, GBF_PLATFORM, 0, BDF_GAME_WORKING | BDF_HOMEBREW, 1, HARDWARE_SPECTRUM, GBF_PLATFORM, 0,
SpectrumGetZipName, SpecGetmarsRomInfo, SpecGetmarsRomName, NULL, NULL, NULL, NULL, SpecInputInfo, SpecDIPInfo, SpectrumGetZipName, SpecGetmarsRomInfo, SpecGetmarsRomName, NULL, NULL, NULL, NULL, SpecInputInfo, SpecDIPInfo,
@ -32387,7 +32368,7 @@ struct BurnDriver BurnSpecMagjim48 = {
// TJ Cavern Capers (128K) (HB) // TJ Cavern Capers (128K) (HB)
static struct BurnRomInfo SpecTjccRomDesc[] = { static struct BurnRomInfo SpecTjccRomDesc[] = {
{ "TJ Cavern Capers (2021)(Gaz Marshall).tap", 27335, 0x13ef7638, BRF_ESS | BRF_PRG }, { "TJ Cavern Capers (2021)(Gaz Marshall).tap", 33835, 0x2d4a85ab, BRF_ESS | BRF_PRG },
}; };
STDROMPICKEXT(SpecTjcc, SpecTjcc, Spec128) STDROMPICKEXT(SpecTjcc, SpecTjcc, Spec128)