Merge pull request #12 from aymnms/dev

Dev

Author: aymnms

.github/workflows/build-macos.yml

@@ -14,13 +14,10 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Install dependencies
-        run: brew install sdl2 sdl2_image sdl2_mixer
+        run: brew install cmake ninja sdl2 sdl2_image sdl2_mixer
 
-      - name: Configure CMake
-        run: cmake -B build-arm -DCMAKE_BUILD_TYPE=Release -DCMAKE_OSX_ARCHITECTURES="arm64"
-
-      - name: Build
-        run: cmake --build build-arm --config Release
+      - name: Configure CMake and Build
+        run: make prod-arm
 
       - name: Remove quarantine attribute
         run: xattr -rd com.apple.quarantine build-arm/mario_isn.app

.gitignore

@@ -102,6 +102,10 @@ dkms.conf
 
 # CMake
 cmake-build-*/
+build/
+build-arm/
+build-intel/
+build-macos/
 
 # Mongo Explorer plugin
 .idea/**/mongoSettings.xml
@@ -176,7 +180,6 @@ CMakeCache.txt
 CMakeFiles
 CMakeScripts
 Testing
-Makefile
 cmake_install.cmake
 install_manifest.txt
 compile_commands.json
@@ -268,3 +271,7 @@ $RECYCLE.BIN/
 *.lnk
 
 # End of https://www.toptal.com/developers/gitignore/api/macos,windows,linux,c,cmake,ninja,clion
+
+.vscode/
+SNAPSHOT.txt
+Makefile.local

CMakeLists.txt

@@ -1,25 +1,29 @@
-cmake_minimum_required(VERSION 3.31)
+cmake_minimum_required(VERSION 3.20)
 project(mario_isn C)
 
+# Langage & bundle macOS
 set(CMAKE_C_STANDARD 99)
 set(CMAKE_MACOSX_BUNDLE TRUE)
 set(MACOSX_BUNDLE_BUNDLE_NAME "MarioISN")
-set(MACOSX_BUNDLE_GUI_IDENTIFIER "com.aymnms.marioisn")
+set(MACOSX_BUNDLE_GUI_IDENTIFIER "fr.aymnms.marioisn")
 set(MACOSX_BUNDLE_SHORT_VERSION_STRING "1.0")
 set(MACOSX_BUNDLE_LONG_VERSION_STRING "1.0")
 set(MACOSX_BUNDLE_BUNDLE_VERSION "1.0")
 set(MACOSX_BUNDLE_ICON_FILE MyIcon.icns)
 
-# headers
-include_directories(
-        /opt/homebrew/include
-        include
-)
+# Pour VS Code / IntelliSense
+set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
+
+# Trouver SDL2 via les packages CMake fournis par Homebrew
+find_package(SDL2       REQUIRED CONFIG)
+find_package(SDL2_image REQUIRED CONFIG)
+find_package(SDL2_mixer REQUIRED CONFIG)
 
 # Exécutable (cible)
 add_executable(mario_isn MACOSX_BUNDLE
         src/main.c
         src/display.c
+        src/path.c
         src/menu/init_menu.c
         src/menu/menu.c
         src/game/init_game.c
@@ -35,42 +39,29 @@ add_executable(mario_isn MACOSX_BUNDLE
         src/game/joueur/music.c
         src/game/joueur/niveau.c
         src/game/joueur/saut_joueur.c
+        ${CMAKE_SOURCE_DIR}/ressources/MyIcon.icns
 )
 
-add_custom_command(TARGET mario_isn POST_BUILD
-        COMMAND ${CMAKE_COMMAND} -E make_directory
-        $<TARGET_BUNDLE_CONTENT_DIR:mario_isn>/Resources
-)
-add_custom_command(TARGET mario_isn POST_BUILD
-        COMMAND ${CMAKE_COMMAND} -E copy
-        ${CMAKE_SOURCE_DIR}/img/MyIcon.icns
-        $<TARGET_BUNDLE_CONTENT_DIR:mario_isn>/Resources/MyIcon.icns
-)
-
+# Indique où la placer dans le bundle
 set_source_files_properties(${CMAKE_SOURCE_DIR}/img/MyIcon.icns
-        PROPERTIES
-        MACOSX_PACKAGE_LOCATION "Resources"
-)
+    PROPERTIES MACOSX_PACKAGE_LOCATION "Resources")
 
