UnrealXR/raylib
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #149 from raysan5/master

Browse source 
Merge OSX changes into develop branch
This commit is contained in:
Ray 2016-07-22 18:31:36 +02:00 • committed by GitHub
commit ab5d1df7cb
5 changed files with 24 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

0
release/osx/helpme!
View file

BIN
release/osx/libraylib.a Normal file
View file

Binary file not shown.

12
src/Makefile
View file

@ -169,15 +169,15 @@ endif
# compile core module
core.o : core.c raylib.h rlgl.h utils.h raymath.h
$(CC) -c $< $(CFLAGS) $(INCLUDE) -D$(PLATFORM)
$(CC) -c $< $(CFLAGS) $(INCLUDES) -D$(PLATFORM)
# compile rlgl module
rlgl.o : rlgl.c rlgl.h raymath.h
$(CC) -c $< $(CFLAGS) $(INCLUDE) -D$(GRAPHICS)
$(CC) -c $< $(CFLAGS) $(INCLUDES) -D$(GRAPHICS)
# compile shapes module
shapes.o : shapes.c raylib.h rlgl.h
$(CC) -c $< $(CFLAGS) $(INCLUDE)
$(CC) -c $< $(CFLAGS) $(INCLUDES)
# compile textures module
textures.o : textures.c rlgl.h utils.h
@ -185,11 +185,11 @@ textures.o : textures.c rlgl.h utils.h
# compile text module
text.o : text.c raylib.h utils.h
$(CC) -c $< $(CFLAGS) $(INCLUDE)
$(CC) -c $< $(CFLAGS) $(INCLUDES)
# compile models module
models.o : models.c raylib.h rlgl.h raymath.h
$(CC) -c $< $(CFLAGS) $(INCLUDE) -D$(PLATFORM)
$(CC) -c $< $(CFLAGS) $(INCLUDES) -D$(PLATFORM)
# compile audio module
audio.o : audio.c raylib.h
@ -209,7 +209,7 @@ camera.o : camera.c raylib.h
#compile gestures module
gestures.o : gestures.c raylib.h
$(CC) -c $< $(CFLAGS) $(INCLUDE)
$(CC) -c $< $(CFLAGS) $(INCLUDES)
# It installs generated and needed files to compile projects using raylib.
# The installation works manually.

4
src/raylib.h
View file

@ -268,10 +268,14 @@
//----------------------------------------------------------------------------------
#ifndef __cplusplus
// Boolean type
#ifndef __APPLE__
#if !defined(_STDBOOL_H)
typedef enum { false, true } bool;
#define _STDBOOL_H
#endif
#else
#include <stdbool.h>
#endif
#endif
// byte type

6
src/rlgl.c
View file

@ -1275,15 +1275,21 @@ void rlglLoadExtensions(void *loader)
{
#if defined(GRAPHICS_API_OPENGL_21) || defined(GRAPHICS_API_OPENGL_33)
// NOTE: glad is generated and contains only required OpenGL 3.3 Core extensions (and lower versions)
#ifndef __APPLE__
if (!gladLoadGLLoader((GLADloadproc)loader)) TraceLog(WARNING, "GLAD: Cannot load OpenGL extensions");
else TraceLog(INFO, "GLAD: OpenGL extensions loaded successfully");
#endif
#if defined(GRAPHICS_API_OPENGL_21)
#ifndef __APPLE__
if (GLAD_GL_VERSION_2_1) TraceLog(INFO, "OpenGL 2.1 profile supported");
#endif
#elif defined(GRAPHICS_API_OPENGL_33)
#ifndef __APPLE__
if(GLAD_GL_VERSION_3_3) TraceLog(INFO, "OpenGL 3.3 Core profile supported");
else TraceLog(ERROR, "OpenGL 3.3 Core profile not supported");
#endif
#endif
// With GLAD, we can check if an extension is supported using the GLAD_GL_xxx booleans
//if (GLAD_GL_ARB_vertex_array_object) // Use GL_ARB_vertex_array_object