From 22e6c350edc9d947fe1f51e7b9cd362505bf0432 Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Tue, 16 Feb 2016 11:36:13 +0100 Subject: [PATCH] Enabled BGFX support for SteamLink --- makefile | 2 +- scripts/genie.lua | 5 ++++- scripts/src/3rdparty.lua | 6 +++++- scripts/src/osd/sdl.lua | 1 - src/osd/modules/render/drawbgfx.cpp | 2 ++ 5 files changed, 12 insertions(+), 4 deletions(-) diff --git a/makefile b/makefile index a70d6a6db12..9ead341d669 100644 --- a/makefile +++ b/makefile @@ -1200,7 +1200,7 @@ endif ifndef MARVELL_ROOTFS $(error MARVELL_ROOTFS is not set) endif - $(SILENT) $(GENIE) $(PARAMS) --gcc=steamlink --gcc_version=$(GCC_VERSION) --USE_BGFX=0 --NO_OPENGL=1 --NO_USE_MIDI=1 --NO_X11=1 --NOASM=1 --SDL_INSTALL_ROOT=$(MARVELL_ROOTFS)/usr gmake + $(SILENT) $(GENIE) $(PARAMS) --gcc=steamlink --gcc_version=$(GCC_VERSION) --NO_OPENGL=1 --NO_USE_MIDI=1 --NO_X11=1 --NOASM=1 --SDL_INSTALL_ROOT=$(MARVELL_ROOTFS)/usr gmake .PHONY: steamlink ifndef MARVELL_SDK_PATH diff --git a/scripts/genie.lua b/scripts/genie.lua index dd955bd0ce9..70901cf038f 100644 --- a/scripts/genie.lua +++ b/scripts/genie.lua @@ -1073,7 +1073,10 @@ configuration { "linux-*" } configuration { "steamlink" } links { "dl", - } + "EGL", + "GLESv2", + "SDL2", + } defines { "EGL_API_FB", } diff --git a/scripts/src/3rdparty.lua b/scripts/src/3rdparty.lua index 34376515c64..9f44143da1d 100644 --- a/scripts/src/3rdparty.lua +++ b/scripts/src/3rdparty.lua @@ -730,10 +730,14 @@ end MAME_DIR .. "3rdparty/bgfx/include", MAME_DIR .. "3rdparty/bgfx/3rdparty", MAME_DIR .. "3rdparty/bx/include", - MAME_DIR .. "3rdparty/bgfx/3rdparty/khronos", MAME_DIR .. "3rdparty/bgfx/3rdparty/dxsdk/include", } + configuration { "not steamlink"} + includedirs { + MAME_DIR .. "3rdparty/bgfx/3rdparty/khronos", + } + configuration { "vs*" } includedirs { MAME_DIR .. "3rdparty/bx/include/compat/msvc", diff --git a/scripts/src/osd/sdl.lua b/scripts/src/osd/sdl.lua index 591b75d0b29..ae4a752860c 100644 --- a/scripts/src/osd/sdl.lua +++ b/scripts/src/osd/sdl.lua @@ -287,7 +287,6 @@ if BASE_TARGETOS=="unix" then else if _OPTIONS["NO_X11"]=="1" then _OPTIONS["USE_QTDEBUG"] = "0" - USE_BGFX = 0 else libdirs { "/usr/X11/lib", diff --git a/src/osd/modules/render/drawbgfx.cpp b/src/osd/modules/render/drawbgfx.cpp index 4e7c7f15e43..30eb5676e61 100644 --- a/src/osd/modules/render/drawbgfx.cpp +++ b/src/osd/modules/render/drawbgfx.cpp @@ -120,6 +120,8 @@ static void* sdlNativeWindowHandle(SDL_Window* _window) return wmi.info.cocoa.window; # elif BX_PLATFORM_WINDOWS return wmi.info.win.window; +# elif BX_PLATFORM_STEAMLINK + return wmi.info.vivante.window; # endif // BX_PLATFORM_ } #endif