From 6e66a8364206f69bf8f4591b9ca7bc44f32bdca7 Mon Sep 17 00:00:00 2001 From: Julian Sikorski Date: Fri, 18 Oct 2019 16:31:08 +0200 Subject: Odroid n2 build fixes (#5751) * Allow specifying NO_OPENGL manually * Switch bgfx to OpenGL ES renderer if NO_X11 is specified * Only link against EGL when NO_X11 is specified on linux, netbsd and openbsd * Only switch bgfx to OpenGL ES on linux, netbsd and openbsd * Indentation fix --- scripts/src/3rdparty.lua | 10 ++++++++++ scripts/src/osd/sdl.lua | 6 ++++++ 2 files changed, 16 insertions(+) (limited to 'scripts/src') diff --git a/scripts/src/3rdparty.lua b/scripts/src/3rdparty.lua index 970afc7d45b..f4926be55e2 100644 --- a/scripts/src/3rdparty.lua +++ b/scripts/src/3rdparty.lua @@ -1383,6 +1383,16 @@ end "__STDC_CONSTANT_MACROS", "BGFX_CONFIG_MAX_FRAME_BUFFERS=128", } + + if _OPTIONS["targetos"]=="linux" or _OPTIONS["targetos"]=="netbsd" or _OPTIONS["targetos"]=="openbsd" then + if _OPTIONS["NO_X11"]=="1" then + defines { + "BGFX_CONFIG_RENDERER_OPENGLES=1", + "BGFX_CONFIG_RENDERER_OPENGL=0", + } + end + end + files { MAME_DIR .. "3rdparty/bgfx/src/bgfx.cpp", MAME_DIR .. "3rdparty/bgfx/src/debug_renderdoc.cpp", diff --git a/scripts/src/osd/sdl.lua b/scripts/src/osd/sdl.lua index ed660e65f9b..43b1e20e079 100644 --- a/scripts/src/osd/sdl.lua +++ b/scripts/src/osd/sdl.lua @@ -29,6 +29,12 @@ function maintargetosdoptions(_target,_subtarget) "X11", "Xinerama", } + else + if _OPTIONS["targetos"]=="linux" or _OPTIONS["targetos"]=="netbsd" or _OPTIONS["targetos"]=="openbsd" then + links { + "EGL", + } + end end if _OPTIONS["NO_USE_XINPUT"]~="1" then -- cgit v1.2.3-70-g09d2