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

Integrated ratalaika pull-request

Browse source 
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
commit 061ee04cb5
6 changed files with 40 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

25
examples/makefile
View file

@ -66,6 +66,14 @@ else
LFLAGS = -L. -L../src LFLAGS = -L. -L../src
endif endif
# define library paths containing required libs
ifeq ($(PLATFORM),PLATFORM_DESKTOP_OSX)
LFLAGS = -L. -L../src -L../external/glfw3/lib/ -I../external/openal_soft/lib/
else
LFLAGS = -L. -L../src
endif
# define any libraries to link into executable # define any libraries to link into executable
# if you want to link libraries (libname.so or libname.a), use the -lname # if you want to link libraries (libname.so or libname.a), use the -lname
ifeq ($(PLATFORM),PLATFORM_RPI) ifeq ($(PLATFORM),PLATFORM_RPI)
@ -78,15 +86,22 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP_LINUX)
# requires the following packages: # requires the following packages:
# libglfw3-dev libopenal-dev libglew-dev libegl1-mesa-dev # libglfw3-dev libopenal-dev libglew-dev libegl1-mesa-dev
LIBS = -lraylib -lglfw -lGLEW -lGL -lopenal LIBS = -lraylib -lglfw -lGLEW -lGL -lopenal
else
ifeq ($(PLATFORM),PLATFORM_DESKTOP_OSX)
# libraries for OS X 10.9 desktop compiling
# requires the following packages:
# libglfw3-dev libopenal-dev libglew-dev libegl1-mesa-dev
LIBS = -lraylib -lglfw -framework OpenGL -framework OpenAl -framework Cocoa
else
ifeq ($(PLATFORM),PLATFORM_WEB)
LIBS = ../src/libraylib.bc
else else
# libraries for Windows desktop compiling # libraries for Windows desktop compiling
# NOTE: GLFW3 and OpenAL Soft libraries should be installed # NOTE: GLFW3 and OpenAL Soft libraries should be installed
LIBS = -lraylib -lglfw3 -lglew32 -lopengl32 -lopenal32 -lgdi32 LIBS = -lraylib -lglfw3 -lglew32 -lopengl32 -lopenal32 -lgdi32
endif endif
endif endif
endif
ifeq ($(PLATFORM),PLATFORM_WEB)
LIBS = ../src/libraylib.bc
endif endif
# define additional parameters and flags for windows # define additional parameters and flags for windows
@ -273,12 +288,16 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP_LINUX)
find . -type f -executable -delete find . -type f -executable -delete
rm -f *.o rm -f *.o
else else
ifeq ($(PLATFORM),PLATFORM_DESKTOP_OSX)
rm -f *.o
else
ifeq ($(PLATFORM),PLATFORM_WEB) ifeq ($(PLATFORM),PLATFORM_WEB)
del *.o *.html *.js del *.o *.html *.js
else else
del *.o *.exe del *.o *.exe
endif endif
endif endif
endif
endif endif
@echo Cleaning done @echo Cleaning done

BIN
external/glfw3/lib/libglfw.3.0.dylib vendored Executable file
View file

Binary file not shown.

1
external/glfw3/lib/libglfw.3.dylib vendored Symbolic link
View file

@ -0,0 +1 @@
libglfw.3.0.dylib

1
external/glfw3/lib/libglfw.dylib vendored Symbolic link
View file

@ -0,0 +1 @@
libglfw.3.dylib

6
src/makefile
View file

@ -66,7 +66,7 @@ endif
ifeq ($(PLATFORM),PLATFORM_RPI) ifeq ($(PLATFORM),PLATFORM_RPI)
INCLUDES = -I. -I/opt/vc/include -I/opt/vc/include/interface/vcos/pthreads INCLUDES = -I. -I/opt/vc/include -I/opt/vc/include/interface/vcos/pthreads
else else
INCLUDES = -I. INCLUDES = -I. -I../external/glfw3/include/ -I../external/openal_soft/include/
endif endif
# define all object files required # define all object files required
@ -134,12 +134,16 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP_LINUX)
find . -type f -executable -delete find . -type f -executable -delete
rm -f *.o libraylib.a rm -f *.o libraylib.a
else else
ifeq ($(PLATFORM),PLATFORM_DESKTOP_OSX)
rm -f *.o libraylib.a
else
ifeq ($(PLATFORM),PLATFORM_WEB) ifeq ($(PLATFORM),PLATFORM_WEB)
del *.o libraylib.bc del *.o libraylib.bc
else else
del *.o libraylib.a del *.o libraylib.a
endif endif
endif endif
endif
endif endif
@echo Cleaning done @echo Cleaning done

15
src/rlgl.c
View file

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