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
commit 061ee04cb5
6 changed files with 40 additions and 8 deletions

View file

@ -66,6 +66,14 @@ else
LFLAGS = -L. -L../src
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
# if you want to link libraries (libname.so or libname.a), use the -lname
ifeq ($(PLATFORM),PLATFORM_RPI)
@ -78,15 +86,22 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP_LINUX)
# requires the following packages:
# libglfw3-dev libopenal-dev libglew-dev libegl1-mesa-dev
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
# libraries for Windows desktop compiling
# NOTE: GLFW3 and OpenAL Soft libraries should be installed
LIBS = -lraylib -lglfw3 -lglew32 -lopengl32 -lopenal32 -lgdi32
endif
endif
ifeq ($(PLATFORM),PLATFORM_WEB)
LIBS = ../src/libraylib.bc
endif
endif
# define additional parameters and flags for windows
@ -273,12 +288,16 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP_LINUX)
find . -type f -executable -delete
rm -f *.o
else
ifeq ($(PLATFORM),PLATFORM_DESKTOP_OSX)
rm -f *.o
else
ifeq ($(PLATFORM),PLATFORM_WEB)
del *.o *.html *.js
else
del *.o *.exe
endif
endif
endif
endif
@echo Cleaning done