From 284f9bea71a2e7fe0caf9906e7d2afa38201c9d4 Mon Sep 17 00:00:00 2001 From: boutarci Date: Thu, 21 Dec 2023 21:45:49 +0100 Subject: [PATCH] =?UTF-8?q?Makefile=20Op=C3=A9rationnel=20+=20d=C3=A9range?= =?UTF-8?q?ment=20des=20fichiers?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SAE_semestre1/Makefile | 23 +++++++++++++---------- SAE_semestre1/{src => }/Oeuf.c | 4 ++-- SAE_semestre1/{fichier.h => }/Oeuf.h | 0 SAE_semestre1/{fichier.h => }/fonctions.h | 0 SAE_semestre1/{src => }/game.c | 0 SAE_semestre1/{src => }/main.c | 11 +++++------ SAE_semestre1/{fichier.h => }/main.h | 2 +- SAE_semestre1/{src => }/menu.c | 4 ++-- SAE_semestre1/{fichier.h => }/menu.h | 0 SAE_semestre1/{src => }/serpent.c | 2 +- SAE_semestre1/{fichier.h => }/serpent.h | 0 SAE_semestre1/{src => }/terrain.c | 10 +++++----- SAE_semestre1/{fichier.h => }/terrain.h | 0 SAE_semestre1/{src => }/time.c | 6 +++--- SAE_semestre1/{fichier.h => }/time.h | 0 15 files changed, 32 insertions(+), 30 deletions(-) rename SAE_semestre1/{src => }/Oeuf.c (92%) rename SAE_semestre1/{fichier.h => }/Oeuf.h (100%) rename SAE_semestre1/{fichier.h => }/fonctions.h (100%) rename SAE_semestre1/{src => }/game.c (100%) rename SAE_semestre1/{src => }/main.c (92%) rename SAE_semestre1/{fichier.h => }/main.h (71%) rename SAE_semestre1/{src => }/menu.c (95%) rename SAE_semestre1/{fichier.h => }/menu.h (100%) rename SAE_semestre1/{src => }/serpent.c (99%) rename SAE_semestre1/{fichier.h => }/serpent.h (100%) rename SAE_semestre1/{src => }/terrain.c (78%) rename SAE_semestre1/{fichier.h => }/terrain.h (100%) rename SAE_semestre1/{src => }/time.c (93%) rename SAE_semestre1/{fichier.h => }/time.h (100%) diff --git a/SAE_semestre1/Makefile b/SAE_semestre1/Makefile index eec7a62..09b5ca8 100755 --- a/SAE_semestre1/Makefile +++ b/SAE_semestre1/Makefile @@ -1,26 +1,29 @@ CC = gcc CFLAGS = -ansi -pedantic -lgraph -OBJS = main.o serpent.o time.o terrain.o pastille.o +OBJS = main.o serpent.o time.o terrain.o Oeuf.o -serpent: $(OBJS) - $(CC) -o serpent $(OBJS) $(CFLAGS) +snake: $(OBJS) + $(CC) -o snake $(OBJS) $(CFLAGS) -main.o: serpent.h time.h pastille.h main.h +main.o: serpent.h time.h Oeuf.h main.h menu.h $(CC) -c main.c $(CFLAGS) serpent.o: serpent.h $(CC) -c serpent.c $(CFLAGS) -timer.o: timer.h serpent.h main.h - $(CC) -c timer.c $(CFLAGS) +menu.o: main.h time.h + $(CC) -c menu.c $(CFLAGS) -pastille.o: pastille.h serpent.h - $(CC) -c pastille.c $(CFLAGS) +time.o: time.h serpent.h main.h + $(CC) -c time.c $(CFLAGS) -terrain.o: terrain.h serpent.h time.h main.h pastille.h +Oeuf.o: Oeuf.h time.h + $(CC) -c Oeuf.c $(CFLAGS) + +terrain.o: terrain.h serpent.h time.h main.h Oeuf.h $(CC) -c terrain.c $(CFLAGS) clean: - rm -f *.0 serpent \ No newline at end of file + rm -f *.o snake \ No newline at end of file diff --git a/SAE_semestre1/src/Oeuf.c b/SAE_semestre1/Oeuf.c similarity index 92% rename from SAE_semestre1/src/Oeuf.c rename to SAE_semestre1/Oeuf.c index be5e275..5709d73 100755 --- a/SAE_semestre1/src/Oeuf.c +++ b/SAE_semestre1/Oeuf.c @@ -1,7 +1,7 @@ #include #include -#include "../fichier.h/Oeuf.h" -#include "../fichier.h/time.h" +#include "Oeuf.h" +#include "time.h" void InitialiserOeufs(int oeufx[], int oeufy[], int segment) { int p; diff --git a/SAE_semestre1/fichier.h/Oeuf.h b/SAE_semestre1/Oeuf.h similarity index 100% rename from SAE_semestre1/fichier.h/Oeuf.h rename to SAE_semestre1/Oeuf.h diff --git a/SAE_semestre1/fichier.h/fonctions.h b/SAE_semestre1/fonctions.h similarity index 100% rename from SAE_semestre1/fichier.h/fonctions.h rename to SAE_semestre1/fonctions.h diff --git a/SAE_semestre1/src/game.c b/SAE_semestre1/game.c similarity index 100% rename from SAE_semestre1/src/game.c rename to SAE_semestre1/game.c diff --git a/SAE_semestre1/src/main.c b/SAE_semestre1/main.c similarity index 92% rename from SAE_semestre1/src/main.c rename to SAE_semestre1/main.c index 6e46aaa..c45fc7b 100644 --- a/SAE_semestre1/src/main.c +++ b/SAE_semestre1/main.c @@ -1,12 +1,11 @@ #include #include #include -#include "../fichier.h/serpent.h" -#include "../fichier.h/Oeuf.h" -#include "../fichier.h/time.h" -#include "../fichier.h/main.h" -#include "../fichier.h/menu.h" - +#include "serpent.h" +#include "Oeuf.h" +#include "time.h" +#include "main.h" +#include "menu.h" #define CYCLE 100000L int lancer_jeu(){ diff --git a/SAE_semestre1/fichier.h/main.h b/SAE_semestre1/main.h similarity index 71% rename from SAE_semestre1/fichier.h/main.h rename to SAE_semestre1/main.h index 0c85dc3..bd08be7 100755 --- a/SAE_semestre1/fichier.h/main.h +++ b/SAE_semestre1/main.h @@ -1,7 +1,7 @@ #ifndef MAIN_H #define MAIN_H -int jeu(void); +int lancer_jeu(void); int main(void); #endif \ No newline at end of file diff --git a/SAE_semestre1/src/menu.c b/SAE_semestre1/menu.c similarity index 95% rename from SAE_semestre1/src/menu.c rename to SAE_semestre1/menu.c index 5f4e13f..ccfcceb 100755 --- a/SAE_semestre1/src/menu.c +++ b/SAE_semestre1/menu.c @@ -1,8 +1,8 @@ #include #include #include -#include "../fichier.h/main.h" -#include "../fichier.h/time.h" +#include "main.h" +#include "time.h" void Menu_debut(void) { int af = ChargerSprite("../img/image.jpg"); AfficherSprite(af, 0, 0); diff --git a/SAE_semestre1/fichier.h/menu.h b/SAE_semestre1/menu.h similarity index 100% rename from SAE_semestre1/fichier.h/menu.h rename to SAE_semestre1/menu.h diff --git a/SAE_semestre1/src/serpent.c b/SAE_semestre1/serpent.c similarity index 99% rename from SAE_semestre1/src/serpent.c rename to SAE_semestre1/serpent.c index 6e8b235..5dbe8a5 100755 --- a/SAE_semestre1/src/serpent.c +++ b/SAE_semestre1/serpent.c @@ -1,5 +1,5 @@ #include -#include "../fichier.h/serpent.h" +#include "serpent.h" void Update_Serpent(int pos_x[], int pos_y[], int segment, int old_x[], int old_y[], int* direction){ int i = 0; diff --git a/SAE_semestre1/fichier.h/serpent.h b/SAE_semestre1/serpent.h similarity index 100% rename from SAE_semestre1/fichier.h/serpent.h rename to SAE_semestre1/serpent.h diff --git a/SAE_semestre1/src/terrain.c b/SAE_semestre1/terrain.c similarity index 78% rename from SAE_semestre1/src/terrain.c rename to SAE_semestre1/terrain.c index 19d84a4..1c89988 100755 --- a/SAE_semestre1/src/terrain.c +++ b/SAE_semestre1/terrain.c @@ -1,10 +1,10 @@ #include #include -#include "../fichier.h/time.h" -#include "../fichier.h/terrain.h" -#include "../fichier.h/serpent.h" -#include "../fichier.h/main.h" -#include "../fichier.h/Oeuf.h" +#include "time.h" +#include "terrain.h" +#include "serpent.h" +#include "main.h" +#include "Oeuf.h" void DessinerScene(int murx[], int mury[], int minute, int seconde, char timer []){ int mur; diff --git a/SAE_semestre1/fichier.h/terrain.h b/SAE_semestre1/terrain.h similarity index 100% rename from SAE_semestre1/fichier.h/terrain.h rename to SAE_semestre1/terrain.h diff --git a/SAE_semestre1/src/time.c b/SAE_semestre1/time.c similarity index 93% rename from SAE_semestre1/src/time.c rename to SAE_semestre1/time.c index e8a1521..9378e0f 100755 --- a/SAE_semestre1/src/time.c +++ b/SAE_semestre1/time.c @@ -1,9 +1,9 @@ #include #include #include -#include "../fichier.h/time.h" -#include "../fichier.h/main.h" -#include "../fichier.h/serpent.h" +#include "time.h" +#include "main.h" +#include "serpent.h" #define CYCLE 100000L void Score(int segment){ diff --git a/SAE_semestre1/fichier.h/time.h b/SAE_semestre1/time.h similarity index 100% rename from SAE_semestre1/fichier.h/time.h rename to SAE_semestre1/time.h