diff options
| author | raysan5 <raysan5@gmail.com> | 2015-08-27 16:32:06 +0200 |
|---|---|---|
| committer | raysan5 <raysan5@gmail.com> | 2015-08-27 16:32:06 +0200 |
| commit | 3a9ed0e8462570e30d92e2aa8c0ff3cf655ef863 (patch) | |
| tree | 9e2593de39f6daab0dc283837e325937cbf41f1c /src/makefile | |
| parent | 8b3a82688e82922819d24494c08e24570c03bdc4 (diff) | |
| parent | 997170a317bb8077cb96d3fc757c6cde0c0ea466 (diff) | |
| download | raylib-3a9ed0e8462570e30d92e2aa8c0ff3cf655ef863.tar.gz raylib-3a9ed0e8462570e30d92e2aa8c0ff3cf655ef863.zip | |
Merged master fixed conflict.
Diffstat (limited to 'src/makefile')
| -rw-r--r-- | src/makefile | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/makefile b/src/makefile index 11bbea9d..67123a9a 100644 --- a/src/makefile +++ b/src/makefile @@ -93,7 +93,7 @@ else endif # define all object files required -OBJS = core.o rlgl.o raymath.o shapes.o text.o textures.o models.o audio.o utils.o camera.o gestures.o +OBJS = core.o rlgl.o raymath.o shapes.o text.o textures.o models.o audio.o utils.o camera.o gestures.o stb_vorbis.o # typing 'make' will invoke the first target entry in the file, # in this case, the 'default' target entry is raylib @@ -139,6 +139,10 @@ models.o: models.c # compile audio module 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 |