Makefile: When DEBUG set have special target for compemu_support that always omits frame pointers (avoid using register 7)

InGameMessage: If the GUI is not up yet, send message to the console instead of trying to display it and causing a segfault.
This commit is contained in:
Alynna Trypnotk 2018-01-23 18:45:20 +00:00
parent 7fbfe92c20
commit f99c6e9aa7
2 changed files with 8 additions and 2 deletions

View file

@ -15,6 +15,7 @@ CPPFLAGS+= -MD -MP
#GCC_PROFILE=1
#GEN_PROFILE=1
#USE_PROFILE=1
#WITH_LOGGING=1
#
# SDL1 targets
@ -135,9 +136,9 @@ USE_SDL2 = 1
NAME = amiberry-xu4-sdl2-dev
else ifeq ($(PLATFORM),tinker)
USE_SDL2 = 1
CPU_FLAGS += -march=armv7-a -mtune=cortex-a7 -mfpu=neon-vfpv4 -mfloat-abi=hard
CPU_FLAGS += -march=armv7-a -mtune=cortex-a17 -mfpu=neon-vfpv4 -mfloat-abi=hard
CFLAGS += -DARMV6T2 -DUSE_ARMNEON -DUSE_SDL2 -DTINKER -I/usr/local/include
LDFLAGS += -L/usr/local/lib -lmali
LDFLAGS += -L/usr/local/lib
HAVE_NEON = 1
NAME = amiberry-tinker-dev
endif
@ -399,8 +400,12 @@ OBJS += src/jit/compemu_support.o
-include $(OBJS:%.o=%.d)
src/jit/compemu_support.o: src/jit/compemu_support.cpp
$(CXX) $(CXXFLAGS) $(CPPFLAGS) -fomit-frame-pointer -o src/jit/compemu_support.o -c src/jit/compemu_support.cpp
$(PROG): $(OBJS)
$(CXX) -o $(PROG) $(OBJS) $(LDFLAGS)
cp $(PROG) $(PROG)-debug
ifndef DEBUG
$(STRIP) $(PROG)
endif

View file

@ -241,6 +241,7 @@ void InGameMessage(const char* msg)
if (SDL_NumJoysticks() > 0)
if (GUIjoy == nullptr)
GUIjoy = SDL_JoystickOpen(0);
if (!uae_gui) { printf("%s\n",msg); return; }
// Prepare the screen once
uae_gui->logic();