diff options
| author | raysan5 <raysan5@gmail.com> | 2015-01-02 10:18:43 +0100 |
|---|---|---|
| committer | raysan5 <raysan5@gmail.com> | 2015-01-02 10:18:43 +0100 |
| commit | 061ee04cb524d39d3b4f1bd64b43a65f38ddabef (patch) | |
| tree | 71c1a6a128b6f10fde116d65bbb3216aa5f943e4 /src | |
| parent | 3c4a91658e8586ecb5504d3167796d043e79d065 (diff) | |
| parent | 2706fa86cdb327c2dc4a67729eb263cb486eb18a (diff) | |
| download | raylib-061ee04cb524d39d3b4f1bd64b43a65f38ddabef.tar.gz raylib-061ee04cb524d39d3b4f1bd64b43a65f38ddabef.zip | |
Integrated ratalaika pull-request
Added first version of OS X compilation support
Some conflicts manually resolved...
Diffstat (limited to 'src')
| -rw-r--r-- | src/makefile | 6 | ||||
| -rw-r--r-- | src/rlgl.c | 15 |
2 files changed, 16 insertions, 5 deletions
diff --git a/src/makefile b/src/makefile index 501bd0c9..ed595f64 100644 --- a/src/makefile +++ b/src/makefile @@ -66,7 +66,7 @@ endif ifeq ($(PLATFORM),PLATFORM_RPI) INCLUDES = -I. -I/opt/vc/include -I/opt/vc/include/interface/vcos/pthreads else - INCLUDES = -I. + INCLUDES = -I. -I../external/glfw3/include/ -I../external/openal_soft/include/ endif # define all object files required @@ -134,6 +134,9 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP_LINUX) find . -type f -executable -delete rm -f *.o libraylib.a else +ifeq ($(PLATFORM),PLATFORM_DESKTOP_OSX) + rm -f *.o libraylib.a +else ifeq ($(PLATFORM),PLATFORM_WEB) del *.o libraylib.bc else @@ -141,6 +144,7 @@ else endif endif endif +endif @echo Cleaning done # instead of defining every module one by one, we can define a pattern @@ -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) |