Fix erreur makefile
This commit is contained in:
		@@ -1,16 +1,17 @@
 | 
				
			|||||||
### VARIABLES ###
 | 
					### VARIABLES ###
 | 
				
			||||||
 | 
					
 | 
				
			||||||
JC = javac
 | 
					JC = javac
 | 
				
			||||||
JCFLAGS = -encoding UTF-8 -implicit:none -d classes
 | 
					JCFLAGS = -encoding UTF-8 -implicit:none -cp classes -d classes
 | 
				
			||||||
 | 
					
 | 
				
			||||||
JVM = java
 | 
					JVM = java
 | 
				
			||||||
JVMFLAGS = 
 | 
					JVMFLAGS = -cp classes
 | 
				
			||||||
 | 
					
 | 
				
			||||||
### RÈGLES ESSENTIELLES ###
 | 
					### RÈGLES ESSENTIELLES ###
 | 
				
			||||||
 | 
					
 | 
				
			||||||
Main.class: Main.java java/controller/MenuController.class java/view/MenuView.class java/controller/GameController.class
 | 
					Main.class: Main.java java/controller/MenuController.class java/view/MenuView.class java/controller/GameController.class
 | 
				
			||||||
	$(JC) $(JCFLAGS) Main.java
 | 
						$(JC) $(JCFLAGS) Main.java
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					# Compilation des contrôleurs
 | 
				
			||||||
java/controller/MenuController.class: java/controller/MenuController.java java/model/MenuModel.class java/view/MenuView.class java/controller/NewListener.class java/controller/QuiListener.class java/controller/ResListener.class
 | 
					java/controller/MenuController.class: java/controller/MenuController.java java/model/MenuModel.class java/view/MenuView.class java/controller/NewListener.class java/controller/QuiListener.class java/controller/ResListener.class
 | 
				
			||||||
	$(JC) $(JCFLAGS) java/controller/MenuController.java
 | 
						$(JC) $(JCFLAGS) java/controller/MenuController.java
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -23,8 +24,8 @@ java/controller/QuiListener.class: java/controller/QuiListener.java
 | 
				
			|||||||
java/controller/ResListener.class: java/controller/ResListener.java java/view/GameView.class
 | 
					java/controller/ResListener.class: java/controller/ResListener.java java/view/GameView.class
 | 
				
			||||||
	$(JC) $(JCFLAGS) java/controller/ResListener.java
 | 
						$(JC) $(JCFLAGS) java/controller/ResListener.java
 | 
				
			||||||
 | 
					
 | 
				
			||||||
java/view/GameView.class: java/view/GameView.java java/controller/MouseWheelController.class java/controller/GameController.class java/view/HexagonTile.class
 | 
					java/controller/GameController.class: java/controller/GameController.java java/controller/TilePlacer.class java/model/Tile.class java/controller/CameraController.class java/controller/HexagonMouseListener.class
 | 
				
			||||||
	$(JC) $(JCFLAGS) java/view/GameView.java
 | 
						$(JC) $(JCFLAGS) java/controller/GameController.java
 | 
				
			||||||
 | 
					
 | 
				
			||||||
java/controller/MouseWheelController.class: java/controller/MouseWheelController.java java/view/HexagonTile.class java/controller/GameController.class
 | 
					java/controller/MouseWheelController.class: java/controller/MouseWheelController.java java/view/HexagonTile.class java/controller/GameController.class
 | 
				
			||||||
	$(JC) $(JCFLAGS) java/controller/MouseWheelController.java
 | 
						$(JC) $(JCFLAGS) java/controller/MouseWheelController.java
 | 
				
			||||||
@@ -32,36 +33,40 @@ java/controller/MouseWheelController.class: java/controller/MouseWheelController
 | 
				
			|||||||
java/controller/HexagonMouseListener.class: java/controller/HexagonMouseListener.java java/view/HexagonTile.class java/controller/TilePlacer.class
 | 
					java/controller/HexagonMouseListener.class: java/controller/HexagonMouseListener.java java/view/HexagonTile.class java/controller/TilePlacer.class
 | 
				
			||||||
	$(JC) $(JCFLAGS) java/controller/HexagonMouseListener.java
 | 
						$(JC) $(JCFLAGS) java/controller/HexagonMouseListener.java
 | 
				
			||||||
 | 
					
 | 
				
			||||||
java/controller/GameController.class: java/controller/GameController.java java/controller/TilePlacer.class java/model/Tile.class java/controller/CameraController.class java/controller/HexagonMouseListener.class
 | 
					 | 
				
			||||||
	$(JC) $(JCFLAGS) java/controller/GameController.java
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
java/controller/CameraController.class: java/controller/CameraController.java java/controller/GameContext.class java/controller/MousePressHandler.class java/controller/MouseDragHandler.class
 | 
					java/controller/CameraController.class: java/controller/CameraController.java java/controller/GameContext.class java/controller/MousePressHandler.class java/controller/MouseDragHandler.class
 | 
				
			||||||
	$(JC) $(JCFLAGS) java/controller/CameraController.java
 | 
						$(JC) $(JCFLAGS) java/controller/CameraController.java
 | 
				
			||||||
 | 
					
 | 
				
			||||||
