Converted GLAD to header only
This commit is contained in:
parent
3d5a408177
commit
058af472ea
12
src/Makefile
12
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)
|
||||
|
7684
src/external/glad.c
vendored
7684
src/external/glad.c
vendored
File diff suppressed because one or more lines are too long
7678
src/external/glad.h
vendored
7678
src/external/glad.h
vendored
File diff suppressed because it is too large
Load Diff
@ -48,7 +48,8 @@
|
||||
#ifdef __APPLE__
|
||||
#include <OpenGL/gl3.h> // OpenGL 3 library for OSX
|
||||
#else
|
||||
#include "external/glad.h" // GLAD library, includes OpenGL headers
|
||||
#define GLAD_IMPLEMENTATION
|
||||
#include "external/glad.h" // GLAD extensions loading library, includes OpenGL headers
|
||||
#endif
|
||||
#endif
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user