Merge remote-tracking branch 'origin/master'

.gitignore

@@ -9,3 +9,4 @@
 *.i
 
 *.i2
+*.app

lib.mod/common.bmx

@@ -32,6 +32,9 @@ Import "-lXext"
 Import "-lGLdispatch"
 Import "-lXau"
 Import "-lXdmcp"
+?macos
+Import "-framework IOKit"
+Import "-framework OpenGL"
 ?
 
 Import "source.bmx"

lib.mod/lib.bmx

@@ -47,7 +47,7 @@ ModuleInfo "CC_OPTS: -DSUPPORT_FILEFORMAT_OBJ -DSUPPORT_FILEFORMAT_IQM -DSUPPORT
 ?win32
 ModuleInfo "CC_OPTS: -DPLATFORM_DESKTOP"
 ModuleInfo "CC_OPTS: -D_GLFW_WIN32"
-?osx
+?macos
 ModuleInfo "CC_OPTS: -DPLATFORM_DESKTOP"
 ModuleInfo "CC_OPTS: -D_GLFW_COCOA"
 ?linux And Not raspberrypi

lib.mod/raylib/src/rglfw.c

@@ -108,13 +108,13 @@
 #endif
 
 #if defined(__APPLE__)
-    #include "external/glfw/src/cocoa_init.m"
-    #include "external/glfw/src/cocoa_joystick.m"
-    #include "external/glfw/src/cocoa_monitor.m"
-    #include "external/glfw/src/cocoa_window.m"
+//    #include "external/glfw/src/cocoa_init.m"
+//    #include "external/glfw/src/cocoa_joystick.m"
+//    #include "external/glfw/src/cocoa_monitor.m"
+//    #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/nsgl_context.m"
     #include "external/glfw/src/egl_context.c"
     #include "external/glfw/src/osmesa_context.c"
 #endif

lib.mod/source.bmx

@@ -33,7 +33,12 @@ Import "raylib/src/text.c"
 Import "raylib/src/utils.c"
 
 ?macos
+Import "raylib/src/external/glfw/src/cocoa_init.m"
+Import "raylib/src/external/glfw/src/cocoa_joystick.m"
+Import "raylib/src/external/glfw/src/cocoa_monitor.m"
 Import "raylib/src/external/glfw/src/cocoa_time.c"
+Import "raylib/src/external/glfw/src/cocoa_window.m"
+Import "raylib/src/external/glfw/src/nsgl_context.m"
 ?
 Import "raylib/src/external/glfw/src/context.c"
 Import "raylib/src/external/glfw/src/egl_context.c"
@@ -44,6 +49,7 @@ Import "raylib/src/external/glfw/src/init.c"
 Import "raylib/src/external/glfw/src/input.c"
 ?linux
 Import "raylib/src/external/glfw/src/linux_joystick.c"
+Import "raylib/src/external/glfw/src/posix_time.c"
 ?
 Import "raylib/src/external/glfw/src/monitor.c"
 'Import "raylib/src/external/glfw/src/null_init.c"
@@ -53,7 +59,6 @@ Import "raylib/src/external/glfw/src/monitor.c"
 'Import "raylib/src/external/glfw/src/osmesa_context.c"
 ?linux Or macos
 Import "raylib/src/external/glfw/src/posix_thread.c"
-Import "raylib/src/external/glfw/src/posix_time.c"
 ?
 Import "raylib/src/external/glfw/src/vulkan.c"
 ?win32