From dbef93a30d59e0168a6cdcf366af75e6f62b675e Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Thu, 29 Aug 2019 12:35:16 +0200 Subject: [PATCH] core: enable firmware build without SDL2 installed SConstruct includes SConscript.unix even for the firmware builds, which resuls in error if SDL2 is not installed. This commit workarounds the issue. Is there a better way how to NOT include SConscript.unix via SConstruct for firmware only builds? --- core/SConscript.unix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/core/SConscript.unix b/core/SConscript.unix index 790ce72fcd..b98e9cd6c1 100644 --- a/core/SConscript.unix +++ b/core/SConscript.unix @@ -349,7 +349,10 @@ env.Replace( ] + CPPDEFINES_MOD, ASPPFLAGS='$CFLAGS $CCFLAGS', ) -env.ParseConfig('pkg-config --cflags --libs sdl2 SDL2_image') +try: + env.ParseConfig('pkg-config --cflags --libs sdl2 SDL2_image') +except OSError: + print("SDL2 not installed, Emulator build is not possible") env.Replace( PYTHON='python',