From 875399334962fa2f36e84704bc0e4c0697897261 Mon Sep 17 00:00:00 2001
From: Loris BALOCCHI <loris.balocchi@etu.u-pec.fr>
Date: Fri, 7 Jun 2024 17:14:08 +0200
Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A7=20=C3=A9dition=20du=20makefile=20p?=
 =?UTF-8?q?our=20compilation=20sous=20linux?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 makefile | 21 +++++++--------------
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/makefile b/makefile
index 034c7e1..5d967fa 100644
--- a/makefile
+++ b/makefile
@@ -2,7 +2,6 @@
 SRC_DIR = src
 BIN_DIR = bin
 RES_DIR = $(SRC_DIR)/com/charpentierbalocchi/dorfjavatik/resources
-JAR_FILE = $(BIN_DIR)/DorfJavaTik.jar
 JAVAC = javac
 JAVA = java
 JAVADOC = javadoc
@@ -10,15 +9,14 @@ MAIN = com.charpentierbalocchi.dorfjavatik.view.FenetreDemarrage
 
 # Compilation flags
 JFLAGS = -d $(BIN_DIR) -encoding UTF-8 -sourcepath $(SRC_DIR)
-JARFLAGS = cfe
 
 # Default rule
-all: clean compile copy-resources jar
+all: clean compile copy-resources
 
 # Rule to compile the java files
 compile:
 	@echo "Compilation des fichiers source java..."
-	@if not exist "$(BIN_DIR)" mkdir $(BIN_DIR)
+	@mkdir -p $(BIN_DIR)
 	@$(JAVAC) $(JFLAGS) $(SRC_DIR)/com/charpentierbalocchi/dorfjavatik/controller/*.java
 	@$(JAVAC) $(JFLAGS) $(SRC_DIR)/com/charpentierbalocchi/dorfjavatik/model/*.java
 	@$(JAVAC) $(JFLAGS) $(SRC_DIR)/com/charpentierbalocchi/dorfjavatik/util/*.java
@@ -27,17 +25,12 @@ compile:
 # Rule to copy resources
 copy-resources:
 	@echo "Copying resources..."
-	@xcopy /Y /I "$(RES_DIR)" "$(BIN_DIR)\com\charpentierbalocchi\dorfjavatik\resources\"
-
-# Rule to create the jar file
-jar: compile
-	@echo "Création du fichier .jar ..."
-	@jar $(JARFLAGS) $(JAR_FILE) $(MAIN) -C $(BIN_DIR) .
+	@cp -r $(RES_DIR) $(BIN_DIR)
 
 # Rule to run the application
-run: jar
+run: compile copy-resources
 	@echo "Lancement du jeu..."
-	@$(JAVA) -jar $(JAR_FILE)
+	@$(JAVA) -cp $(BIN_DIR) $(MAIN)
 
 # Rule to generate Javadoc
 javadoc:
@@ -47,6 +40,6 @@ javadoc:
 # Rule to clean the project
 clean:
 	@echo "Nettoyage en cours..."
-	@if exist "$(BIN_DIR)" rd /s /q $(BIN_DIR)
+	@rm -rf $(BIN_DIR)
 
-.PHONY: all compile run jar javadoc clean copy-resources
+.PHONY: all compile run javadoc clean copy-resources