diff options
| author | Joshua Reisenauer <kd7tck@msn.com> | 2016-06-07 16:07:57 -0700 |
|---|---|---|
| committer | Joshua Reisenauer <kd7tck@msn.com> | 2016-06-07 16:07:57 -0700 |
| commit | 7bf2854e949a073535109327d18303ee31d0c322 (patch) | |
| tree | c55e9a71cabf53279bf7f384251ca3549f36e6b9 /src/Makefile | |
| parent | f0d8c009ae9bd1d8e7f17f76fe0658b257cf16de (diff) | |
| parent | 79a6235811de391d8ae9d0b90bf39c2160dc7907 (diff) | |
| download | raylib-7bf2854e949a073535109327d18303ee31d0c322.tar.gz raylib-7bf2854e949a073535109327d18303ee31d0c322.zip | |
Merge remote-tracking branch 'refs/remotes/raysan5/develop' into develop
Diffstat (limited to 'src/Makefile')
| -rw-r--r-- | src/Makefile | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/src/Makefile b/src/Makefile index 92e37cfb..ce703c3a 100644 --- a/src/Makefile +++ b/src/Makefile @@ -92,13 +92,7 @@ else endif # define all object files required -ifeq ($(PLATFORM),PLATFORM_DESKTOP) - OBJS = core.o rlgl.o glad.o shapes.o text.o textures.o models.o audio.o utils.o camera.o gestures.o stb_vorbis.o -else - #GLAD only required on desktop platform - OBJS = core.o rlgl.o shapes.o text.o textures.o models.o audio.o stb_vorbis.o utils.o camera.o gestures.o -endif - +OBJS = core.o rlgl.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 default target entry called 'all', # in this case, the 'default' target entry is raylib @@ -153,10 +147,6 @@ 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) |