From 8feee5a9b8b16be3ac74a84c556bfbab256cfaed Mon Sep 17 00:00:00 2001
From: HORVILLE Ewen <ewen.horville@etu.u-pec.fr>
Date: Tue, 7 Dec 2021 14:55:51 +0100
Subject: [PATCH] Update SAE

---
 APL1.1/SAE11_2021/Makefile                  | 17 ++++-------------
 APL1.1/SAE11_2021/graph_sup.c               |  2 --
 APL1.1/SAE11_2021/lib_menu/menu_graphique.c |  0
 APL1.1/SAE11_2021/lib_menu/menu_graphique.h |  4 ----
 APL1.1/SAE11_2021/lib_menu/menu_logique.c   |  4 ----
 APL1.1/SAE11_2021/lib_menu/menu_logique.h   |  0
 APL1.1/SAE11_2021/main.c                    |  3 +--
 APL1.1/SAE11_2021/{lib_menu => }/menu.c     |  0
 APL1.1/SAE11_2021/{lib_menu => }/menu.h     |  0
 9 files changed, 5 insertions(+), 25 deletions(-)
 delete mode 100644 APL1.1/SAE11_2021/lib_menu/menu_graphique.c
 delete mode 100644 APL1.1/SAE11_2021/lib_menu/menu_graphique.h
 delete mode 100644 APL1.1/SAE11_2021/lib_menu/menu_logique.c
 delete mode 100644 APL1.1/SAE11_2021/lib_menu/menu_logique.h
 rename APL1.1/SAE11_2021/{lib_menu => }/menu.c (100%)
 rename APL1.1/SAE11_2021/{lib_menu => }/menu.h (100%)

diff --git a/APL1.1/SAE11_2021/Makefile b/APL1.1/SAE11_2021/Makefile
index 07aa1b6..2a8c6a0 100644
--- a/APL1.1/SAE11_2021/Makefile
+++ b/APL1.1/SAE11_2021/Makefile
@@ -1,26 +1,17 @@
-taquin : main.o taquin.o utils.o graph_sup.o
-	gcc -Wall -ansi -o taquin.out main.o taquin.o utils.o graph_sup.o -lgraph -lm
+taquin : main.o taquin.o menu.o graph_sup.o
+	gcc -Wall -ansi -o taquin.out main.o menu.o taquin.o graph_sup.o -lgraph -lm
 
 main.o : main.c main.h
 	gcc -c main.c
 
-utils.o : utils.c utils.h
-	gcc -c utils.c
-
 graph_sup.o : graph_sup.c graph_sup.h
 	gcc -c graph_sup.c
 
 taquin.o : taquin.c taquin.h
 	gcc -c taquin.c
 
-menu.o : lib_menu/menu.c lib_menu/menu.h
-	gcc -c lib_menu/menu.c
-
-menu_graphique.o : lib_menu/menu_graphique.c lib_menu/menu_graphique.h
-	gcc -c lib_menu/menu_graphique.c
-
-menu_logique.o : lib_menu/menu_logique.c lib_menu/menu_logique.h
-	gcc -c lib_menu/menu_logique.c
+menu.o : menu.c menu.h
+	gcc -c menu.c
 
 clean :
 	rm -f *.o
\ No newline at end of file
diff --git a/APL1.1/SAE11_2021/graph_sup.c b/APL1.1/SAE11_2021/graph_sup.c
index 201f2f5..c839155 100644
--- a/APL1.1/SAE11_2021/graph_sup.c
+++ b/APL1.1/SAE11_2021/graph_sup.c
@@ -39,13 +39,11 @@ int GetButton(int x, int y) {
 	return -1;
 }
 
-
 //Des fonctions appelant celles de la bibliothèque graphique afin de réduire la longueur des noms..
 couleur GetColorN(char* name) {
 	return CouleurParNom(name);
 }
 
-
 couleur GetColor(unsigned char r, unsigned char g, unsigned char b) {
 	return CouleurParComposante(r, g, b);
 }
diff --git a/APL1.1/SAE11_2021/lib_menu/menu_graphique.c b/APL1.1/SAE11_2021/lib_menu/menu_graphique.c
deleted file mode 100644
index e69de29..0000000
diff --git a/APL1.1/SAE11_2021/lib_menu/menu_graphique.h b/APL1.1/SAE11_2021/lib_menu/menu_graphique.h
deleted file mode 100644
index d1460a1..0000000
--- a/APL1.1/SAE11_2021/lib_menu/menu_graphique.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _MENU_GRAPHIQUE_H
-#define _MENU_GRAPHIQUE_H
-
-#endif
\ No newline at end of file
diff --git a/APL1.1/SAE11_2021/lib_menu/menu_logique.c b/APL1.1/SAE11_2021/lib_menu/menu_logique.c
deleted file mode 100644
index b2728d9..0000000
--- a/APL1.1/SAE11_2021/lib_menu/menu_logique.c
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _MENU_LOGIQUE_H
-#define _MENU_LOGIQUE_H
-
-#endif
\ No newline at end of file
diff --git a/APL1.1/SAE11_2021/lib_menu/menu_logique.h b/APL1.1/SAE11_2021/lib_menu/menu_logique.h
deleted file mode 100644
index e69de29..0000000
diff --git a/APL1.1/SAE11_2021/main.c b/APL1.1/SAE11_2021/main.c
index 7e93ed8..1d2061c 100644
--- a/APL1.1/SAE11_2021/main.c
+++ b/APL1.1/SAE11_2021/main.c
@@ -4,11 +4,10 @@
 #include <time.h>
 #include <string.h>
 #include <math.h>
-#include "utils.h"
 #include "graph_sup.h"
 
 #include "taquin.h"
-#include "lib_menu/menu.h"
+#include "menu.h"
 
 int main(int argc, char* argv[]) {
 	InitialiserGraphique();
diff --git a/APL1.1/SAE11_2021/lib_menu/menu.c b/APL1.1/SAE11_2021/menu.c
similarity index 100%
rename from APL1.1/SAE11_2021/lib_menu/menu.c
rename to APL1.1/SAE11_2021/menu.c
diff --git a/APL1.1/SAE11_2021/lib_menu/menu.h b/APL1.1/SAE11_2021/menu.h
similarity index 100%
rename from APL1.1/SAE11_2021/lib_menu/menu.h
rename to APL1.1/SAE11_2021/menu.h