Mercurial > hg > ascension / file diff

--- a/src/Makefile	Sat Jul 12 21:49:12 2025 +0200
+++ b/src/Makefile	Sat Jul 12 22:06:24 2025 +0200
@@ -48,39 +48,36 @@
  ascension/datatypes.h ascension/transform.h ascension/mesh.h \
  ascension/constants.h ascension/context.h ascension/window.h \
  ascension/glcontext.h ascension/scene.h ascension/camera.h \
- ascension/input.h ascension/ui/font.h ascension/error.h \
- ascension/shader.h
+ ascension/input.h ascension/font.h ascension/error.h ascension/shader.h
 	@echo "Compiling $<"
 	$(CC) -o $@ $(CFLAGS) -c $<
 
 $(BUILD_DIR)/behavior.o: behavior.c ascension/behavior.h \
  ascension/scene_node.h ascension/datatypes.h ascension/transform.h \
  ascension/context.h ascension/window.h ascension/glcontext.h \
- ascension/scene.h ascension/camera.h ascension/input.h \
- ascension/ui/font.h ascension/scene.h ascension/util.h ascension/error.h
+ ascension/scene.h ascension/camera.h ascension/input.h ascension/font.h \
+ ascension/scene.h ascension/util.h ascension/error.h
 	@echo "Compiling $<"
 	$(CC) -o $@ $(CFLAGS) -c $<
 
 $(BUILD_DIR)/camera.o: camera.c ascension/error.h ascension/context.h \
  ascension/datatypes.h ascension/window.h ascension/glcontext.h \
  ascension/scene.h ascension/scene_node.h ascension/transform.h \
- ascension/camera.h ascension/input.h ascension/ui/font.h \
- ascension/camera.h
+ ascension/camera.h ascension/input.h ascension/font.h ascension/camera.h
 	@echo "Compiling $<"
 	$(CC) -o $@ $(CFLAGS) -c $<
 
 $(BUILD_DIR)/context.o: context.c ascension/context.h \
  ascension/datatypes.h ascension/window.h ascension/glcontext.h \
  ascension/scene.h ascension/scene_node.h ascension/transform.h \
- ascension/camera.h ascension/input.h ascension/ui/font.h \
- ascension/error.h
+ ascension/camera.h ascension/input.h ascension/font.h ascension/error.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/scene.h \
  ascension/scene_node.h ascension/transform.h ascension/camera.h \
- ascension/input.h ascension/ui/font.h ascension/error.h
+ ascension/input.h ascension/font.h ascension/error.h
 	@echo "Compiling $<"
 	$(CC) -o $@ $(CFLAGS) -c $<
 
@@ -91,8 +88,8 @@
 $(BUILD_DIR)/font.o: font.c ascension/error.h ascension/context.h \
  ascension/datatypes.h ascension/window.h ascension/glcontext.h \
  ascension/scene.h ascension/scene_node.h ascension/transform.h \
- ascension/camera.h ascension/input.h ascension/ui/font.h \
- ascension/filesystem.h ascension/ui/font.h
+ ascension/camera.h ascension/input.h ascension/font.h \
+ ascension/filesystem.h ascension/font.h
 	@echo "Compiling $<"
 	$(CC) -o $@ $(CFLAGS) -c $<
 
@@ -110,8 +107,8 @@
 $(BUILD_DIR)/scene.o: scene.c ascension/error.h ascension/context.h \
  ascension/datatypes.h ascension/window.h ascension/glcontext.h \
  ascension/scene.h ascension/scene_node.h ascension/transform.h \
- ascension/camera.h ascension/input.h ascension/ui/font.h \
- ascension/scene.h ascension/behavior.h ascension/shader.h
+ ascension/camera.h ascension/input.h ascension/font.h ascension/scene.h \
+ ascension/behavior.h ascension/shader.h
 	@echo "Compiling $<"
 	$(CC) -o $@ $(CFLAGS) -c $<
 
@@ -119,14 +116,14 @@
  ascension/datatypes.h ascension/transform.h ascension/context.h \
  ascension/window.h ascension/glcontext.h ascension/scene.h \
  ascension/scene_node.h ascension/camera.h ascension/input.h \
