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
This commit is contained in:
Julian Sikorski 2019-10-18 16:31:08 +02:00 committed by R. Belmont
parent 93a1cde67d
commit 6e66a83642
3 changed files with 21 additions and 0 deletions

View File

@ -24,6 +24,7 @@
# BENCHMARKS = 1
# OSD = sdl
# NO_OPENGL = 0
# USE_DISPATCH_GL = 0
# MODERN_WIN_API = 0
# DIRECTINPUT = 7
@ -713,6 +714,10 @@ ifdef DONT_USE_NETWORK
PARAMS += --DONT_USE_NETWORK='$(DONT_USE_NETWORK)'
endif
ifdef NO_OPENGL
PARAMS += --NO_OPENGL='$(NO_OPENGL)'
endif
ifdef USE_DISPATCH_GL
PARAMS += --USE_DISPATCH_GL='$(USE_DISPATCH_GL)'
endif

View File

@ -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",

View File

@ -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