Merge branch 'main' of https://github.com/FranciumSoftware/Fast-Sound-System

Author: FranciumSoftware

.github/workflows/main.yml

@@ -11,32 +11,39 @@ jobs:
     runs-on: macos-latest
 
     steps:
-      - name: 🧾 Checkout Repository
-        uses: actions/checkout@v3
+      - name: 🧷 Checkout Repository
+        uses: actions/checkout@v4
 
       - name: 📦 Install Qt with Multimedia
         uses: jurplel/install-qt-action@v4
         with:
-          version: '6.5.2'
+          version: '6.10'
           target: 'desktop'
           arch: 'clang_64'
           modules: 'qtmultimedia'
-      - name: 🔍 Debug Qt install path
-        run: echo "Qt installed at:$INSTALL_QT_DIR"
-        
-      - name: 🧰 Configure CMake for Universal Build
+
+      - name: 🌐 Add Qt to PATH
+        # Cette étape permet d'utiliser 'macdeployqt' directement sans le chemin complet
+        run: echo "$QT_ROOT_DIR/bin" >> $GITHUB_PATH
+
+      - name: 🔍 Debug Installation Path
+        run: |
+          echo "Qt is installed at: $QT_ROOT_DIR"
+          which macdeployqt
+
+      - name: 🛠️ Configure CMake for Universal Build
         run: |
-          cmake -S . -B build \
+          cmake -S ./src -B build \
             -DCMAKE_BUILD_TYPE=Release \
             -DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" \
-            -DCMAKE_PREFIX_PATH="$HOME/Qt/6.5.2/macos"
+            -DCMAKE_PREFIX_PATH="$QT_ROOT_DIR"
 
       - name: 🏗️ Build Application
         run: cmake --build build --config Release
 
       - name: 📦 Bundle Application with macdeployqt
         run: |
-          "$INSTALL_QT_DIR/bin/macdeployqt" build/FastSoundSystem.app -verbose=2
+          macdeployqt build/FastSoundSystem.app -verbose=2
 
       - name: 🛫 Upload macOS App Bundle
         uses: actions/upload-artifact@v4

src/CMakeLists.txt

@@ -16,6 +16,10 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
     set(WINDOWS_PLATFORM TRUE)
 elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
     set(MACOS_PLATFORM TRUE)
+    # macOS-specific settings
+    set(CMAKE_OSX_ARCHITECTURES "x86_64;arm64" CACHE STRING "Build for both Intel and Apple Silicon")
+    set(CMAKE_OSX_SYSROOT "macosx11.0" CACHE STRING "Use Big Sur SDK")
+    set(CMAKE_OSX_DEPLOYMENT_TARGET "10.15" CACHE STRING "Minimum deployment target")
 elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux")
     set(LINUX_PLATFORM TRUE)
 endif()
@@ -68,7 +72,7 @@ if(${QT_VERSION_MAJOR} GREATER_EQUAL 6)
     target_link_libraries(FastSoundSystem PRIVATE Qt6::Multimedia)
 endif()
 
-# 
+# macOS bundle properties
 if(MACOS_PLATFORM)
     set_target_properties(FastSoundSystem PROPERTIES
         MACOSX_BUNDLE TRUE
@@ -78,12 +82,12 @@ if(MACOS_PLATFORM)
     )
 endif()
 
-# Install 
-install(TARGETS FastSoundSystem
-    BUNDLE DESTINATION ./build  # Install the .app bundle in the current directory
-    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-)
+# Install (optional, handled by GitHub Actions)
+# install(TARGETS FastSoundSystem
+#    BUNDLE DESTINATION ./build
+#    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+#    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+#)
 
 # Exclude CPack DragNDrop generator (no .dmg file)
-set(CPACK_GENERATOR "")  #
+set(CPACK_GENERATOR "")