Browse Source

Merge pull request #424 from Martinfx/develop

Added next BSD OS
pull/432/head
Ray 7 years ago
committed by GitHub
parent
commit
0bb90d21c6
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
  1. +1
    -1
      examples/Makefile
  2. +5
    -5
      src/rglfw.c

+ 1
- 1
examples/Makefile View File

@ -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 View File

@ -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

Loading…
Cancel
Save