diff options
| author | Simon Glass <sjg@chromium.org> | 2018-12-17 09:12:16 -0700 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2019-01-14 17:47:13 -0700 |
| commit | 398ae02669d1300ab2cdcbbdfe1c5c264d47b718 (patch) | |
| tree | e408f9928cdb85a3470e24e6712969a285831113 /arch/sandbox | |
| parent | e74429bb17533c454b804e523ff5724344711ad2 (diff) | |
sandbox: Correct SDL build flags
The check for CONFIG_SANDBOX_SDL in config.mk does not work since the
build config is not available by the time that file is included. Remove it
so that we always call sdl-config except when NO_SDL is used.
Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'arch/sandbox')
| -rw-r--r-- | arch/sandbox/config.mk | 2 | ||||
| -rw-r--r-- | arch/sandbox/cpu/sdl.c | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/arch/sandbox/config.mk b/arch/sandbox/config.mk index 7226b7be42..31a12db103 100644 --- a/arch/sandbox/config.mk +++ b/arch/sandbox/config.mk @@ -11,11 +11,9 @@ PLATFORM_LIBS += -lrt ifneq ($(NO_SDL),) PLATFORM_CPPFLAGS += -DSANDBOX_NO_SDL else -ifdef CONFIG_SANDBOX_SDL PLATFORM_LIBS += $(shell sdl-config --libs) PLATFORM_CPPFLAGS += $(shell sdl-config --cflags) endif -endif cmd_u-boot__ = $(CC) -o $@ -Wl,-T u-boot.lds $(u-boot-init) \ -Wl,--start-group $(u-boot-main) -Wl,--end-group \ diff --git a/arch/sandbox/cpu/sdl.c b/arch/sandbox/cpu/sdl.c index f668f5379a..080c7c8d74 100644 --- a/arch/sandbox/cpu/sdl.c +++ b/arch/sandbox/cpu/sdl.c @@ -6,7 +6,7 @@ #include <errno.h> #include <unistd.h> #include <linux/input.h> -#include <SDL/SDL.h> +#include <SDL.h> #include <asm/state.h> /** |