Merge pull request #635 from mmicko/master

Use BX_PLATFORM_BSD for all BSD based platforms

examples/common/entry/entry_sdl.cpp

@@ -142,7 +142,7 @@ namespace entry
 			return NULL;
 		}
 
-#	if BX_PLATFORM_LINUX || BX_PLATFORM_FREEBSD
+#	if BX_PLATFORM_LINUX || BX_PLATFORM_BSD
 		return (void*)wmi.info.x11.window;
 #	elif BX_PLATFORM_OSX
 		return wmi.info.cocoa.window;

examples/common/entry/entry_x11.cpp

@@ -5,7 +5,7 @@
 
 #include "entry_p.h"
 
-#if ENTRY_CONFIG_USE_NATIVE && (BX_PLATFORM_FREEBSD || BX_PLATFORM_LINUX || BX_PLATFORM_RPI)
+#if ENTRY_CONFIG_USE_NATIVE && (BX_PLATFORM_BSD || BX_PLATFORM_LINUX || BX_PLATFORM_RPI)
 
 #define XK_MISCELLANY
 #define XK_LATIN1
@@ -713,4 +713,4 @@ int main(int _argc, char** _argv)
 	return s_ctx.run(_argc, _argv);
 }
 
-#endif // ENTRY_CONFIG_USE_NATIVE && (BX_PLATFORM_FREEBSD || BX_PLATFORM_LINUX || BX_PLATFORM_RPI)
+#endif // ENTRY_CONFIG_USE_NATIVE && (BX_PLATFORM_BSD || BX_PLATFORM_LINUX || BX_PLATFORM_RPI)

include/bgfx/bgfxplatform.h

@@ -98,7 +98,7 @@ namespace bgfx
 
 } // namespace bgfx
 
-#elif BX_PLATFORM_FREEBSD || BX_PLATFORM_LINUX || BX_PLATFORM_RPI
+#elif BX_PLATFORM_BSD || BX_PLATFORM_LINUX || BX_PLATFORM_RPI
 
 namespace bgfx
 {
@@ -203,7 +203,7 @@ namespace bgfx
 		}
 
 		PlatformData pd;
-#	if BX_PLATFORM_LINUX || BX_PLATFORM_FREEBSD
+#	if BX_PLATFORM_LINUX || BX_PLATFORM_BSD
 		pd.ndt          = wmi.info.x11.display;
 		pd.nwh          = (void*)(uintptr_t)wmi.info.x11.window;
 #	elif BX_PLATFORM_OSX
@@ -227,7 +227,7 @@ namespace bgfx
 // If GLFW/glfw3.h is included before bgfxplatform.h we can enable GLFW3
 // window interop convenience code.
 
-#	if BX_PLATFORM_LINUX || BX_PLATFORM_FREEBSD
+#	if BX_PLATFORM_LINUX || BX_PLATFORM_BSD
 #		define GLFW_EXPOSE_NATIVE_X11
 #		define GLFW_EXPOSE_NATIVE_GLX
 #	elif BX_PLATFORM_OSX