-# Bibliothèques
-target_link_libraries(mario_isn
-        /opt/homebrew/lib/libSDL2.dylib
-        /opt/homebrew/lib/libSDL2_image.dylib
-        /opt/homebrew/lib/libSDL2_mixer.dylib
+# Portée des includes du projet (headers locaux)
+target_include_directories(mario_isn PRIVATE
+    ${CMAKE_SOURCE_DIR}/include
 )
 
-# Ressources
-set(ASSETS
-        ${CMAKE_SOURCE_DIR}/bin
-        ${CMAKE_SOURCE_DIR}/img
-        ${CMAKE_SOURCE_DIR}/musique
+# Lien contre SDL2 (targets importées = include + libs + defines gérés)
+target_link_libraries(mario_isn PRIVATE
+    SDL2::SDL2
+    SDL2_image::SDL2_image
+    SDL2_mixer::SDL2_mixer
 )
 
-foreach(asset IN LISTS ASSETS)
-    get_filename_component(asset_name ${asset} NAME)
-    add_custom_command(TARGET mario_isn POST_BUILD
-            COMMAND ${CMAKE_COMMAND} -E copy_directory
-            ${asset}
-            $<TARGET_BUNDLE_CONTENT_DIR:mario_isn>/${asset_name}
-    )
-endforeach()
+# Copie des assets dans le bundle .app (Resources)
+add_custom_command(TARGET mario_isn POST_BUILD
+    COMMAND ${CMAKE_COMMAND} -E make_directory $<TARGET_BUNDLE_CONTENT_DIR:mario_isn>/Resources
+    COMMAND ${CMAKE_COMMAND} -E copy_directory
+            ${CMAKE_SOURCE_DIR}/ressources
+            $<TARGET_BUNDLE_CONTENT_DIR:mario_isn>/Resources
+)

Makefile

@@ -0,0 +1,39 @@
+# Inclusion optionnelle du Makefile.local pour commande make privé
+-include Makefile.local
+
+# Variables
+BUILD_DIR = build
+CMAKE = cmake
+GENERATOR = Ninja
+BUILD_TYPE = Debug
+
+.PHONY: all configure build run clean
+
+# Commande par défaut
+all: build
+
+configure:
+	@$(CMAKE) -S . -B $(BUILD_DIR) -G $(GENERATOR) \
+		-DCMAKE_BUILD_TYPE=$(BUILD_TYPE) \
+		$(if $(ARCH),-DCMAKE_OSX_ARCHITECTURES="$(ARCH)") \
+		-DCMAKE_EXPORT_COMPILE_COMMANDS=ON
+
+build: configure
+	@$(CMAKE) --build $(BUILD_DIR)
+
+run: build
+	@./$(BUILD_DIR)/mario_isn.app/Contents/MacOS/mario_isn
+
+clean:
+	@rm -rf $(BUILD_DIR)
+
+prod-arm:
+	$(MAKE) BUILD_DIR=build-arm BUILD_TYPE=Release ARCH="arm64" configure build
+
+# # Ne fonctionne pas encore
+# prod-intel:
+# 	$(MAKE) BUILD_DIR=build-intel BUILD_TYPE=Release ARCH="x86_64" configure build
+
+# # Ne fonctionne pas encore
+# prod-macos:
+# 	$(MAKE) BUILD_DIR=build-macos BUILD_TYPE=Release ARCH="universal" configure build

README.md

@@ -1,4 +1,4 @@
-#include <SDL2/SDL.h>
+#include <SDL.h>
 //-------------------------------------------------Variable-générale-------------------------------------------------//
 int run = 1, run_game = 1;
 int niveau = 1;

include/MARIO_variables.h

@@ -1,7 +1,7 @@
 #ifndef DISPLAY_H
 #define DISPLAY_H
 
-#include <SDL2/SDL.h>
+#include <SDL.h>
 
 extern SDL_Window *window;
 extern SDL_Renderer *renderer;

include/display.h

@@ -0,0 +1,11 @@
+#pragma once
+
+// Renvoie un chemin ABSOLU pour "img/xxx.png", "musique/xxx.mp3", "bin/xxx.lvl", etc.
+// Résolution basée sur l'emplacement de l'exécutable (SDL_GetBasePath),
+// gère aussi le bundle macOS (.app/Contents/Resources) et le layout de dev.
+char* asset_path(const char *subpath);
+
+// Raccourcis
+char* path_img(const char *filename);
+char* path_music(const char *filename);
+char* path_bin(const char *filename);