Manually integrated some FreeBSD changes from @lye #132 pull request.

This commit is contained in:
Branimir Karadžić 2014-08-06 21:17:14 -07:00
parent f492d7d113
commit d525e96dd9
4 changed files with 4 additions and 4 deletions

View file

@ -46,7 +46,7 @@ BGFX_C_API void bgfx_android_set_window(ANativeWindow* _window);
*/
BGFX_C_API void bgfx_ios_set_eagl_layer(void* _layer);
#elif BX_PLATFORM_LINUX
#elif BX_PLATFORM_LINUX || BX_PLATFORM_FREEBSD
# include <X11/Xlib.h>
/**

View file

@ -50,7 +50,7 @@ namespace bgfx
} // namespace bgfx
#elif BX_PLATFORM_LINUX
#elif BX_PLATFORM_LINUX || BX_PLATFORM_FREEBSD
# include <X11/Xlib.h>
namespace bgfx

View file

@ -3319,7 +3319,7 @@ BGFX_C_API void bgfx_ios_set_eagl_layer(void* _layer)
bgfx::iosSetEaglLayer(_layer);
}
#elif BX_PLATFORM_LINUX
#elif BX_PLATFORM_LINUX || BX_PLATFORM_FREEBSD
BGFX_C_API void bgfx_x11_set_display_window(::Display* _display, ::Window _window)
{
bgfx::x11SetDisplayWindow(_display, _window);

View file

@ -5,7 +5,7 @@
#include "bgfx_p.h"
#if BX_PLATFORM_LINUX & (BGFX_CONFIG_RENDERER_OPENGLES|BGFX_CONFIG_RENDERER_OPENGL)
#if (BX_PLATFORM_LINUX || BX_PLATFORM_FREEBSD) && (BGFX_CONFIG_RENDERER_OPENGLES || BGFX_CONFIG_RENDERER_OPENGL)
# include "renderer_gl.h"
# define GLX_GLXEXT_PROTOTYPES
# include <glx/glxext.h>