@@ -244,7 +244,7 @@ namespace bgfx
 	inline void glfwSetWindow(GLFWwindow* _window)
 	{
 		PlatformData pd;
-#	if BX_PLATFORM_LINUX || BX_PLATFORM_FREEBSD
+#	if BX_PLATFORM_LINUX || BX_PLATFORM_BSD
 		pd.ndt          = glfwGetX11Display();
 		pd.nwh          = (void*)(uintptr_t)glfwGetX11Window(_window);
 		pd.context      = glfwGetGLXContext(_window);

src/config.h

@@ -50,7 +50,7 @@
 
 #	ifndef BGFX_CONFIG_RENDERER_OPENGL
 #		define BGFX_CONFIG_RENDERER_OPENGL (0 \
-					|| BX_PLATFORM_FREEBSD \
+					|| BX_PLATFORM_BSD \
 					|| BX_PLATFORM_LINUX \
 					|| BX_PLATFORM_OSX \
 					|| BX_PLATFORM_WINDOWS \
@@ -177,7 +177,7 @@
 #ifndef BGFX_CONFIG_MULTITHREADED
 #	define BGFX_CONFIG_MULTITHREADED ( (!BGFX_CONFIG_RENDERER_NULL)&&(0 \
 						|| BX_PLATFORM_ANDROID \
-						|| BX_PLATFORM_FREEBSD \
+						|| BX_PLATFORM_BSD \
 						|| BX_PLATFORM_LINUX \
 						|| BX_PLATFORM_IOS \
 						|| BX_PLATFORM_NACL \

src/glcontext_glx.cpp

@@ -5,7 +5,7 @@
 
 #include "bgfx_p.h"
 
-#if (BX_PLATFORM_FREEBSD || BX_PLATFORM_LINUX) && (BGFX_CONFIG_RENDERER_OPENGLES || BGFX_CONFIG_RENDERER_OPENGL)
+#if (BX_PLATFORM_BSD || BX_PLATFORM_LINUX) && (BGFX_CONFIG_RENDERER_OPENGLES || BGFX_CONFIG_RENDERER_OPENGL)
 #	include "renderer_gl.h"
 
 #	if BGFX_USE_GLX
@@ -308,4 +308,4 @@ namespace bgfx { namespace gl
 
 #	endif // BGFX_USE_GLX
 
-#endif // (BX_PLATFORM_FREEBSD || BX_PLATFORM_LINUX) && (BGFX_CONFIG_RENDERER_OPENGLES || BGFX_CONFIG_RENDERER_OPENGL)
+#endif // (BX_PLATFORM_BSD || BX_PLATFORM_LINUX) && (BGFX_CONFIG_RENDERER_OPENGLES || BGFX_CONFIG_RENDERER_OPENGL)

src/renderer_gl.h

@@ -10,7 +10,7 @@
 			|| BX_PLATFORM_ANDROID \
 			|| BX_PLATFORM_EMSCRIPTEN \
 			|| BX_PLATFORM_LINUX \
-			|| BX_PLATFORM_FREEBSD \
+			|| BX_PLATFORM_BSD \
 			|| BX_PLATFORM_QNX \
 			|| BX_PLATFORM_RPI \
 			|| BX_PLATFORM_WINDOWS \
@@ -19,12 +19,12 @@
 #define BGFX_USE_WGL (BGFX_CONFIG_RENDERER_OPENGL && BX_PLATFORM_WINDOWS)
 #define BGFX_USE_GLX (BGFX_CONFIG_RENDERER_OPENGL && (0 \
 			|| BX_PLATFORM_LINUX \
-			|| BX_PLATFORM_FREEBSD \
+			|| BX_PLATFORM_BSD \
 			) )
 
 #define BGFX_USE_GL_DYNAMIC_LIB (0 \
 			|| BX_PLATFORM_LINUX \
-			|| BX_PLATFORM_FREEBSD \
+			|| BX_PLATFORM_BSD \
 			|| BX_PLATFORM_OSX \
 			|| BX_PLATFORM_WINDOWS \
 			)
@@ -36,7 +36,7 @@
 #			define GL_ARB_shader_objects // OSX collsion with GLhandleARB in gltypes.h
 #		endif // BX_PLATFORM_OSX
 #	else
-#		if BX_PLATFORM_LINUX || BX_PLATFORM_FREEBSD
+#		if BX_PLATFORM_LINUX || BX_PLATFORM_BSD
 #			define GL_PROTOTYPES
 #			define GL_GLEXT_LEGACY
 #			include <GL/gl.h>
@@ -805,7 +805,7 @@ typedef uint64_t GLuint64;
 #	include "glcontext_ppapi.h"
 #elif BX_PLATFORM_WINDOWS
 #	include <windows.h>
-#elif BX_PLATFORM_LINUX || BX_PLATFORM_FREEBSD
+#elif BX_PLATFORM_LINUX || BX_PLATFORM_BSD
 #	include "glcontext_glx.h"
 #elif BX_PLATFORM_OSX
 #	include "glcontext_nsgl.h"