Add meson build system

.github/workflows/cmake.yml

@@ -4,15 +4,18 @@ concurrency:
   cancel-in-progress: true
 
 on:
-  push:
-    branches: [ develop ]
-    paths-ignore:
-      - '**/appimage.yml'
-
-  pull_request:
-    branches: [ develop ]
-    paths-ignore:
-      - '**/appimage.yml'
+  workflow_run:
+    workflows: [Meson]
+    types: [completed]
+  #push:
+    #branches: [ develop ]
+    #paths-ignore:
+      #- '**/appimage.yml'
+
+  #pull_request:
+    #branches: [ develop ]
+    #paths-ignore:
+      #- '**/appimage.yml'
 
 jobs:
   freebsd:
@@ -209,4 +212,3 @@ jobs:
         name: megaglest-x64-macos
         retention-days: 1
         path: release/*.tar.bz2
-

.github/workflows/meson.yml

@@ -0,0 +1,93 @@
+name: Meson
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}
+  cancel-in-progress: true
+
+on:
+  push:
+    branches: [ develop ]
+    paths:
+    - 'source/**/**'
+    - '**meson.build'
+    - '**/meson.yml'
+  pull_request:
+    branches: [ develop ]
+    paths:
+    - 'source/**/**'
+    - '**meson.build'
+    - '**/meson.yml'
+
+jobs:
+  meson:
+    runs-on: ubuntu-22.04
+    steps:
+    - uses: actions/checkout@v4
+    - name: Get dependencies
+      run: |
+        sudo apt update && sudo apt upgrade -y
+        sudo mk/linux/setupBuildDeps.sh
+        sudo apt install -y --no-install-recommends meson
+        # Using pip is only required if a newer version of meson is required
+        # sudo apt-get install -y python3-pip python3-setuptools # required for pip
+        # sudo -H python3 -m pip install meson ninja
+    - name: Build
+      run:  |
+        mk/test-meson-build.sh
+
+  freebsd:
+    runs-on: ubuntu-latest
+    name: FreeBSD
+    steps:
+    - uses: actions/checkout@v4
+    - name: Test in FreeBSD
+      id: test
+      uses: vmactions/freebsd-vm@v1
+      with:
+        usesh: true
+        prepare: |
+          pkg install -y \
+            bash \
+            meson \
+            cmake \
+            cppunit \
+            curl \
+            freetype2 \
+            fribidi \
+            ftgl \
+            git \
+            glew \
+            jpeg-turbo \
+            libGLU \
+            libircclient \
+            libogg \
+            libvorbis \
+            libX11 \
+            libxml2 \
+            lua53 \
+            mesa-libs \
+            miniupnpc \
+            openal-soft \
+            pkgconf \
+            png \
+            sdl2 \
+            wx30-gtk3
+
+        run: |
+          git config --global --add safe.directory /home/runner/work/megaglest-source/megaglest-source
+          cd /usr/local/bin
+          ln -s wxgtk3u-3.0-config wx-config
+          cd -
+          mk/test-meson-build.sh
+
+  build-macos:
+    runs-on: macos-latest
+    steps:
+    - uses: actions/checkout@v4
+
+    - name: Get dependencies
+      run: |
+        mk/macos/setupBuildDeps.sh
+
+    - name: Build MegaGlest With Clang Compiler
+      run: |
+        mk/test-meson-build.sh

.gitignore

@@ -100,3 +100,7 @@ $RECYCLE.BIN/
 *.msi
 *.pdb
 #
