Mercurial > hg > ascension / file diff

--- a/src/Makefile	Thu Apr 24 18:41:42 2025 +0200
+++ b/src/Makefile	Thu Apr 24 19:53:40 2025 +0200
@@ -27,11 +27,11 @@
 
 BUILD_DIR=../build/lib
 
-SRC = context.c glcontext.c error.c filesystem.c window.c \
+SRC = context.c glcontext.c filesystem.c window.c \
 	  shader.c \
 	  mesh.c primitives.c texture.c \
 	  sprite.c \
-	  camera.c scene.c \
+	  camera.c scene.c scene_node.c \
 	  font.c text.c
 
 OBJ = $(SRC:%.c=$(BUILD_DIR)/%.o)
@@ -54,16 +54,7 @@
  ascension/primitives.h ascension/mesh.h ascension/shader.h \
  ascension/texture.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/utils.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/texture.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/utils.h
+ ascension/ui/font.h
 	@echo "Compiling $<"
 	$(CC) -o $@ $(CFLAGS) -c $<
 
@@ -76,26 +67,34 @@
  ascension/mesh.h ascension/shader.h ascension/texture.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/filesystem.h ascension/ui/font.h
+ ascension/filesystem.h ascension/ui/font.h
 	@echo "Compiling $<"
 	$(CC) -o $@ $(CFLAGS) -c $<
 
 $(BUILD_DIR)/glcontext.o: glcontext.c ascension/glcontext.h \
  ascension/primitives.h ascension/mesh.h ascension/shader.h \
- ascension/texture.h ascension/error.h
+ ascension/texture.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
 	@echo "Compiling $<"
 	$(CC) -o $@ $(CFLAGS) -c $<
 
-$(BUILD_DIR)/mesh.o: mesh.c ascension/mesh.h ascension/error.h
+$(BUILD_DIR)/mesh.o: mesh.c ascension/mesh.h ascension/context.h \
+ ascension/datatypes.h ascension/window.h ascension/glcontext.h \
+ ascension/primitives.h ascension/mesh.h ascension/shader.h \
+ ascension/texture.h ascension/scene.h ascension/scene_node.h \
+ ascension/transform.h ascension/camera.h ascension/input.h \
+ ascension/ui/font.h
 	@echo "Compiling $<"
 	$(CC) -o $@ $(CFLAGS) -c $<
 
 $(BUILD_DIR)/primitives.o: primitives.c ascension/primitives.h \
- 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/texture.h \
- ascension/scene.h ascension/scene_node.h ascension/transform.h \
- ascension/camera.h ascension/input.h ascension/ui/font.h
+ ascension/mesh.h ascension/context.h ascension/datatypes.h \
+ ascension/window.h ascension/glcontext.h ascension/primitives.h \
+ ascension/shader.h ascension/texture.h ascension/scene.h \
+ ascension/scene_node.h ascension/transform.h ascension/camera.h \
+ ascension/input.h ascension/ui/font.h
 	@echo "Compiling $<"
 	$(CC) -o $@ $(CFLAGS) -c $<
 
@@ -104,9 +103,17 @@
  ascension/context.h ascension/window.h ascension/glcontext.h \
  ascension/primitives.h ascension/mesh.h ascension/shader.h \
  ascension/texture.h ascension/scene.h ascension/input.h \
- ascension/ui/font.h ascension/utils.h ascension/2d.h \
- ascension/2d/sprite.h ascension/2d/../scene_node.h \
- ascension/2d/../texture.h
+ ascension/ui/font.h ascension/2d.h ascension/2d/sprite.h \
+ ascension/2d/../scene_node.h ascension/2d/../texture.h
+	@echo "Compiling $<"
+	$(CC) -o $@ $(CFLAGS) -c $<
+
+$(BUILD_DIR)/scene_node.o: scene_node.c ascension/scene_node.h \
+ ascension/datatypes.h ascension/transform.h ascension/context.h \
+ ascension/window.h ascension/glcontext.h ascension/primitives.h \
+ ascension/mesh.h ascension/shader.h ascension/texture.h \
+ ascension/scene.h ascension/scene_node.h ascension/camera.h \
+ ascension/input.h ascension/ui/font.h
 	@echo "Compiling $<"
 	$(CC) -o $@ $(CFLAGS) -c $<
 
@@ -115,7 +122,7 @@
  ascension/mesh.h ascension/shader.h ascension/texture.h \
  ascension/scene.h ascension/scene_node.h ascension/transform.h \
  ascension/camera.h ascension/input.h ascension/ui/font.h \
- ascension/shader.h ascension/error.h ascension/filesystem.h
+ ascension/shader.h ascension/filesystem.h
 	@echo "Compiling $<"
 	$(CC) -o $@ $(CFLAGS) -c $<
 
@@ -135,9 +142,8 @@
  ascension/mesh.h ascension/shader.h ascension/texture.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/ui/text.h ascension/ui/font.h \
- ascension/ui/../2d/sprite.h ascension/ui/../2d/../scene_node.h \
- ascension/ui/../2d/../texture.h ascension/ui/../utils.h
+ ascension/ui/text.h ascension/ui/font.h ascension/ui/../2d/sprite.h \
+ ascension/ui/../2d/../scene_node.h ascension/ui/../2d/../texture.h
 	@echo "Compiling $<"
 	$(CC) -o $@ $(CFLAGS) -c $<
 
@@ -146,8 +152,7 @@
  ascension/primitives.h ascension/mesh.h ascension/shader.h \
  ascension/texture.h ascension/scene.h ascension/scene_node.h \
  ascension/transform.h ascension/camera.h ascension/input.h \
- ascension/ui/font.h ascension/texture.h ascension/error.h \
- ascension/filesystem.h
+ ascension/ui/font.h ascension/texture.h ascension/filesystem.h
 	@echo "Compiling $<"
 	$(CC) -o $@ $(CFLAGS) -c $<
 
@@ -156,7 +161,7 @@
  ascension/shader.h ascension/texture.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/error.h ascension/utils.h
+ ascension/ui/font.h
 	@echo "Compiling $<"
 	$(CC) -o $@ $(CFLAGS) -c $<