From a40cb5bef401b608513260869ac28e0afcd8bcb4 Mon Sep 17 00:00:00 2001
From: maberet <marcbere@LAPTOP-CJC0G094.localdomain>
Date: Tue, 21 Jun 2022 15:27:45 +0200
Subject: [PATCH] Modification Makefile et ajout /bin
---
.../Beret/jeu_de_la_vie/Makefile | 28 ++++++++----------
.../Beret/jeu_de_la_vie/bin/texte.txt | 0
travail_individuel/Beret/jeu_de_la_vie/run | Bin 0 -> 21888 bytes
.../Beret/jeu_de_la_vie/src/map.h | 6 ++--
.../Beret/jeu_de_la_vie/src/render.h | 7 +++--
5 files changed, 21 insertions(+), 20 deletions(-)
create mode 100644 travail_individuel/Beret/jeu_de_la_vie/bin/texte.txt
create mode 100644 travail_individuel/Beret/jeu_de_la_vie/run
diff --git a/travail_individuel/Beret/jeu_de_la_vie/Makefile b/travail_individuel/Beret/jeu_de_la_vie/Makefile
index 40029b9..dc01c47 100644
--- a/travail_individuel/Beret/jeu_de_la_vie/Makefile
+++ b/travail_individuel/Beret/jeu_de_la_vie/Makefile
@@ -1,25 +1,23 @@
CC=gcc
-CFLAGS=-Wextra -Wall -lm -lSDL2
-LDFLAGS=
+
+LDFLAG=$(shell sdl2-config --cflags --libs) -Wall -Wextra -lm -lSDL2_ttf -D_REENTRANT -lSDL2_image -pthread
+CFLAG=-Wall $(shell sdl2-config --cflags --libs)
+
EXEC=run
+SRC=$(wildcard src/*.c)
+OBJ=$(SRC:.c=.o)
all:$(EXEC)
-run: main.o render.o map.o
- $(CC) -o $@ $^ $(LDFLAGS)
- @echo "Lancer le programme avec ./run"
+$(EXEC):$(OBJ)
+ $(CC) -o $@ $^ $(LDFLAG)
+ mv $^ bin/
-map.o : src/map.c src/map.h
- $(CC) -o $@ -c $< $(CFLAGS)
+%.o:%.c
+ $(CC) -o $@ -c $< $(CFLAG)
-render.o : src/render.c src/render.h
- $(CC) -o $@ -c $< $(CFLAGS)
-
-main.o : src/main.c
- $(CC) -o $@ -c $< $(CFLAGS)
+.PHONY:clean
clean:
- rm -rf *.o
-
-rmExec: clean
+ rm -rf bin/*.o
rm -rf $(EXEC)
\ No newline at end of file
diff --git a/travail_individuel/Beret/jeu_de_la_vie/bin/texte.txt b/travail_individuel/Beret/jeu_de_la_vie/bin/texte.txt
new file mode 100644
index 0000000..e69de29
diff --git a/travail_individuel/Beret/jeu_de_la_vie/run b/travail_individuel/Beret/jeu_de_la_vie/run
new file mode 100644
index 0000000000000000000000000000000000000000..8e08c3bddbdbd66785bf316eb066b0907f8767dc
GIT binary patch
literal 21888
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
Mn;LT+1`byIH^aQwBLDyZ
literal 0
HcmV?d00001
diff --git a/travail_individuel/Beret/jeu_de_la_vie/src/map.h b/travail_individuel/Beret/jeu_de_la_vie/src/map.h
index 9a45946..e8d00f8 100644
--- a/travail_individuel/Beret/jeu_de_la_vie/src/map.h
+++ b/travail_individuel/Beret/jeu_de_la_vie/src/map.h
@@ -1,11 +1,12 @@
-#ifndef projet
+#ifndef map_h
+#define map_h
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include <SDL2/SDL.h>
-#endif
+
/* ------------------------------- Déclaration des fonctions.---------------------------------------*/
@@ -13,3 +14,4 @@ int nombrevoisin(int **grille,int i , int j,int w);
void liberer_grille(int **grille,int taille);
void iteration_suivante(int **grille,int **nouvelle_grille, int *regles_mort, int *regles_naissances, int taille);
void changer_case(int **grille,int i,int j,int taille);
+#endif
\ No newline at end of file
diff --git a/travail_individuel/Beret/jeu_de_la_vie/src/render.h b/travail_individuel/Beret/jeu_de_la_vie/src/render.h
index aa5d4ae..b99c42e 100644
--- a/travail_individuel/Beret/jeu_de_la_vie/src/render.h
+++ b/travail_individuel/Beret/jeu_de_la_vie/src/render.h
@@ -1,11 +1,12 @@
-#ifndef projet
+#ifndef render_h
+#define render_h
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include <SDL2/SDL.h>
-#endif
void init_sdl(SDL_Window *window_1 ,SDL_Renderer *renderer,int dimension_grille);
void dessiner_grille(SDL_Renderer* renderer, int ** grille, int taille);
-void fin_sdl(SDL_Renderer* renderer,SDL_Window *window_1);
\ No newline at end of file
+void fin_sdl(SDL_Renderer* renderer,SDL_Window *window_1);
+#endif
\ No newline at end of file
--
GitLab