Merge pull request #681 from mmicko/master

SteamLink support
This commit is contained in:
Branimir Karadžić 2016-02-15 10:52:58 -08:00
commit 8005ec0687
6 changed files with 27 additions and 2 deletions

View File

@ -218,6 +218,8 @@ namespace entry
return wmi.info.cocoa.window; return wmi.info.cocoa.window;
# elif BX_PLATFORM_WINDOWS # elif BX_PLATFORM_WINDOWS
return wmi.info.win.window; return wmi.info.win.window;
# elif BX_PLATFORM_STEAMLINK
return wmi.info.vivante.window;
# endif // BX_PLATFORM_ # endif // BX_PLATFORM_
} }

View File

@ -279,6 +279,9 @@ namespace bgfx
# elif BX_PLATFORM_WINDOWS # elif BX_PLATFORM_WINDOWS
pd.ndt = NULL; pd.ndt = NULL;
pd.nwh = wmi.info.win.window; pd.nwh = wmi.info.win.window;
# elif BX_PLATFORM_STEAMLINK
pd.ndt = wmi.info.vivante.display;
pd.nwh = wmi.info.vivante.window;
# endif // BX_PLATFORM_ # endif // BX_PLATFORM_
pd.context = NULL; pd.context = NULL;
pd.backBuffer = NULL; pd.backBuffer = NULL;

View File

@ -88,12 +88,18 @@ function bgfxProject(_name, _kind, _defines)
"-weak_framework Metal", "-weak_framework Metal",
} }
configuration { "not nacl" } configuration { "not nacl", "not linux-steamlink" }
includedirs { includedirs {
--nacl has GLES2 headers modified... --nacl has GLES2 headers modified...
--steamlink has EGL headers modified...
path.join(BGFX_DIR, "3rdparty/khronos"), path.join(BGFX_DIR, "3rdparty/khronos"),
} }
configuration { "linux-steamlink" }
defines {
"EGL_API_FB",
}
configuration {} configuration {}
includedirs { includedirs {

View File

@ -61,6 +61,11 @@ project ("example-common")
} }
end end
configuration { "linux-steamlink" }
defines {
"EGL_API_FB",
}
configuration { "osx or ios* or tvos*" } configuration { "osx or ios* or tvos*" }
files { files {
path.join(BGFX_DIR, "examples/common/**.mm"), path.join(BGFX_DIR, "examples/common/**.mm"),

View File

@ -304,13 +304,21 @@ function exampleProject(_name)
kind "ConsoleApp" kind "ConsoleApp"
targetextension ".bc" targetextension ".bc"
configuration { "linux-* or freebsd" } configuration { "linux-* or freebsd", "not linux-steamlink" }
links { links {
"X11", "X11",
"GL", "GL",
"pthread", "pthread",
} }
configuration { "linux-steamlink" }
links {
"EGL",
"GLESv2",
"SDL2",
"pthread",
}
configuration { "rpi" } configuration { "rpi" }
links { links {
"X11", "X11",

View File

@ -13,6 +13,7 @@
|| BX_PLATFORM_BSD \ || BX_PLATFORM_BSD \
|| BX_PLATFORM_QNX \ || BX_PLATFORM_QNX \
|| BX_PLATFORM_RPI \ || BX_PLATFORM_RPI \
|| BX_PLATFORM_STEAMLINK \
|| BX_PLATFORM_WINDOWS \ || BX_PLATFORM_WINDOWS \
) ) ) )