From cffa7693beb5cb1b5b532096e450d6c0852a20f2 Mon Sep 17 00:00:00 2001 From: AnonymusRaccoon Date: Mon, 9 Dec 2019 12:11:10 +0100 Subject: [PATCH] Using xml --- Makefile | 9 +++++++-- include/my.h | 2 ++ lib/gamacon | 2 +- lib/my/my.h | 2 ++ lib/my/my_strchr.c | 17 +++++++++++++++++ lib/xmlparser | 1 + prefabs/background.gcprefab | 31 ++++++++++++------------------- 7 files changed, 42 insertions(+), 22 deletions(-) create mode 100644 lib/my/my_strchr.c create mode 160000 lib/xmlparser diff --git a/Makefile b/Makefile index 607ddea..7b14b6e 100644 --- a/Makefile +++ b/Makefile @@ -11,11 +11,12 @@ SRC = main.c \ OBJ = $(SRC:%.c=%.o) -INCLUDE = -I ./include -I lib/gamacon/include +INCLUDE = -I ./include -I lib/gamacon/include -I lib/gamacon/lib/xmlparser/include CFLAGS = $(INCLUDE) -Wall -Wshadow -Wextra -LDFLAGS = -L lib/gamacon -lgamacon -L lib/my -lmy -lcsfml-system -lcsfml-graphics +LDFLAGS = -L lib/gamacon -L lib/my -L lib/xmlparser \ +-lgamacon -lxmlparser -lmy -lcsfml-system -lcsfml-graphics NAME = my_runner @@ -26,11 +27,13 @@ all: build build: $(OBJ) $(MAKE) -C lib/gamacon $(MAKE) -C lib/my + $(MAKE) -C lib/xmlparser $(CC) -o $(NAME) $(OBJ) $(LDFLAGS) clean: $(MAKE) -C lib/gamacon clean $(MAKE) -C lib/my clean + $(MAKE) -C lib/xmlparser clean $(RM) $(OBJ) fclean: clean @@ -39,6 +42,7 @@ fclean: clean ffclean: fclean $(MAKE) -C lib/my fclean $(MAKE) -C lib/gamacon fclean + $(MAKE) -C lib/xmlparser fclean re: fclean all @@ -46,6 +50,7 @@ dbg: CFLAGS += -g dbg: clean $(OBJ) $(MAKE) -C lib/gamacon dbg $(MAKE) -C lib/my + $(MAKE) -C lib/xmlparser $(CC) -o $(NAME) $(OBJ) $(LDFLAGS) .PHONY: all build clean fclean ffclean \ No newline at end of file diff --git a/include/my.h b/include/my.h index ca519ec..36abdc1 100644 --- a/include/my.h +++ b/include/my.h @@ -8,6 +8,8 @@ int count_valid_queens_placements(int n); +char *my_strchr(const char *str, char c); + int my_compute_power_it(int n, int p); int my_compute_power_rec(int n, int p); diff --git a/lib/gamacon b/lib/gamacon index 83a9b8f..ee89f69 160000 --- a/lib/gamacon +++ b/lib/gamacon @@ -1 +1 @@ -Subproject commit 83a9b8f9ef9d90cb44db0dccd73e700a48bbe69a +Subproject commit ee89f69e7afad1c9288c2d377f784571be5a2fed diff --git a/lib/my/my.h b/lib/my/my.h index ca519ec..36abdc1 100644 --- a/lib/my/my.h +++ b/lib/my/my.h @@ -8,6 +8,8 @@ int count_valid_queens_placements(int n); +char *my_strchr(const char *str, char c); + int my_compute_power_it(int n, int p); int my_compute_power_rec(int n, int p); diff --git a/lib/my/my_strchr.c b/lib/my/my_strchr.c new file mode 100644 index 0000000..8bd6717 --- /dev/null +++ b/lib/my/my_strchr.c @@ -0,0 +1,17 @@ +/* +** EPITECH PROJECT, 2019 +** MUL_my_runner_2019 +** File description: +** my_strchr +*/ + +#include "stddef.h" + +char *my_strchr(char *str, char c) +{ + for (int i = 0; str[i]; i++) { + if (str[i] == c) + return (&str[i]); + } + return (NULL); +} \ No newline at end of file diff --git a/lib/xmlparser b/lib/xmlparser new file mode 160000 index 0000000..48beb9a --- /dev/null +++ b/lib/xmlparser @@ -0,0 +1 @@ +Subproject commit 48beb9a721af65be83008fabbeca08ac5f45b242 diff --git a/prefabs/background.gcprefab b/prefabs/background.gcprefab index 894744d..2fbe97e 100644 --- a/prefabs/background.gcprefab +++ b/prefabs/background.gcprefab @@ -1,19 +1,12 @@ -Entity -0: -PositionComponent 0,0 800 600 -TextureRenderer assets/sprites/bck_layer4.png - -Entity -0: -PositionComponent 0,0 800 600 -TextureRenderer assets/sprites/bck_layer3.png - -Entity -0: -PositionComponent 0,0 800 600 -TextureRenderer assets/sprites/bck_layer2.png - -Entity -0: -PositionComponent 0,0 800 600 -TextureRenderer assets/sprites/bck_layer1.png \ No newline at end of file + + + + + + + + + + + + \ No newline at end of file