Some updates

Author: IlyaBOT

.github/workflows/build_workflow.yml

@@ -20,7 +20,7 @@ jobs:
           # macOS build
           - os: macos-latest
             build_type: Release
-            cmake_args: -DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" -DCMAKE_BUILD_TYPE=Release
+            cmake_args: -DCMAKE_BUILD_TYPE=Release
           # Windows build with Visual Studio
           - os: windows-latest
             build_type: Release
@@ -100,15 +100,25 @@ jobs:
         run: cmake --build build --parallel
 
       # Package release for macOS: create a zip archive with the executable and assets
-      - name: Package release (macOS)
+      # Generate a macOS .app bundle using the provided generator script and package it
+      - name: Package .app (macOS)
         if: runner.os == 'macOS'
         run: |
-          mkdir -p packaged
-          cp build/mw_recreation packaged/
-          cp -r assets packaged/assets
-          zip -r macos-latest.zip packaged
-
-      # Upload packaged release for macOS
+          set -e
+          # Ensure the generator script is executable
+          chmod +x tools/macos_app_generator.sh
+          # Run the script with the built binary and assets as arguments. This script
+          # should create a .app bundle in the current directory or in a known location.
+          tools/macos_app_generator.sh build/mw_recreation assets
+          # Find the generated .app bundle (assumes only one .app is generated)
+          APP_PATH=$(find . -name '*.app' -type d -print -quit)
+          if [ -z "$APP_PATH" ]; then
+            echo "No .app bundle found after running macos_app_generator.sh" && exit 1
+          fi
+          # Compress the .app bundle into a zip for distribution
+          zip -r macos-latest.zip "$APP_PATH"
+
+      # Upload packaged .app for macOS
       - name: Upload release (macOS)
         if: runner.os == 'macOS'
         uses: actions/upload-artifact@v4
@@ -133,6 +143,69 @@ jobs:
           name: linux-latest
           path: linux-latest.tar.gz
 
+      # Build and package additional Linux distributions: AppImage and .deb
+      - name: Package Linux AppImage
+        if: runner.os == 'Linux'
+        run: |
+          set -e
+          # Prepare AppDir structure for linuxdeploy
+          mkdir -p appimage-build/AppDir/usr/bin
+          cp build/mw_recreation appimage-build/AppDir/usr/bin/mw_recreation
+          cp -r assets appimage-build/AppDir/usr/bin/assets
+          # Create desktop entry for the AppImage
+          mkdir -p appimage-build/AppDir/usr/share/applications
+          cat > appimage-build/AppDir/usr/share/applications/mw_recreation.desktop <<'EOF'
+          [Desktop Entry]
+          Name=Music World Recreation
+          Exec=mw_recreation
+          Icon=mw_recreation
+          Type=Application
+          Categories=Game;
+          EOF
+          # Download linuxdeploy to bundle the AppImage
+          wget -q https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage -O linuxdeploy.AppImage
+          chmod +x linuxdeploy.AppImage
+          # Build the AppImage; this produces a file ending in .AppImage
+          ./linuxdeploy.AppImage --appdir appimage-build/AppDir --output appimage
+          # Rename the generated file to a predictable name
+          mv *.AppImage mw_recreation.AppImage
+
+      - name: Package Linux .deb
+        if: runner.os == 'Linux'
+        run: |
+          set -e
+          # Prepare debian package directory structure
+          mkdir -p debpkg/usr/bin
+          cp build/mw_recreation debpkg/usr/bin/
+          mkdir -p debpkg/usr/share/mw_recreation
+          cp -r assets debpkg/usr/share/mw_recreation/
+          mkdir -p debpkg/DEBIAN
+          cat > debpkg/DEBIAN/control <<'EOF'
+          Package: mw-recreation
+          Version: 1.0.0
+          Section: games
+          Priority: optional
+          Architecture: amd64
+          Maintainer: Unknown
+          Description: Music World Recreation game built with raylib
+          EOF
+          # Build the Debian package
+          dpkg-deb --build debpkg mw_recreation.deb
+
+      - name: Upload Linux AppImage
+        if: runner.os == 'Linux'
+        uses: actions/upload-artifact@v4
+        with:
+          name: linux-appimage
+          path: mw_recreation.AppImage
+
+      - name: Upload Linux deb
+        if: runner.os == 'Linux'
+        uses: actions/upload-artifact@v4
+        with:
+          name: linux-deb
+          path: mw_recreation.deb
+
       # Upload build artifacts.  Separate steps are used for Windows and
       # non‑Windows because the executable is generated into different
       # directories on Visual Studio.
@@ -148,4 +221,4 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: mw_recreation-${{ matrix.os }}
-          path: build/mw_recreation
+          path: build/mw_recreation

assets.zip

@@ -6,8 +6,10 @@
 #include "screens/menu/MenuBg.h"
 #include "screens/menu/SpritePath.h"
 #include <algorithm>
+#include <cctype>
 #include <cmath>
 #include <string>
+#include <string_view>
 
 namespace {
 #if defined(PLATFORM_ANDROID) || defined(__ANDROID__) || defined(__EMSCRIPTEN__)
@@ -101,6 +103,23 @@ static void drawRoundedRectPx(Rectangle r, float radiusPx, Color color) {
     float roundness = (minSide > 0.0f) ? std::min(1.0f, (radiusPx * 2.0f) / minSide) : 0.0f;
     DrawRectangleRounded(r, roundness, 8, color);
 }
+
+static bool ShouldAppendAlphaSuffix(std::string_view version) {
+    size_t i = 0;
+    while (i < version.size() && std::isspace((unsigned char)version[i])) ++i;
+    if (i < version.size() && (version[i] == 'v' || version[i] == 'V')) ++i;
+
+    bool hasMajor = false;
+    int major = 0;
+    while (i < version.size() && std::isdigit((unsigned char)version[i])) {
+        hasMajor = true;
+        major = major * 10 + (version[i] - '0');
+        ++i;
+    }
+
+    if (!hasMajor) return false;
+    return major < 1;
+}
 }
 
 float SettingsScreen::calcMaxScroll(int viewportHeight) const {
@@ -580,7 +599,8 @@ void SettingsScreen::draw(const DrawContext& ctx) {
 
     back_.draw(*ctx.assets);
 
-    const std::string versionText = std::string("v") + buildinfo::kVersion;
+    std::string versionText = std::string("v") + buildinfo::kVersion;
+    if (ShouldAppendAlphaSuffix(buildinfo::kVersion)) versionText += " alpha";
     const int versionFontSize = 12;
     const int versionY = vh - 8 - versionFontSize;
     const int versionX = (vw - MeasureText(versionText.c_str(), versionFontSize)) / 2;