diff options
| author | Ray <raysan5@gmail.com> | 2015-01-10 13:28:45 +0100 |
|---|---|---|
| committer | Ray <raysan5@gmail.com> | 2015-01-10 13:28:45 +0100 |
| commit | cae6f3c613794e5e02233aa1590eb1ea9a8239cd (patch) | |
| tree | 762e1968f407c420021aa43a044c03179b56e0d5 /src | |
| parent | 274921cd353cf64f124bfc9b986bf793c72d4ffa (diff) | |
| parent | bb8c1826d3d3c02cc8e91d6187cd5035a440a6ac (diff) | |
| download | raylib-cae6f3c613794e5e02233aa1590eb1ea9a8239cd.tar.gz raylib-cae6f3c613794e5e02233aa1590eb1ea9a8239cd.zip | |
Merge pull request #16 from raysan5/develop1.2.2-installer
Integration from develop branch to master
Diffstat (limited to 'src')
| -rw-r--r-- | src/makefile | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/src/makefile b/src/makefile index 8566abe4..a726b92e 100644 --- a/src/makefile +++ b/src/makefile @@ -25,18 +25,18 @@ # possible platforms: PLATFORM_DESKTOP PLATFORM_RPI PLATFORM_WEB PLATFORM ?= PLATFORM_DESKTOP -# determine SUBPLATFORM in case PLATFORM_DESKTOP selected +# determine PLATFORM_OS in case PLATFORM_DESKTOP selected ifeq ($(PLATFORM),PLATFORM_DESKTOP) # No uname.exe on MinGW!, but OS=Windows_NT on Windows! ifeq ($(UNAME),Msys) -> Windows ifeq ($(OS),Windows_NT) - SUBPLATFORM=WINDOWS + PLATFORM_OS=WINDOWS else UNAMEOS:=$(shell uname) ifeq ($(UNAMEOS),Linux) - SUBPLATFORM=LINUX + PLATFORM_OS=LINUX else ifeq ($(UNAMEOS),Darwin) - SUBPLATFORM=OSX + PLATFORM_OS=OSX endif endif endif @@ -82,7 +82,14 @@ endif ifeq ($(PLATFORM),PLATFORM_RPI) INCLUDES = -I. -I/opt/vc/include -I/opt/vc/include/interface/vcos/pthreads else - INCLUDES = -I. -I../external/glfw3/include/ -I../external/openal_soft/include/ + INCLUDES = -I. -I../src +# external libraries headers +# GLFW3 + INCLUDES += -I../external/glfw3/include +# GLEW + INCLUDES += -I../external/glew/include +# OpenAL Soft + INCLUDES += -I../external/openal_soft/include endif # define all object files required @@ -144,10 +151,10 @@ stb_vorbis.o: stb_vorbis.c # clean everything clean: ifeq ($(PLATFORM),PLATFORM_DESKTOP) - ifeq ($(SUBPLATFORM),OSX) + ifeq ($(PLATFORM_OS),OSX) rm -f *.o libraylib.a else - ifeq ($(SUBPLATFORM),LINUX) + ifeq ($(PLATFORM_OS),LINUX) find . -type f -executable -delete rm -f *.o libraylib.a else |