diff options
| author | Joshua Reisenauer <kd7tck@msn.com> | 2016-06-06 15:30:41 -0700 |
|---|---|---|
| committer | Joshua Reisenauer <kd7tck@msn.com> | 2016-06-06 15:30:41 -0700 |
| commit | 76536fe24bb3b51164d4e94aebe8540b5f18f96e (patch) | |
| tree | 4cc7c7f8406c80ef1b8adf7319add2509c31242b /src/Makefile | |
| parent | e3b248545353720090f28a6c4e8a8c8a34bb1269 (diff) | |
| parent | 1bcf500ecac076892c4eac0594b997add6dcac71 (diff) | |
| download | raylib-76536fe24bb3b51164d4e94aebe8540b5f18f96e.tar.gz raylib-76536fe24bb3b51164d4e94aebe8540b5f18f96e.zip | |
Merge remote-tracking branch 'refs/remotes/raysan5/develop' into develop
Diffstat (limited to 'src/Makefile')
| -rw-r--r-- | src/Makefile | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/src/Makefile b/src/Makefile index 244675e2..92e37cfb 100644 --- a/src/Makefile +++ b/src/Makefile @@ -81,14 +81,14 @@ CFLAGS = -O1 -Wall -std=gnu99 -fgnu89-inline -Wno-missing-braces # define any directories containing required header files ifeq ($(PLATFORM),PLATFORM_RPI) - INCLUDES = -I. -I/opt/vc/include -I/opt/vc/include/interface/vmcs_host/linux -I/opt/vc/include/interface/vcos/pthreads + INCLUDES = -I. -Iexternal -I/opt/vc/include -I/opt/vc/include/interface/vmcs_host/linux -I/opt/vc/include/interface/vcos/pthreads else - INCLUDES = -I. -I../src -# external libraries headers -# GLFW3 - INCLUDES += -I../external/glfw3/include -# OpenAL Soft - INCLUDES += -I../external/openal_soft/include +# STB libraries and others + INCLUDES = -I. -Iexternal +# GLFW3 library + INCLUDES += -Iexternal/glfw3/include +# OpenAL Soft library + INCLUDES += -Iexternal/openal_soft/include endif # define all object files required @@ -101,7 +101,7 @@ endif # typing 'make' will invoke the default target entry called 'all', -# in this case, the 'default' target entry is basic_game +# in this case, the 'default' target entry is raylib all: raylib # compile raylib library @@ -121,10 +121,6 @@ core.o: core.c rlgl.o: rlgl.c $(CC) -c rlgl.c $(CFLAGS) $(INCLUDES) -D$(PLATFORM) -D$(GRAPHICS) -# compile glad module -glad.o: glad.c - $(CC) -c glad.c $(CFLAGS) $(INCLUDES) - # compile shapes module shapes.o: shapes.c $(CC) -c shapes.c $(CFLAGS) $(INCLUDES) -D$(PLATFORM) -D$(GRAPHICS) @@ -145,10 +141,6 @@ models.o: models.c audio.o: audio.c $(CC) -c audio.c $(CFLAGS) $(INCLUDES) -D$(PLATFORM) -# compile stb_vorbis library -stb_vorbis.o: stb_vorbis.c - $(CC) -c stb_vorbis.c -O1 $(INCLUDES) -D$(PLATFORM) - # compile utils module utils.o: utils.c $(CC) -c utils.c $(CFLAGS) $(INCLUDES) -D$(PLATFORM) @@ -161,6 +153,14 @@ camera.o: camera.c gestures.o: gestures.c $(CC) -c gestures.c $(CFLAGS) $(INCLUDES) -D$(PLATFORM) +# compile glad module +glad.o: external/glad.c + $(CC) -c external/glad.c $(CFLAGS) $(INCLUDES) + +# compile stb_vorbis library +stb_vorbis.o: external/stb_vorbis.c + $(CC) -c external/stb_vorbis.c -O1 $(INCLUDES) -D$(PLATFORM) + # clean everything clean: ifeq ($(PLATFORM),PLATFORM_DESKTOP) |