From 8c55c8f8a914e3ee1a98bf77870a20638f327200 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Branimir=20Karad=C5=BEi=C4=87?= Date: Wed, 6 Aug 2014 21:53:32 -0700 Subject: [PATCH] FreeBSD ifdefs. --- include/bgfxplatform.h | 6 +++--- src/glcontext_glx.cpp | 2 +- src/glcontext_glx.h | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/bgfxplatform.h b/include/bgfxplatform.h index a1261840..e06967b0 100755 --- a/include/bgfxplatform.h +++ b/include/bgfxplatform.h @@ -111,7 +111,7 @@ namespace bgfx return false; } -# if BX_PLATFORM_LINUX +# if BX_PLATFORM_LINUX || BX_PLATFORM_FREEBSD x11SetDisplayWindow(wmi.info.x11.display, wmi.info.x11.window); # elif BX_PLATFORM_OSX osxSetNSWindow(wmi.info.cocoa.window); @@ -128,7 +128,7 @@ namespace bgfx // If GLFW/glfw3.h is included before bgfxplatform.h we can enable GLFW3 // window interop convenience code. -# if BX_PLATFORM_LINUX +# if BX_PLATFORM_LINUX || BX_PLATFORM_FREEBSD # define GLFW_EXPOSE_NATIVE_X11 # define GLFW_EXPOSE_NATIVE_GLX # elif BX_PLATFORM_OSX @@ -144,7 +144,7 @@ namespace bgfx { inline void glfwSetWindow(GLFWwindow* _window) { -# if BX_PLATFORM_LINUX +# if BX_PLATFORM_LINUX || BX_PLATFORM_FREEBSD ::Display* display = glfwGetX11Display(); ::Window window = glfwGetX11Window(_window); x11SetDisplayWindow(display, window); diff --git a/src/glcontext_glx.cpp b/src/glcontext_glx.cpp index f2a970fa..7e030cab 100644 --- a/src/glcontext_glx.cpp +++ b/src/glcontext_glx.cpp @@ -233,4 +233,4 @@ namespace bgfx } // namespace bgfx -#endif // BX_PLATFORM_LINUX & (BGFX_CONFIG_RENDERER_OPENGLES|BGFX_CONFIG_RENDERER_OPENGL) +#endif // (BX_PLATFORM_LINUX || BX_PLATFORM_FREEBSD) && (BGFX_CONFIG_RENDERER_OPENGLES || BGFX_CONFIG_RENDERER_OPENGL) diff --git a/src/glcontext_glx.h b/src/glcontext_glx.h index bd37ddd3..00d121a2 100644 --- a/src/glcontext_glx.h +++ b/src/glcontext_glx.h @@ -6,7 +6,7 @@ #ifndef BGFX_GLCONTEXT_GLX_H_HEADER_GUARD #define BGFX_GLCONTEXT_GLX_H_HEADER_GUARD -#if BX_PLATFORM_LINUX +#if BX_PLATFORM_LINUX || BX_PLATFORM_FREEBSD # include # include @@ -35,6 +35,6 @@ namespace bgfx }; } // namespace bgfx -#endif // BX_PLATFORM_LINUX +#endif // BX_PLATFORM_LINUX || BX_PLATFORM_FREEBSD #endif // BGFX_GLCONTEXT_GLX_H_HEADER_GUARD