Merge remote-tracking branch 'refs/remotes/raysan5/develop' into develop

1 files changed, 10 insertions, 4 deletions

diff --git a/src/makefile b/src/makefile
index 70fbca7c..cab2ced0 100644
--- a/src/makefile
+++ b/src/makefile
@@ -91,7 +91,13 @@ 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 stb_vorbis.o
+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
+
 
 # typing 'make' will invoke the first target entry in the file,
 # in this case, the 'default' target entry is raylib
@@ -114,9 +120,9 @@ core.o: core.c
 rlgl.o: rlgl.c
 	$(CC) -c rlgl.c $(CFLAGS) $(INCLUDES) -D$(PLATFORM) -D$(GRAPHICS)
 
-# compile raymath module
-raymath.o: raymath.c
-	$(CC) -c raymath.c $(CFLAGS) $(INCLUDES)
+# compile glad module
+glad.o: glad.c
+	$(CC) -c glad.c $(CFLAGS) $(INCLUDES)
 
 # compile shapes module
 shapes.o: shapes.c