From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Joachim Le Fournis Date: Tue, 13 Jul 2021 21:17:44 +0200 Subject: [PATCH] Don't use dynamic SDL --- build/platform.simulator.mak | 1 + ion/src/simulator/external/Makefile | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/build/platform.simulator.mak b/build/platform.simulator.mak index 07f1edd..9c349f8 100644 --- a/build/platform.simulator.mak +++ b/build/platform.simulator.mak @@ -1,6 +1,7 @@ USE_LIBA = 0 ION_KEYBOARD_LAYOUT = layout_B2 EPSILON_GETOPT = 1 +SHOULD_USE_DYNAMIC_SDL = 0 SFLAGS += -fPIE diff --git a/ion/src/simulator/external/Makefile b/ion/src/simulator/external/Makefile index cf7744b..5157f3c 100644 --- a/ion/src/simulator/external/Makefile +++ b/ion/src/simulator/external/Makefile @@ -99,8 +99,12 @@ endif # Ignore warnings from external sources SDL_SFLAGS += -w +ifeq ($(SHOULD_USE_DYNAMIC_SDL),0) include ion/src/simulator/external/config.$(TARGET).mak +endif $(call object_for,$(sdl_src)): SFLAGS += $(SDL_SFLAGS) +ifeq ($(SHOULD_USE_DYNAMIC_SDL),0) ion_src += $(sdl_src) +endif