Integrated ratalaika pull-request

Added first version of OS X compilation support
Some conflicts manually resolved...
This commit is contained in:
raysan5
2015-01-02 10:18:43 +01:00
6 changed files with 40 additions and 8 deletions

View File

@@ -32,14 +32,21 @@
#include <stdlib.h> // Declares malloc() and free() for memory management, rand()
#if defined(GRAPHICS_API_OPENGL_11)
#include <GL/gl.h> // Basic OpenGL include
//#include <OpenGL/gl.h> // Basic OpenGL include (OSX)
#ifdef __APPLE__ // OpenGL include for OSX
#include <OpenGL/gl.h>
#else
#include <GL/gl.h> // Basic OpenGL include
#endif
#endif
#if defined(GRAPHICS_API_OPENGL_33)
#define GLEW_STATIC
#include <GL/glew.h> // Extensions loading lib
//#include "glad.h" // TODO: Other extensions loading lib? --> REVIEW
#ifdef __APPLE__ // OpenGL include for OSX
#include <OpenGL/gl3.h>
#else
#include <GL/glew.h> // Extensions loading lib
//#include "glad.h" // TODO: Other extensions loading lib? --> REVIEW
#endif
#endif
#if defined(GRAPHICS_API_OPENGL_ES2)