Add meson build system

.editorconfig

@@ -15,3 +15,7 @@ root = true
 end_of_line = lf
 insert_final_newline = true
 charset = utf-8
+
+[meson.build]
+indent_style = space
+indent_size = 2

.github/workflows/cmake.yml

@@ -209,4 +209,3 @@ jobs:
         name: megaglest-x64-macos
         retention-days: 1
         path: release/*.tar.bz2
-

.github/workflows/meson.yml

@@ -0,0 +1,127 @@
+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:
+  linux:
+    runs-on: ubuntu-24.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
+
+  #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
+
+  MSYS:
+    runs-on: windows-latest
+    steps:
+    - uses: actions/checkout@v4
+    - uses: msys2/setup-msys2@v2
+      with:
+        msystem: mingw64
+        install: >-
+          bison
+          dos2unix
+          flex
+          git
+        pacboy: >-
+          gcc:p
+          cmake:p
+          ninja:p
+          pkgconf:p
+          python-certifi:p
+        update: true
+
+    - name: Install dependencies
+      shell: msys2 {0}
+      run: |
+        pacman --noconfirm --needed -S \
+          mingw-w64-x86_64-libpng \
+          mingw-w64-x86_64-meson \
+          mingw-w64-x86_64-SDL2
+
+    - name: Build
+      shell: msys2 {0}
+      run: |
+        mk/test-meson-build.sh
+

.gitignore

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

meson.build

@@ -0,0 +1,69 @@
+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',
+    'b_ndebug=true',
+  ],
+)
+# -Db_ndebug=true | Disable assertions.
+# Normally meson will add _GLIBCXX_ASSERTIONS to the build flags. When that's
+# added, multiplayer network games will crash after starting.
+
+# Setup compiler.
+cxx = meson.get_compiler('cpp')
+cc = meson.get_compiler('c')
+
+# OS name reference chart
+#https://mesonbuild.com/Reference-tables.html#operating-system-names
+#
+# s_posix = host_machine.system() not in ['windows', 'emscripten', 'android']
+host_system = host_machine.system()
+
+# Compiler id reference chart
+# https://mesonbuild.com/Reference-tables.html#compiler-ids
+#
+#if cxx.get_id() == 'msvc'
+
+extra_flags = [
+  '-fno-common',
+  '-Werror=odr',
+  '-Werror=lto-type-mismatch',
+  '-fno-strict-aliasing',
+  # '-Werror=strict-aliasing',
+  '-DHAVE_SYS_IOCTL_H',
+]
+
+# Defined in cmake but I didn't find references in the source code
+# '-DX11_AVAILABLE'
+# -DHAVE_FONTCONFIG'
+
+add_project_arguments(cc.get_supported_arguments(extra_flags), language: 'c')
+add_project_arguments(cxx.get_supported_arguments(extra_flags), language: 'cpp')
+
+git = find_program('git')
+git_version = 'unversioned'
+if git.found()
+  git_version = run_command(
+    [git, 'rev-parse', '--short', 'HEAD'],
+    capture: true,
+    check: true,
+  )
+endif
+gitver = configuration_data()
+gitver.set_quoted('GITVERSION', git_version.stdout().strip())
+gitversion_h = configure_file(output: 'gitversion.h', configuration: gitver)
+
+# Macros will be written to config.h later when configure_file() runs
+conf = configuration_data()
+conf.set('MESON_BUILD', 1)
+
+subdir('source')
+
+# The config.h file finally is output here, all the data assigned by
+# conf.set() will be written to it.
+config_h = configure_file(output: 'config_whole.h', configuration: conf)

meson_options.txt

@@ -0,0 +1,7 @@
+# Build options
+option('build_game', type: 'boolean', value: true, description: 'Build editor')
+option('build_editor', type: 'boolean', value: true, description: 'Build the map editor')
+option('build_viewer', type: 'boolean', value: true, description: 'Build the g3d viewer')
+
+#option('docdir', type : 'string', value : 'share/doc/megaglest',
+#       description : 'directory where the documentation should be installed to')

mk/macos/setupBuildDeps.sh

@@ -14,9 +14,11 @@ brew install cmake \
     libpng \
     libvorbis \
     lua \
+    meson \
     miniupnpc \
     pkg-config \
     sdl2 \
     wxwidgets \
+    xinit \
     xorg-server \
     zstd

mk/test-meson-build.sh

@@ -0,0 +1,44 @@
+#!/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)"
+
+SETUP_OPTS="${BUILD_DIR} ${@}"
+
+cd "$SOURCE_ROOT"
+if [ ! -d "$BUILD_DIR" ]; then
+  meson setup ${SETUP_OPTS}
+else
+  meson setup --reconfigure ${SETUP_OPTS}
+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
+  if [ -f "$bin" ]; then
+    mv -vf "$bin" "$TARGET_DIR"
+  fi
+done

source/config_whole.h

@@ -0,0 +1,6 @@
+// This file is used for the cmake file and is used now as a placeholder.
+// The meson build generates this automatically
+
+#pragma once
+
+

source/g3d_viewer/CMakeLists.txt

@@ -169,6 +169,7 @@ IF(BUILD_MEGAGLEST_MODEL_VIEWER)
 	ENDIF()
 
 	INCLUDE_DIRECTORIES(${GLEST_LIB_INCLUDE_DIRS})
+	INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/source) # For config_whole.h
 
 	IF(WIN32)
 		INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/source/shared_lib/include/platform/win32)

source/g3d_viewer/meson.build

@@ -0,0 +1,32 @@
+src_viewer = [
+  'main.cpp',
+  'renderer.cpp',
+  '../glest_game/global/config.cpp',
+  '../glest_game/graphics/unit_particle_type.cpp',
+  '../glest_game/graphics/particle_type.cpp',
+]
+
+# Some includes from the game are required for the viewer.
+# Other required includes are imported from the dep_libmegaglest object
+inc_viewer = [
+  '../glest_game/global',
+  '../glest_game/game',
+  '../glest_game/graphics',
+  '../glest_game/facilities',
+  '../glest_game/sound',
+]
+
+executable(
+  'megaglest_g3d_viewer',
+  src_viewer,
+  include_directories: inc_viewer,
+  dependencies: [
+    dep_libmegaglest,
+    wx_dep,
+    gl_dep,
+    x11_dep,
+    jpeg_dep,
+    png_dep,
+    glew_dep,
+  ],
+)

source/glest_game/CMakeLists.txt

@@ -210,6 +210,7 @@ IF(WANT_USE_STREFLOP AND NOT STREFLOP_FOUND)
 ENDIF()
 
 INCLUDE_DIRECTORIES( ${GLEST_LIB_INCLUDE_DIRS} )
+INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/source) # For config_whole.h
 
 #INCLUDE_DIRECTORIES( ${GLEST_LIB_INCLUDE_ROOT}platform/${SDL_VERSION_SNAME} )
 

source/glest_game/facilities/game_util.cpp

@@ -9,6 +9,11 @@
 //	License, or (at your option) any later version
 // ==============================================================
 
+// This condition can be removed after the cmake build is deprecated
+#ifdef MESON_BUILD
+#include "gitversion.h"
+#endif
+
 #include "game_util.h"
 
 #include "util.h"
@@ -35,9 +40,11 @@ const char *mailString				= " http://bugs.megaglest.org";
 const string glestVersionString 	= "v3.13-dev";
 const string lastCompatibleSaveGameVersionString 	= "v3.11.1";
 
+// This won't be needed after the cmake build is deprecated
 #if defined(GITVERSIONHEADER)
 	#include "gitversion.h"
 #endif
+
 #if defined(GITVERSION) || defined(GITVERSIONHEADER)
 	const string GIT_RawRev		= string(GITVERSION);
 #else