java/controller/GameContext.class: java/controller/GameContext.java java/view/HexagonTile.class
 | 
					java/controller/GameContext.class: java/controller/GameContext.java java/view/HexagonTile.class
 | 
				
			||||||
	$(JC) $(JCFLAGS) java/controller/GameContext.java
 | 
						$(JC) $(JCFLAGS) java/controller/GameContext.java
 | 
				
			||||||
 | 
					
 | 
				
			||||||
java/view/HexagonTile.class: java/view/HexagonTile.java java/model/Tile.class java/model/TerrainType.class
 | 
					# Compilation des vues
 | 
				
			||||||
	$(JC) $(JCFLAGS) java/view/HexagonTile.java
 | 
					java/view/GameView.class: java/view/GameView.java java/controller/MouseWheelController.class java/controller/GameController.class java/view/HexagonTile.class
 | 
				
			||||||
 | 
						$(JC) $(JCFLAGS) java/view/GameView.java
 | 
				
			||||||
java/model/MenuModel.class: java/model/MenuModel.java
 | 
					 | 
				
			||||||
	$(JC) $(JCFLAGS) java/model/MenuModel.java
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
java/view/MenuView.class: java/view/MenuView.java java/view/BtnPerso.class java/view/ButtonHoverListener.class
 | 
					java/view/MenuView.class: java/view/MenuView.java java/view/BtnPerso.class java/view/ButtonHoverListener.class
 | 
				
			||||||
	$(JC) $(JCFLAGS) java/view/MenuView.java
 | 
						$(JC) $(JCFLAGS) java/view/MenuView.java
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					java/view/HexagonTile.class: java/view/HexagonTile.java java/model/Tile.class java/model/TerrainType.class
 | 
				
			||||||
 | 
						$(JC) $(JCFLAGS) java/view/HexagonTile.java
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					# Compilation des modèles
 | 
				
			||||||
 | 
					java/model/MenuModel.class: java/model/MenuModel.java
 | 
				
			||||||
 | 
						$(JC) $(JCFLAGS) java/model/MenuModel.java
 | 
				
			||||||
 | 
					
 | 
				
			||||||
java/model/Tile.class: java/model/Tile.java java/model/TerrainType.class
 | 
					java/model/Tile.class: java/model/Tile.java java/model/TerrainType.class
 | 
				
			||||||
	$(JC) $(JCFLAGS) java/model/Tile.java
 | 
						$(JC) $(JCFLAGS) java/model/Tile.java
 | 
				
			||||||
 | 
					
 | 
				
			||||||
java/model/TerrainType.class: java/model/TerrainType.java
 | 
					java/model/TerrainType.class: java/model/TerrainType.java
 | 
				
			||||||
	$(JC) $(JCFLAGS) java/model/TerrainType.java
 | 
						$(JC) $(JCFLAGS) java/model/TerrainType.java
 | 
				
			||||||
 | 
					
 | 
				
			||||||
java/view/ButtonHoverListener.class: java/view/ButtonHoverListener.java
 | 
					# Compilation des composants individuels
 | 
				
			||||||
	$(JC) $(JCFLAGS) java/view/ButtonHoverListener.java
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
java/view/BtnPerso.class: java/view/BtnPerso.java
 | 
					java/view/BtnPerso.class: java/view/BtnPerso.java
 | 
				
			||||||
	$(JC) $(JCFLAGS) java/view/BtnPerso.java
 | 
						$(JC) $(JCFLAGS) java/view/BtnPerso.java
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					java/view/ButtonHoverListener.class: java/view/ButtonHoverListener.java
 | 
				
			||||||
 | 
						$(JC) $(JCFLAGS) java/view/ButtonHoverListener.java
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					# Compilation des handlers
 | 
				
			||||||
java/controller/MousePressHandler.class: java/controller/MousePressHandler.java java/controller/CameraControllerListener.class
 | 
					java/controller/MousePressHandler.class: java/controller/MousePressHandler.java java/controller/CameraControllerListener.class
 | 
				
			||||||
	$(JC) $(JCFLAGS) java/controller/MousePressHandler.java
 | 
						$(JC) $(JCFLAGS) java/controller/MousePressHandler.java
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -83,7 +88,7 @@ copy-images:
 | 
				
			|||||||
### RÈGLES OPTIONNELLES ###
 | 
					### RÈGLES OPTIONNELLES ###
 | 
				
			||||||
 | 
					
 | 
				
			||||||
run: Main.class copy-images
 | 
					run: Main.class copy-images
 | 
				
			||||||
	$(JVM) $(JVMFLAGS) -cp classes main.Main
 | 
						$(JVM) $(JVMFLAGS) main.Main
 | 
				
			||||||
 | 
					
 | 
				
			||||||
clean:
 | 
					clean:
 | 
				
			||||||
	-rm -f classes/**/*.class
 | 
						-rm -f classes/**/*.class
 | 
				
			||||||
 
 | 
				
			|||||||
										
											Binary file not shown.
										
									
								
							| 
		 Before Width: | Height: | Size: 27 KiB  | 
										
											Binary file not shown.
										
									
								
							| 
		 Before Width: | Height: | Size: 322 KiB  | 
										
											Binary file not shown.
										
									
								
							| 
		 Before Width: | Height: | Size: 36 KiB  | 
		Reference in New Issue
	
	Block a user