diff --git a/components/render/mac/renderEffect.swift b/components/render/mac/renderEffect.swift index 4f7b306..b246dcf 100644 --- a/components/render/mac/renderEffect.swift +++ b/components/render/mac/renderEffect.swift @@ -17,7 +17,7 @@ func renderInit(_ vm: RenderVM) { vm.glView.openGLContext?.setValues(&swapInterval, for: .swapInterval) // Load OpenGL extensions - rlLoadExtensions((void *)raybriGLLoader); + rlLoadExtensions(unsafeBitCast(raybriGLLoader as @convention(c) (UnsafePointer?) -> UnsafeMutableRawPointer?, to: UnsafeMutableRawPointer.self)) raybriInit() } diff --git a/ogs-blue/ver-mac/Package.swift b/ogs-blue/ver-mac/Package.swift index 8ea77e5..8c03e0b 100644 --- a/ogs-blue/ver-mac/Package.swift +++ b/ogs-blue/ver-mac/Package.swift @@ -12,9 +12,11 @@ let package = Package( targets: [ .target( name: "RaylibBridge", - path: "src/raybri", - publicHeadersPath: ".", + path: "src", + sources: ["Blue.c"], + publicHeadersPath: "raybri", cSettings: [ + .headerSearchPath("raybri"), .unsafeFlags(["-I", "\(raylibPrefix)/include"]) ] ), @@ -22,9 +24,9 @@ let package = Package( name: "ogs-blue", dependencies: ["RaylibBridge"], path: "src", - exclude: ["raybri"], + exclude: ["raybri", "Blue.c"], swiftSettings: [ - .unsafeFlags(["-Xcc", "-DGL_SILENCE_DEPRECATION"]) + .unsafeFlags(["-Xcc", "-DGL_SILENCE_DEPRECATION", "-Xcc", "-I\(raylibPrefix)/include"]) ], linkerSettings: [ .unsafeFlags([ diff --git a/ogs-blue/ver-mac/src/Blue.c b/ogs-blue/ver-mac/src/Blue.c index d0e9f07..2797ded 100644 --- a/ogs-blue/ver-mac/src/Blue.c +++ b/ogs-blue/ver-mac/src/Blue.c @@ -6,6 +6,3 @@ #define RAYBRI_IMPLEMENTATION #include "raybri.h" - -#define RLGL_IMPLEMENTATION -#include "rlgl.h" diff --git a/ogs-blue/ver-mac/src/raybri/Blue.h b/ogs-blue/ver-mac/src/raybri/Blue.h new file mode 100644 index 0000000..8508c9c --- /dev/null +++ b/ogs-blue/ver-mac/src/raybri/Blue.h @@ -0,0 +1,8 @@ +#ifndef BLUE_H +#define BLUE_H + +#include "raybri.h" +#include "raybriAux.h" +#include "rlgl.h" + +#endif // BLUE_H