[General] macos bindings

raylib-sys/build.rs

@@ -127,9 +127,10 @@ fn gen_bindings() {
 fn gen_rgui() {
     // Compile the code and link with cc crate
     cc::Build::new()
-        .file("rgui_wrapper.cpp")
+        .file("rgui_wrapper.c")
         .include(".")
         .warnings(false)
+        // .flag("-std=c99")
         .extra_warnings(false)
         .compile("rgui");
 }

raylib-sys/rgui_wrapper.c

@@ -0,0 +1,11 @@
+#include "raylib.h"
+#define RLIGHTS_IMPLEMENTATION
+#define RICONS_IMPLEMENTATION
+#define RAYGUI_IMPLEMENTATION
+#define RAYGUI_SUPPORT_ICONS
+#define RLGL_IMPLEMENTATION
+#define RLGL_SUPPORT_TRACELOG
+// #include "rlgl.h" // Don't include rlgl since it's in raylib
+#include "raygui.h"
+#undef RAYGUI_IMPLEMENTATION
+#include "rlights.h"

raylib-sys/rgui_wrapper.h

@@ -4,6 +4,8 @@
 #define RAYGUI_SUPPORT_ICONS
 #define RLGL_IMPLEMENTATION
 #define RLGL_SUPPORT_TRACELOG
-#include "rlgl.h"
+#ifndef __APPLE__
+    #include "rlgl.h"
+#endif
 #include "raygui.h"
 #include "rlights.h"

raylib-sys/src/lib.rs

@@ -2,3 +2,6 @@
 #![allow(non_camel_case_types)]
 #![allow(non_snake_case)]
 include!(concat!(env!("OUT_DIR"), "/bindings.rs"));
+
+#[cfg(target_os = "macos")]
+pub const MAX_MATERIAL_MAPS: u32 = 12;

showcase/src/example/controls_test_suite/controls_test_suite.rs

@@ -7,10 +7,12 @@ use std::ffi::CString;
 pub fn run(rl: &mut RaylibHandle, thread: &RaylibThread) {
     // Initialization
     //---------------------------------------------------------------------------------------
-    let screenWidth = 690;
-    let screenHeight = 560;
-
-    rl.set_window_size(screenWidth, screenHeight);
+    #[cfg(not(target_os = "macos"))] { // Macos has issues with high DPI
+        let screenWidth = 690;
+        let screenHeight = 560;
+
+        rl.set_window_size(screenWidth, screenHeight);
+    }
 
     // GUI controls initialization
     //----------------------------------------------------------------------------------

showcase/src/example/others/mod.rs

@@ -1 +1,3 @@
+#[cfg(not(target_os = "macos"))]
 pub mod rlgl_standalone;
+

showcase/src/main.rs

@@ -14,8 +14,8 @@ fn main() {
 
     rl.set_exit_key(None);
     // example::others::rlgl_standalone::run(&mut rl, &thread);
-    // example::controls_test_suite::controls_test_suite::run(&mut rl, &thread);
-    example::models::models_material_pbr::run(&mut rl, &thread);
+    example::controls_test_suite::controls_test_suite::run(&mut rl, &thread);
+    // example::models::models_material_pbr::run(&mut rl, &thread);
 
     // let samples = &[example::core::core_2d_camera::run];
     // let mut sample = None;