From 5fc52e09c798c3fd0e5ebad10883877bdc16f0ea Mon Sep 17 00:00:00 2001
From: Martin ROUAULT <marouault@IUTCLINFA2319.iut.local>
Date: Mon, 29 Nov 2021 10:31:31 +0100
Subject: [PATCH 1/3] Debut de makefile

---
 Pontu/Makefile                | 30 ++++++++++++++++++++++++++++++
 Pontu/include/modele/Joueur.h |  2 +-
 Pontu/src/main.c              |  5 +++++
 3 files changed, 36 insertions(+), 1 deletion(-)
 create mode 100644 Pontu/Makefile

diff --git a/Pontu/Makefile b/Pontu/Makefile
new file mode 100644
index 0000000..97f69cf
--- /dev/null
+++ b/Pontu/Makefile
@@ -0,0 +1,30 @@
+CC=gcc
+CFLAGS=-Wall -Wextra -std=c17 -pedantic
+LDFLAGS= $(sdl2-config --cflags --libs)
+INCFLAGS= -I include
+EXEC=bin/pontu
+SRC= $(wildcard src/modele/*.c) $(wildcard src/moteur/*.c) $(wildcard src/vue/*.c) src/main.c
+
+
+OBJ= $(SRC:.c=.o)
+
+help:
+	echo "Usage :"
+
+
+all: $(EXEC)
+	echo $(OBJ)
+
+$(EXEC): $(OBJ)
+	$(CC) $(LDFLAGS) -o $@ $^
+
+%.o: %.c
+	$(CC) $(INCFLAGS) $(CFLAGS) -o $@ -c $<
+
+.PHONY: clean hardclean 
+
+clean:
+	rm -rf *.o
+
+hardclean: clean
+	rm -rf $(EXEC)
diff --git a/Pontu/include/modele/Joueur.h b/Pontu/include/modele/Joueur.h
index 8c142dc..356f8ce 100644
--- a/Pontu/include/modele/Joueur.h
+++ b/Pontu/include/modele/Joueur.h
@@ -10,7 +10,7 @@
 
 #define PSEUDO_LENMAX 50
 
-#include <SDL_pixels.h>
+#include <SDL2/SDL_pixels.h>
 
 /**
  * \struct Joueur
diff --git a/Pontu/src/main.c b/Pontu/src/main.c
index e69de29..328a890 100644
--- a/Pontu/src/main.c
+++ b/Pontu/src/main.c
@@ -0,0 +1,5 @@
+
+
+int main() {
+    return 0;
+}
\ No newline at end of file

From f3cf2b27eb3f8f045a8305d8cdb0c27b94431299 Mon Sep 17 00:00:00 2001
From: marouault <martin.rouault@etu.uca.fr>
Date: Mon, 29 Nov 2021 10:28:37 +0000
Subject: [PATCH 2/3] Update .gitignore

---
 .gitignore | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/.gitignore b/.gitignore
index e0b9eaa..f1b9497 100644
--- a/.gitignore
+++ b/.gitignore
@@ -51,3 +51,20 @@ modules.order
 Module.symvers
 Mkfile.old
 dkms.conf
+
+### CMake ###
+CMakeLists.txt.user
+CMakeCache.txt
+CMakeFiles
+CMakeScripts
+Testing
+Makefile
+cmake_install.cmake
+install_manifest.txt
+compile_commands.json
+CTestTestfile.cmake
+_deps
+
+### CMake Patch ###
+# External projects
+*-prefix/

From 43557fbd56dd7ead123f79519fd4d8450430a7c7 Mon Sep 17 00:00:00 2001
From: Martin ROUAULT <marouault@IUTCLINFA2319.iut.local>
Date: Mon, 29 Nov 2021 11:31:06 +0100
Subject: [PATCH 3/3] Ajout d'un fichier CMakeLists.txt

---
 Pontu/CMakeLists.txt         | 18 ++++++++++++++++++
 Pontu/Makefile               | 30 ------------------------------
 Pontu/include/model/Player.h |  2 +-
 3 files changed, 19 insertions(+), 31 deletions(-)
 create mode 100644 Pontu/CMakeLists.txt
 delete mode 100644 Pontu/Makefile

diff --git a/Pontu/CMakeLists.txt b/Pontu/CMakeLists.txt
new file mode 100644
index 0000000..1ec61d8
--- /dev/null
+++ b/Pontu/CMakeLists.txt
@@ -0,0 +1,18 @@
+cmake_minimum_required(VERSION 3.13)
+
+SET(ProjetName Pontu)
+#SET(TestTargetName )
+
+
+
+project(${ProjetName})
+
+file(GLOB_RECURSE MY_SOURCES CONFIGURE_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/src/*.c)
+add_executable(${ProjetName} ${MY_SOURCES})
+
+
+SET(WarningGCC -Wall -Wextra -pedantic -Wconversion -std=c17 -D_REENTRANT)
+
+target_compile_options(${ProjetName} PRIVATE ${WarningGCC} -Og -fdiagnostics-color=always)
+target_link_libraries(${ProjetName} SDL2)
+target_include_directories(${ProjetName} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include /usr/include/SDL2)
\ No newline at end of file
diff --git a/Pontu/Makefile b/Pontu/Makefile
deleted file mode 100644
index 97f69cf..0000000
--- a/Pontu/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-CC=gcc
-CFLAGS=-Wall -Wextra -std=c17 -pedantic
-LDFLAGS= $(sdl2-config --cflags --libs)
-INCFLAGS= -I include
-EXEC=bin/pontu
-SRC= $(wildcard src/modele/*.c) $(wildcard src/moteur/*.c) $(wildcard src/vue/*.c) src/main.c
-
-
-OBJ= $(SRC:.c=.o)
-
-help:
-	echo "Usage :"
-
-
-all: $(EXEC)
-	echo $(OBJ)
-
-$(EXEC): $(OBJ)
-	$(CC) $(LDFLAGS) -o $@ $^
-
-%.o: %.c
-	$(CC) $(INCFLAGS) $(CFLAGS) -o $@ -c $<
-
-.PHONY: clean hardclean 
-
-clean:
-	rm -rf *.o
-
-hardclean: clean
-	rm -rf $(EXEC)
diff --git a/Pontu/include/model/Player.h b/Pontu/include/model/Player.h
index 2220de4..f979714 100644
--- a/Pontu/include/model/Player.h
+++ b/Pontu/include/model/Player.h
@@ -10,7 +10,7 @@
 
 #define PSEUDO_LENMAX 50
 
-#include <SDL_pixels.h>
+#include <SDL2/SDL_pixels.h>
 #include <string.h>
 
 /**