diff --git a/src/main/Makefile b/src/main/Makefile index 595a04a..43b116a 100644 --- a/src/main/Makefile +++ b/src/main/Makefile @@ -1,16 +1,17 @@ ### VARIABLES ### JC = javac -JCFLAGS = -encoding UTF-8 -implicit:none -d classes +JCFLAGS = -encoding UTF-8 -implicit:none -cp classes -d classes JVM = java -JVMFLAGS = +JVMFLAGS = -cp classes ### RÈGLES ESSENTIELLES ### Main.class: Main.java java/controller/MenuController.class java/view/MenuView.class java/controller/GameController.class $(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 $(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 $(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 - $(JC) $(JCFLAGS) java/view/GameView.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/MouseWheelController.class: java/controller/MouseWheelController.java java/view/HexagonTile.class java/controller/GameController.class $(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 $(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 $(JC) $(JCFLAGS) java/controller/CameraController.java java/controller/GameContext.class: java/controller/GameContext.java java/view/HexagonTile.class $(JC) $(JCFLAGS) java/controller/GameContext.java -java/view/HexagonTile.class: java/view/HexagonTile.java java/model/Tile.class java/model/TerrainType.class - $(JC) $(JCFLAGS) java/view/HexagonTile.java - -java/model/MenuModel.class: java/model/MenuModel.java - $(JC) $(JCFLAGS) java/model/MenuModel.java +# Compilation des vues +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/view/MenuView.class: java/view/MenuView.java java/view/BtnPerso.class java/view/ButtonHoverListener.class $(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 $(JC) $(JCFLAGS) java/model/Tile.java java/model/TerrainType.class: java/model/TerrainType.java $(JC) $(JCFLAGS) java/model/TerrainType.java -java/view/ButtonHoverListener.class: java/view/ButtonHoverListener.java - $(JC) $(JCFLAGS) java/view/ButtonHoverListener.java - +# Compilation des composants individuels java/view/BtnPerso.class: 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 $(JC) $(JCFLAGS) java/controller/MousePressHandler.java @@ -83,7 +88,7 @@ copy-images: ### RÈGLES OPTIONNELLES ### run: Main.class copy-images - $(JVM) $(JVMFLAGS) -cp classes main.Main + $(JVM) $(JVMFLAGS) main.Main clean: -rm -f classes/**/*.class diff --git a/src/main/classes/java/view/img/D.png b/src/main/classes/java/view/img/D.png deleted file mode 100644 index 7dc4b96..0000000 Binary files a/src/main/classes/java/view/img/D.png and /dev/null differ diff --git a/src/main/classes/java/view/img/bg.png b/src/main/classes/java/view/img/bg.png deleted file mode 100644 index e3621e8..0000000 Binary files a/src/main/classes/java/view/img/bg.png and /dev/null differ diff --git a/src/main/classes/java/view/img/quit.png b/src/main/classes/java/view/img/quit.png deleted file mode 100644 index aa7b154..0000000 Binary files a/src/main/classes/java/view/img/quit.png and /dev/null differ