瀏覽代碼

Merge pull request #424 from Martinfx/develop

Added next BSD OS
Ray 7 年之前
父節點
當前提交
0bb90d21c6
共有 2 個文件被更改,包括 6 次插入6 次删除
  1. 1 1
      examples/Makefile
  2. 5 5
      src/rglfw.c

+ 1 - 1
examples/Makefile

@@ -51,7 +51,7 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP)
         UNAMEOS=$(shell uname)
         ifeq ($(UNAMEOS),FreeBSD)
             PLATFORM_OS=FREEBSD
-            LIBPATH=linux
+            LIBPATH=freebsd
         endif
         ifeq ($(UNAMEOS),Darwin)
             PLATFORM_OS=OSX

+ 5 - 5
src/rglfw.c

@@ -38,7 +38,7 @@
         #define _GLFW_X11
     #endif
 #endif
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined( __NetBSD__)
     #define _GLFW_X11
 #endif
 #ifdef __APPLE__
@@ -83,7 +83,7 @@
         #include "external/glfw/src/x11_window.c"
         #include "external/glfw/src/glx_context.c"
     #endif
-    
+
     #include "external/glfw/src/linux_joystick.c"
     #include "external/glfw/src/posix_thread.c"
     #include "external/glfw/src/posix_time.c"
@@ -92,7 +92,7 @@
     #include "external/glfw/src/osmesa_context.c"
 #endif
 
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined( __NetBSD__)
     #include "external/glfw/src/x11_init.c"
     #include "external/glfw/src/x11_monitor.c"
     #include "external/glfw/src/x11_window.c"
@@ -113,7 +113,7 @@
     #include "external/glfw/src/cocoa_window.m"
     #include "external/glfw/src/cocoa_time.c"
     #include "external/glfw/src/posix_thread.c"
-    #include "external/glfw/src/nsgl_context.m" 
-    #include "external/glfw/src/egl_context.c" 
+    #include "external/glfw/src/nsgl_context.m"
+    #include "external/glfw/src/egl_context.c"
     #include "external/glfw/src/osmesa_context.c"
 #endif