diff -r 84a546e282b7 -r 4e1e698f4b0d src/Makefile --- a/src/Makefile Fri Apr 18 20:13:01 2025 +0200 +++ b/src/Makefile Sat Apr 19 11:42:53 2025 +0200 @@ -27,8 +27,11 @@ BUILD_DIR=../build/lib -SRC = context.c glcontext.c error.c window.c shader.c font.c text.c \ - texture.c scene.c camera.c primitives.c mesh.c +SRC = context.c glcontext.c error.c window.c shader.c \ + mesh.c primitives.c texture.c \ + sprite.c \ + camera.c scene.c \ + font.c text.c OBJ = $(SRC:%.c=$(BUILD_DIR)/%.o) @@ -48,8 +51,8 @@ $(BUILD_DIR)/context.o: context.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/texture.h ascension/input.h ascension/ui/font.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 $< @@ -57,7 +60,7 @@ $(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/texture.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 $<" @@ -66,8 +69,8 @@ $(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/texture.h ascension/input.h ascension/ui/font.h \ + ascension/scene.h ascension/scene_node.h ascension/transform.h \ + ascension/camera.h ascension/input.h ascension/ui/font.h \ ascension/error.h @echo "Compiling $<" $(CC) -o $@ $(CFLAGS) -c $< @@ -86,17 +89,18 @@ 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/texture.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)/scene.o: scene.c ascension/scene.h ascension/datatypes.h \ - ascension/transform.h ascension/camera.h ascension/texture.h \ + ascension/scene_node.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/scene.h ascension/input.h ascension/ui/font.h \ - ascension/utils.h ascension/shader.h + ascension/utils.h ascension/2d.h ascension/2d/sprite.h \ + ascension/2d/../scene_node.h ascension/2d/../texture.h @echo "Compiling $<" $(CC) -o $@ $(CFLAGS) -c $< @@ -104,14 +108,25 @@ @echo "Compiling $<" $(CC) -o $@ $(CFLAGS) -c $< -$(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/ui/../texture.h ascension/ui/../utils.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/input.h ascension/ui/font.h \ - ascension/error.h ascension/shader.h +$(BUILD_DIR)/sprite.o: sprite.c ascension/2d/sprite.h \ + ascension/2d/../scene_node.h ascension/2d/../datatypes.h \ + ascension/2d/../transform.h ascension/2d/../texture.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/scene_node.h \ + ascension/camera.h ascension/input.h ascension/ui/font.h \ + ascension/glcontext.h + @echo "Compiling $<" + $(CC) -o $@ $(CFLAGS) -c $< + +$(BUILD_DIR)/text.o: text.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/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 @echo "Compiling $<" $(CC) -o $@ $(CFLAGS) -c $< @@ -121,8 +136,8 @@ $(BUILD_DIR)/window.o: window.c ascension/window.h ascension/datatypes.h \ ascension/glcontext.h ascension/primitives.h ascension/mesh.h \ - ascension/shader.h ascension/scene.h ascension/transform.h \ - ascension/camera.h ascension/texture.h ascension/context.h \ + ascension/shader.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 @echo "Compiling $<"