- ascension/ui/font.h ascension/error.h
+ ascension/font.h ascension/error.h
 	@echo "Compiling $<"
 	$(CC) -o $@ $(CFLAGS) -c $<
 
 $(BUILD_DIR)/shader.o: shader.c ascension/shader.h ascension/camera.h \
  ascension/datatypes.h ascension/context.h ascension/window.h \
  ascension/glcontext.h ascension/scene.h ascension/scene_node.h \
- ascension/transform.h ascension/input.h ascension/ui/font.h \
+ ascension/transform.h ascension/input.h ascension/font.h \
  ascension/error.h ascension/filesystem.h
 	@echo "Compiling $<"
 	$(CC) -o $@ $(CFLAGS) -c $<
@@ -135,38 +132,34 @@
  ascension/datatypes.h ascension/transform.h ascension/mesh.h \
  ascension/texture.h ascension/camera.h ascension/context.h \
  ascension/window.h ascension/glcontext.h ascension/scene.h \
- ascension/input.h ascension/ui/font.h ascension/glcontext.h \
+ ascension/input.h ascension/font.h ascension/glcontext.h \
  ascension/error.h ascension/mesh.h ascension/shader.h \
  ascension/constants.h
 	@echo "Compiling $<"
 	$(CC) -o $@ $(CFLAGS) -c $<
 
-$(BUILD_DIR)/text.o: text.c ascension/ui/text.h ascension/ui/font.h \
- ascension/ui/../mesh.h ascension/ui/../datatypes.h \
- ascension/ui/../texture.h ascension/ui/../scene_node.h \
- ascension/ui/../transform.h ascension/error.h ascension/context.h \
- ascension/datatypes.h ascension/window.h ascension/glcontext.h \
- ascension/scene.h ascension/scene_node.h ascension/camera.h \
- ascension/input.h ascension/ui/font.h ascension/shader.h \
- ascension/constants.h
+$(BUILD_DIR)/text.o: text.c ascension/text.h ascension/font.h \
+ ascension/mesh.h ascension/datatypes.h ascension/texture.h \
+ ascension/scene_node.h ascension/transform.h ascension/error.h \
+ ascension/context.h ascension/window.h ascension/glcontext.h \
+ ascension/scene.h ascension/camera.h ascension/input.h \
+ ascension/shader.h ascension/constants.h
 	@echo "Compiling $<"
 	$(CC) -o $@ $(CFLAGS) -c $<
 
 $(BUILD_DIR)/texture.o: texture.c ascension/error.h ascension/context.h \
  ascension/datatypes.h ascension/window.h ascension/glcontext.h \
  ascension/scene.h ascension/scene_node.h ascension/transform.h \
- ascension/camera.h ascension/input.h ascension/ui/font.h \
+ ascension/camera.h ascension/input.h ascension/font.h \
  ascension/texture.h ascension/filesystem.h
 	@echo "Compiling $<"
 	$(CC) -o $@ $(CFLAGS) -c $<
 
-$(BUILD_DIR)/ui.o: ui.c ascension/ui.h ascension/ui/text.h \
- ascension/ui/font.h ascension/ui/../mesh.h ascension/ui/../datatypes.h \
- ascension/ui/../texture.h ascension/ui/../scene_node.h \
- ascension/ui/../transform.h ascension/context.h ascension/datatypes.h \
+$(BUILD_DIR)/ui.o: ui.c ascension/ui.h ascension/text.h ascension/font.h \
+ ascension/mesh.h ascension/datatypes.h ascension/texture.h \
+ ascension/scene_node.h ascension/transform.h ascension/context.h \
  ascension/window.h ascension/glcontext.h ascension/scene.h \
- ascension/scene_node.h ascension/camera.h ascension/input.h \
- ascension/ui/font.h ascension/scene.h
+ ascension/camera.h ascension/input.h ascension/scene.h
 	@echo "Compiling $<"
 	$(CC) -o $@ $(CFLAGS) -c $<
 
@@ -178,7 +171,7 @@
  ascension/datatypes.h ascension/glcontext.h ascension/scene.h \
  ascension/scene_node.h ascension/transform.h ascension/camera.h \
  ascension/context.h ascension/window.h ascension/input.h \
- ascension/ui/font.h
+ ascension/font.h
 	@echo "Compiling $<"
 	$(CC) -o $@ $(CFLAGS) -c $<