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

win32: link pthread statically. Alien Front naomi needs safe mode

This commit is contained in:
Flyinghead 2020-03-20 12:42:13 +01:00
parent 6b2e815b49
commit bccea0e991
2 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/nullDC.cpp
View File

@ -222,7 +222,7 @@ void LoadSpecialSettings()
// Power Stone (PAL)
|| !strncmp("T36801D 50", prod_id, 10)
// Metropolis Street Racer (NTSC)
|| !strncmp("MK-51012", prod_id, 10)
|| !strncmp("MK-51012", prod_id, 8)
// Metropolis Street Racer (PAL)
|| !strncmp("MK-5102250", prod_id, 10)
// Donald Duck Goin' Quackers
@ -349,8 +349,10 @@ void LoadSpecialSettings()
{
NOTICE_LOG(BOOT, "Game ID is [%s]", naomi_game_id);
if (!strcmp("METAL SLUG 6", naomi_game_id) || !strcmp("WAVE RUNNER GP", naomi_game_id)
|| !strcmp("STREET FIGHTER ZERO3 UPPER", naomi_game_id))
if (!strcmp("METAL SLUG 6", naomi_game_id)
|| !strcmp("WAVE RUNNER GP", naomi_game_id)
|| !strcmp("STREET FIGHTER ZERO3 UPPER", naomi_game_id)
|| !strcmp("ALIEN FRONT", naomi_game_id))
{
INFO_LOG(BOOT, "Enabling Dynarec safe mode for game %s", naomi_game_id);
settings.dynarec.safemode = 1;

23
shell/linux/Makefile
View File

@ -25,9 +25,9 @@ CHD5_FLAC := 1
MFLAGS :=
ASFLAGS :=
LDFLAGS :=
INCS :=
LIBS :=
LDFLAGS ?=
INCS ?=
LIBS ?=
CFLAGS :=
CXXFLAGS :=
@ -172,8 +172,8 @@ else ifneq (,$(findstring rpi,$(platform)))
MFLAGS += -mcpu=cortex-a7 -mfpu=neon-vfpv4 -mfloat-abi=hard
ASFLAGS += -mcpu=cortex-a7 -mfpu=neon-vfpv4 -mfloat-abi=hard
else ifneq (,$(findstring rpi3,$(platform)))
MFLAGS += -march=armv8-a+crc -mtune=cortex-a53 -mfpu=neon-fp-armv8 -mfloat-abi=hard
ASFLAGS += -march=armv8-a+crc -mtune=cortex-a53 -mfpu=neon-fp-armv8 -mfloat-abi=hard
MFLAGS += -march=armv8-a+crc -mtune=cortex-a53 -mfpu=neon-fp-armv8 -mfloat-abi=hard -marm
ASFLAGS += -march=armv8-a+crc -mtune=cortex-a53 -mfpu=neon-fp-armv8 -mfloat-abi=hard -marm
endif
ifneq (,$(findstring mesa,$(platform)))
USE_SDL := 1
@ -301,7 +301,11 @@ CXXFLAGS += $(RZDCY_CFLAGS) -fno-rtti -fno-operator-names -D_GLIBCXX_USE_CXX11_A
INCS += -I$(RZDCY_SRC_DIR) -I$(RZDCY_SRC_DIR)/deps -I$(RZDCY_SRC_DIR)/khronos
LIBS += -lm -lpthread
ifdef FOR_WINDOWS
LIBS += -lm -static -lpthread
else
LIBS += -lm -lpthread
endif
ifdef FOR_LINUX
LIBS += -lrt
endif
@ -411,13 +415,18 @@ ifdef UNIT_TESTS
CFLAGS += -DUNIT_TESTS
endif
ifdef ASAN
CFLAGS += -fsanitize=address -static-libasan
LDFLAGS += -fsanitize=address -static-libasan
endif
EXECUTABLE_STRIPPED=nosym-reicast.$(PLATFORM_EXT)
DC_PLATFORM=dreamcast
EXECUTABLE=reicast.$(PLATFORM_EXT)
EXECUTABLE_NAME=reicast
ifndef NOT_ARM
AS=${CC_PREFIX}gcc
AS=$(CC)
ASFLAGS += $(CFLAGS)
endif