+
+# meson
+subprojects/*
+!subprojects/*.wrap

meson.build

@@ -0,0 +1,30 @@
+project(
+    'MegaGlest',
+    ['c', 'cpp'],
+    version: '3.13.0.999',
+    meson_version: '>= 0.55.0',
+    default_options: [
+        'warning_level=1',
+        'buildtype=debugoptimized',
+        'cpp_std=c++11',
+    ],
+)
+
+# Setup compiler.
+cxx = meson.get_compiler('cpp')
+cc = meson.get_compiler('c')
+
+extra_flags = [
+    '-fno-common',
+    '-Werror=odr',
+    '-Werror=lto-type-mismatch',
+    # '-Werror=strict-aliasing',
+    '-DUSE_FTGL',
+    '-DUSE_STREFLOP',
+    '-DSTREFLOP_SSE',
+]
+
+add_project_arguments(cc.get_supported_arguments(extra_flags), language: 'c')
+add_project_arguments(cxx.get_supported_arguments(extra_flags), language: 'cpp')
+
+subdir('source')

mk/macos/setupBuildDeps.sh

@@ -13,10 +13,12 @@ brew install cmake \
     libogg \
     libpng \
     libvorbis \
-    lua \
+    [email protected] \
+    meson \
     miniupnpc \
     pkg-config \
     sdl2 \
     wxwidgets \
+    xinit \
     xorg-server \
     zstd

mk/test-meson-build.sh

@@ -0,0 +1,38 @@
+#!/bin/sh
+
+set -e
+
+HERE="$(readlink -f "$(dirname "$0")")"
+SOURCE_ROOT="$HERE/.."
+BUILD_DIR="${BUILD_DIR:-$HERE/_build}"
+
+# Ensure BUILD_DIR is an absolute path
+[ "${BUILD_DIR#/}" != "$BUILD_DIR" ] || { echo "Error: BUILD_DIR must be an absolute path!"; exit 1; }
+
+# Detect OS type
+OS_TYPE="$(uname -s)"
+
+if [ ! -d "$BUILD_DIR" ]; then
+  cd "$SOURCE_ROOT"
+  meson setup "$BUILD_DIR" "$@"
+fi
+
+cd "$HERE"
+
+meson compile -C "$BUILD_DIR"
+
+GAME_BIN="$BUILD_DIR/source/glest_game/megaglest"
+EDITOR_BIN="$BUILD_DIR/source/glest_map_editor/megaglest_editor"
+VIEWER_BIN="$BUILD_DIR/source/g3d_viewer/megaglest_g3d_viewer"
+
+# Determine the correct directory based on OS
+if [ "$OS_TYPE" = "Darwin" ]; then
+  TARGET_DIR="$HERE/macos"
+else
+  TARGET_DIR="$HERE/linux"
+fi
+
+# Move binaries to the correct directory
+for bin in "$GAME_BIN" "$EDITOR_BIN" "$VIEWER_BIN"; do
+  mv -vf "$bin" "$TARGET_DIR"
+done

source/g3d_viewer/meson.build

@@ -0,0 +1,42 @@
+src_g3d_viewer = [
+    'main.cpp',
+    'renderer.cpp',
+    '../glest_game/global/config.cpp',
+    '../glest_game/graphics/unit_particle_type.cpp',
+    '../glest_game/graphics/particle_type.cpp',
+]
+
+inc_common = [
+    '../shared_lib/include/graphics',
+    '../shared_lib/include/platform/sdl',
+    '../shared_lib/include/platform/common',
+    '../shared_lib/include/util',
+    '../shared_lib/include/xml',
+    '../shared_lib/include/map',
+    '../shared_lib/include/graphics/gl',
+    '../shared_lib/include/sound',
+    '../glest_game/global',
+    '../glest_game/game',
+    '../glest_game/graphics',
+    '../glest_game/facilities',
+    '../glest_game/sound',
+]
+
+executable(
+    'megaglest_g3d_viewer',
+    src_g3d_viewer,
+    include_directories: inc_common,
+    dependencies: [
+        dep_libmegaglest,
+        dep_wx,
+        dep_sdl,
+        dep_gl,
+        dep_x11,
+        dep_jpeg,
+        dep_png,
+        dep_glew,
+    ],
+    #   cpp_args: [
+    #     '-DNDEBUG',
+    #     ]
+)