diff -r 44457f6cb0a2 -r 6e5b5ba2752c src/Makefile --- a/src/Makefile Mon Apr 01 18:54:19 2024 +0200 +++ b/src/Makefile Mon Apr 01 19:01:04 2024 +0200 @@ -49,14 +49,15 @@ ascension/datatypes.h ascension/window.h ascension/glcontext.h \ ascension/primitives.h ascension/mesh.h ascension/shader.h \ ascension/scene.h ascension/transform.h ascension/camera.h \ - ascension/font.h ascension/error.h ascension/utils.h ascension/shader.h + ascension/ui/font.h ascension/error.h ascension/utils.h \ + ascension/shader.h @echo "Compiling $<" $(CC) -o $@ $(CFLAGS) -c $< $(BUILD_DIR)/error.o: error.c ascension/context.h ascension/datatypes.h \ ascension/window.h ascension/glcontext.h ascension/primitives.h \ ascension/mesh.h ascension/shader.h ascension/scene.h \ - ascension/transform.h ascension/camera.h ascension/font.h \ + ascension/transform.h ascension/camera.h ascension/ui/font.h \ ascension/error.h ascension/utils.h @echo "Compiling $<" $(CC) -o $@ $(CFLAGS) -c $< @@ -65,11 +66,11 @@ @echo "Compiling $<" $(CC) -o $@ $(CFLAGS) -c $< -$(BUILD_DIR)/font.o: font.c ascension/font.h ascension/context.h \ +$(BUILD_DIR)/font.o: font.c ascension/ui/font.h ascension/context.h \ ascension/datatypes.h ascension/window.h ascension/glcontext.h \ ascension/primitives.h ascension/mesh.h ascension/shader.h \ ascension/scene.h ascension/transform.h ascension/camera.h \ - ascension/font.h ascension/error.h + ascension/ui/font.h ascension/error.h @echo "Compiling $<" $(CC) -o $@ $(CFLAGS) -c $< @@ -83,7 +84,7 @@ ascension/mesh.h ascension/error.h ascension/context.h \ ascension/datatypes.h ascension/window.h ascension/glcontext.h \ ascension/primitives.h ascension/shader.h ascension/scene.h \ - ascension/transform.h ascension/camera.h ascension/font.h + ascension/transform.h ascension/camera.h ascension/ui/font.h @echo "Compiling $<" $(CC) -o $@ $(CFLAGS) -c $< @@ -91,7 +92,7 @@ ascension/transform.h ascension/camera.h ascension/error.h \ ascension/context.h ascension/window.h ascension/glcontext.h \ ascension/primitives.h ascension/mesh.h ascension/shader.h \ - ascension/scene.h ascension/font.h ascension/shader.h + ascension/scene.h ascension/ui/font.h ascension/shader.h @echo "Compiling $<" $(CC) -o $@ $(CFLAGS) -c $< @@ -100,11 +101,13 @@ @echo "Compiling $<" $(CC) -o $@ $(CFLAGS) -c $< -$(BUILD_DIR)/text.o: text.c ascension/text.h ascension/font.h \ - ascension/scene.h ascension/datatypes.h ascension/transform.h \ - ascension/camera.h ascension/context.h ascension/window.h \ - ascension/glcontext.h ascension/primitives.h ascension/mesh.h \ - ascension/shader.h ascension/error.h ascension/shader.h +$(BUILD_DIR)/text.o: text.c ascension/ui/text.h ascension/ui/font.h \ + ascension/ui/../scene.h ascension/ui/../datatypes.h \ + ascension/ui/../transform.h ascension/ui/../camera.h ascension/context.h \ + ascension/datatypes.h ascension/window.h ascension/glcontext.h \ + ascension/primitives.h ascension/mesh.h ascension/shader.h \ + ascension/scene.h ascension/ui/font.h ascension/error.h \ + ascension/shader.h @echo "Compiling $<" $(CC) -o $@ $(CFLAGS) -c $< @@ -112,7 +115,7 @@ ascension/glcontext.h ascension/primitives.h ascension/mesh.h \ ascension/shader.h ascension/scene.h ascension/transform.h \ ascension/camera.h ascension/context.h ascension/window.h \ - ascension/font.h ascension/error.h ascension/utils.h + ascension/ui/font.h ascension/error.h ascension/utils.h @echo "Compiling $<" $(CC) -o $@ $(CFLAGS) -c $<