1.1 --- a/src/Makefile Thu Mar 21 23:01:09 2024 +0100 1.2 +++ b/src/Makefile Tue Mar 26 20:37:21 2024 +0100 1.3 @@ -27,7 +27,7 @@ 1.4 1.5 BUILD_DIR=../build/lib 1.6 1.7 -SRC = context.c error.c window.c files.c shader.c font.c text.c \ 1.8 +SRC = context.c glcontext.c error.c window.c files.c shader.c font.c text.c \ 1.9 scene.c camera.c primitives.c 1.10 1.11 OBJ = $(SRC:%.c=$(BUILD_DIR)/%.o) 1.12 @@ -46,17 +46,18 @@ 1.13 $(CC) -o $@ $(CFLAGS) -c $< 1.14 1.15 $(BUILD_DIR)/context.o: context.c ascension/context.h \ 1.16 - ascension/datatypes.h ascension/window.h ascension/primitives.h \ 1.17 - ascension/mesh.h ascension/scene.h ascension/transform.h \ 1.18 - ascension/camera.h ascension/font.h ascension/error.h ascension/utils.h \ 1.19 - ascension/shader.h 1.20 + ascension/datatypes.h ascension/window.h ascension/glcontext.h \ 1.21 + ascension/primitives.h ascension/mesh.h ascension/shader.h \ 1.22 + ascension/scene.h ascension/transform.h ascension/camera.h \ 1.23 + ascension/font.h ascension/error.h ascension/utils.h ascension/shader.h 1.24 @echo "Compiling $<" 1.25 $(CC) -o $@ $(CFLAGS) -c $< 1.26 1.27 $(BUILD_DIR)/error.o: error.c ascension/context.h ascension/datatypes.h \ 1.28 - ascension/window.h ascension/primitives.h ascension/mesh.h \ 1.29 - ascension/scene.h ascension/transform.h ascension/camera.h \ 1.30 - ascension/font.h ascension/error.h ascension/utils.h 1.31 + ascension/window.h ascension/glcontext.h ascension/primitives.h \ 1.32 + ascension/mesh.h ascension/shader.h ascension/scene.h \ 1.33 + ascension/transform.h ascension/camera.h ascension/font.h \ 1.34 + ascension/error.h ascension/utils.h 1.35 @echo "Compiling $<" 1.36 $(CC) -o $@ $(CFLAGS) -c $< 1.37 1.38 @@ -65,24 +66,32 @@ 1.39 $(CC) -o $@ $(CFLAGS) -c $< 1.40 1.41 $(BUILD_DIR)/font.o: font.c ascension/font.h ascension/context.h \ 1.42 - ascension/datatypes.h ascension/window.h ascension/primitives.h \ 1.43 - ascension/mesh.h ascension/scene.h ascension/transform.h \ 1.44 - ascension/camera.h ascension/font.h ascension/error.h 1.45 + ascension/datatypes.h ascension/window.h ascension/glcontext.h \ 1.46 + ascension/primitives.h ascension/mesh.h ascension/shader.h \ 1.47 + ascension/scene.h ascension/transform.h ascension/camera.h \ 1.48 + ascension/font.h ascension/error.h 1.49 + @echo "Compiling $<" 1.50 + $(CC) -o $@ $(CFLAGS) -c $< 1.51 + 1.52 +$(BUILD_DIR)/glcontext.o: glcontext.c ascension/glcontext.h \ 1.53 + ascension/primitives.h ascension/mesh.h ascension/shader.h \ 1.54 + ascension/error.h 1.55 @echo "Compiling $<" 1.56 $(CC) -o $@ $(CFLAGS) -c $< 1.57 1.58 $(BUILD_DIR)/primitives.o: primitives.c ascension/primitives.h \ 1.59 ascension/mesh.h ascension/error.h ascension/context.h \ 1.60 - ascension/datatypes.h ascension/window.h ascension/primitives.h \ 1.61 - ascension/scene.h ascension/transform.h ascension/camera.h \ 1.62 - ascension/font.h 1.63 + ascension/datatypes.h ascension/window.h ascension/glcontext.h \ 1.64 + ascension/primitives.h ascension/shader.h ascension/scene.h \ 1.65 + ascension/transform.h ascension/camera.h ascension/font.h 1.66 @echo "Compiling $<" 1.67 $(CC) -o $@ $(CFLAGS) -c $< 1.68 1.69 $(BUILD_DIR)/scene.o: scene.c ascension/scene.h ascension/datatypes.h \ 1.70 ascension/transform.h ascension/camera.h ascension/error.h \ 1.71 - ascension/context.h ascension/window.h ascension/primitives.h \ 1.72 - ascension/mesh.h ascension/scene.h ascension/font.h ascension/shader.h 1.73 + ascension/context.h ascension/window.h ascension/glcontext.h \ 1.74 + ascension/primitives.h ascension/mesh.h ascension/shader.h \ 1.75 + ascension/scene.h ascension/font.h ascension/shader.h 1.76 @echo "Compiling $<" 1.77 $(CC) -o $@ $(CFLAGS) -c $< 1.78 1.79 @@ -94,15 +103,16 @@ 1.80 $(BUILD_DIR)/text.o: text.c ascension/text.h ascension/font.h \ 1.81 ascension/scene.h ascension/datatypes.h ascension/transform.h \ 1.82 ascension/camera.h ascension/context.h ascension/window.h \ 1.83 - ascension/primitives.h ascension/mesh.h ascension/error.h \ 1.84 - ascension/shader.h 1.85 + ascension/glcontext.h ascension/primitives.h ascension/mesh.h \ 1.86 + ascension/shader.h ascension/error.h ascension/shader.h 1.87 @echo "Compiling $<" 1.88 $(CC) -o $@ $(CFLAGS) -c $< 1.89 1.90 $(BUILD_DIR)/window.o: window.c ascension/window.h ascension/datatypes.h \ 1.91 - ascension/primitives.h ascension/mesh.h ascension/scene.h \ 1.92 - ascension/transform.h ascension/camera.h ascension/context.h \ 1.93 - ascension/window.h ascension/font.h ascension/error.h ascension/utils.h 1.94 + ascension/glcontext.h ascension/primitives.h ascension/mesh.h \ 1.95 + ascension/shader.h ascension/scene.h ascension/transform.h \ 1.96 + ascension/camera.h ascension/context.h ascension/window.h \ 1.97 + ascension/font.h ascension/error.h ascension/utils.h 1.98 @echo "Compiling $<" 1.99 $(CC) -o $@ $(CFLAGS) -c $< 1.100