blob: efacacc3347c475a9ab6bb2a7c662729ca6d0b3a (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
|
From 5c104400d226a1531145b8e30e2055ef6a24d1e3 Mon Sep 17 00:00:00 2001
From: Joachim Le Fournis <joachimlf@pm.me>
Date: Tue, 13 Jul 2021 21:17:44 +0200
Subject: [PATCH 3/3] 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
--
2.36.1
|
