Merge remote-tracking branch 'source/development' into development

# Conflicts:
#	System/Constants.h

Author: traunts

.github/parameters/macports.yml

@@ -0,0 +1,14 @@
+version: "2.8.1"
+prefix: "/opt/local"
+ports:
+  - name: gcc13
+  - name: pkgconfig
+  - name: meson
+  - name: libsdl2
+  - name: onetbb
+  - name: lz4
+  - name: libpng
+  - name: minizip
+  - name: luajit
+  - name: flac
+  - name: dylibbundler

.github/workflows/meson.yml

@@ -38,17 +38,13 @@ on:
         type: string
         required: false
         default: "release"
-      debug_level:  # "full" | "minimal" | "release" 
+      debug_level: # "full" | "minimal" | "release"
         type: string
         required: false
         default: "release"
 
-env: 
-  MESON_VERSION: "0.60.3"
-
 jobs:
   build-linux:
-
     runs-on: ubuntu-latest
     name: Linux Build
 
@@ -60,30 +56,30 @@ jobs:
       - name: Install Dependencies
         run: |
           sudo apt-get update -yq
-          sudo apt-get install --no-install-recommends wget liballegro4-dev libloadpng4-dev libflac++-dev luajit-5.1-dev liblua5.2-dev libminizip-dev liblz4-dev libpng++-dev libx11-dev libboost-dev libtbb-dev libsdl2-dev libopengl-dev libfuse2 ninja-build
-          sudo pip install meson==${{env.MESON_VERSION}}
+          sudo apt-get install --no-install-recommends wget liballegro4-dev libloadpng4-dev libflac++-dev luajit-5.1-dev liblua5.2-dev libminizip-dev liblz4-dev libpng++-dev libx11-dev libboost-dev libtbb-dev libsdl2-dev libsdl2-image-dev libopengl-dev libfuse2 ninja-build
+          sudo pip install meson
 
       - name: Setup Meson
         env:
           CC: "gcc"
           CXX: "g++"
         run: |
-          meson setup --buildtype=${{inputs.build_type}} -Ddebug_type=${{inputs.debug_level}} build
+          meson setup --buildtype=${{inputs.build_type}} -Ddebug_type=${{inputs.debug_level}} -Db_lto=true build
 
       - name: Configure for AppImage
         if: ${{inputs.upload_artefacts}}
         env:
           CC: "gcc"
           CXX: "g++"
         run: meson configure -Dinstall_data=false -Dinstall_runner=false -Dfmod_dir=/usr/lib/ --prefix=/usr/ build
-          
+
       - name: Build
         env:
           CC: "gcc"
           CXX: "g++"
         run: |
           meson compile -C build
-        
+
       - name: Create AppDir
         if: ${{inputs.upload_artefacts}}
         run: |
@@ -116,32 +112,91 @@ jobs:
           if-no-files-found: error
 
   build-macos:
-    runs-on: macos-latest
+    runs-on: macos-11
     name: MacOS Build
-
+        
+    env:
+      GCC_VERSION: "13"
+      MACOSX_DEPLOYMENT_TARGET: 10.15
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v3
 
-      - name: Install Dependencies
+      - name: "Install Dependencies"
+        uses: melusina-org/setup-macports@v1
+        with: 
+          parameters:  ".github/parameters/macports.yml"
+
+      - name: Setup Meson
+        env:
+          CC: "gcc-${{env.GCC_VERSION}}"
+          CXX: "g++-${{env.GCC_VERSION}}"
+          LDFLAGS: "-static-libgcc -static-libstdc++"
+        run: |
+          meson setup --buildtype=${{inputs.build_type}} -Ddebug_type=${{inputs.debug_level}} -Db_lto=false build
+
+      - name: Configure for App Bundle
+        if: ${{inputs.upload_artefacts}}
+        env:
+          CC: "gcc-${{env.GCC_VERSION}}"
+          CXX: "g++-${{env.GCC_VERSION}}"
+          LDFLAGS: "-static-libgcc -static-libstdc++"
         run: |
-          brew install pkg-config tbb sdl2 minizip lz4 flac luajit [email protected] libpng gcc@12 ninja meson
-          
+          meson configure \
+          -Dinstall_data=false -Dinstall_runner=false -Dfmod_dir=Contents/Frameworks \
+          --bindir=Contents/MacOS \
+          --prefix="/" \
+          build
+
       - name: Build
         env:
-          CC: "gcc-12"
-          CXX: "g++-12"
+          CC: "gcc-${{env.GCC_VERSION}}"
+          CXX: "g++-${{env.GCC_VERSION}}"
           LDFLAGS: "-static-libgcc -static-libstdc++"
         run: |
-          meson setup --buildtype=${{inputs.build_type}} -Ddebug_type=${{inputs.debug_level}}  build
           meson compile -C build
 
+      - name: Create App Bundle
+        if: ${{inputs.upload_artefacts}}
+        run: |
+          DESTDIR="/tmp/Cortex Command.app" meson install -C build
+
+      - name: Tar files
+        if: ${{inputs.upload_artefacts}}
+        run: |
+          tree /tmp/
+          cd /tmp/
+          tar -cvf CortexCommand.tar "Cortex Command.app"
+
+      - name: Move artefact
+        if: ${{inputs.upload_artefacts}}
+        run: cp /tmp/CortexCommand.tar .
+
       - name: Artifact Deploy
         if: ${{inputs.upload_artefacts}}
         uses: actions/upload-artifact@v3
         with:
           name: CortexCommand (macOS)
           path: |
-            build/CortexCommand
-            build/CortexCommand_debug
+            CortexCommand.tar
           if-no-files-found: error
+
+  build-windows:
+    runs-on: windows-latest
+    name: Windows Build
+
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v3
+
+      - name: Install Dependencies
+        run: |
+          pip install meson
+
+      - name: Setup
+        run: |
+          meson setup --buildtype=${{inputs.build_type}} -Ddebug_type=${{inputs.debug_level}} --vsenv build
+
+      - name: Build
+        run: |
+          meson compile -Cbuild

.gitignore

@@ -8,13 +8,16 @@
 *.APS
 *.user
 
+/.idea
+
 compile_commands.json
 /.ccls-cache
 
 /build*
 
 /enc_temp_folder
 
+/.idea
 /_Bin
 /NATPunchServer/Server/NATCompleteServer/Debug
 /NATPunchServer/Server/NATCompleteServer/Release

.vscode/launch.json

@@ -0,0 +1,162 @@
+{
+  // Use IntelliSense to learn about possible attributes.
+  // Hover to view descriptions of existing attributes.
+  // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "name": "meson Launch",
+      "type": "cppdbg",
+      "osx": {
+        "MIMode": "lldb"
+      },
+      "request": "launch",
+      "program": "${workspaceFolder}/${config:mesonbuild.buildFolder}/CortexCommand",
+      "cwd": "${workspaceFolder}/../Cortex-Command-Community-Project-Data",
+      "preLaunchTask": "meson Build Release",
+      "envFile": "${workspaceFolder}/${config:mesonbuild.buildFolder}/meson-vscode.env",
+      "presentation": {
+        "group": "unix"
+      }
+    },
+    {
+      "name": "meson Debug (Release)",
+      "type": "cppdbg",
+      "osx": {
+        "MIMode": "lldb"
+      },
+      "request": "launch",
+      "program": "${workspaceFolder}/${config:mesonbuild.buildFolder}/CortexCommand_debug",
+      "cwd": "${workspaceFolder}/../Cortex-Command-Community-Project-Data",
+      "preLaunchTask": "meson Build Debug (Release)",
+      "envFile": "${workspaceFolder}/${config:mesonbuild.buildFolder}/meson-vscode.env",
+      "presentation": {
+        "group": "unix"
+      }
+    },
+    {
+      "name": "meson Debug (Minimal)",
+      "type": "cppdbg",
+      "osx": {
+        "MIMode": "lldb"
+      },
+      "request": "launch",
+      "program": "${workspaceFolder}/${config:mesonbuild.buildFolder}/CortexCommand_debug",
+      "cwd": "${workspaceFolder}/../Cortex-Command-Community-Project-Data",
+      "preLaunchTask": "meson Build Debug (Minimal)",
+      "envFile": "${workspaceFolder}/${config:mesonbuild.buildFolder}/meson-vscode.env",
+      "presentation": {
+        "group": "unix"
+      }
+    },
+    {
+      "name": "meson Debug (Full)",
+      "type": "cppdbg",
+      "osx": {
+        "MIMode": "lldb"
+      },
+      "request": "launch",
+      "program": "${workspaceFolder}/${config:mesonbuild.buildFolder}/CortexCommand_debug",
+      "cwd": "${workspaceFolder}/../Cortex-Command-Community-Project-Data",
+      "preLaunchTask": "meson Build Debug (Full)",
+      "envFile": "${workspaceFolder}/${config:mesonbuild.buildFolder}/meson-vscode.env",
+      "presentation": {
+        "group": "unix"
+      }
+    },
+
+    {
+      "name": "msbuild Launch",
+      "type": "cppvsdbg",
+      "request": "launch",
+      "program": "${workspaceFolder}/../Cortex-Command-Community-Project-Data/Cortex Command.exe",
+      "cwd": "${workspaceFolder}/../Cortex-Command-Community-Project-Data",
+      "preLaunchTask": "msbuild (Final)",
+      "presentation": {
+        "group": "windows"
+      }
+    },
+    {
+      "name": "msbuild Debug (Release)",
+      "type": "cppvsdbg",
+      "request": "launch",
+      "program": "${workspaceFolder}/../Cortex-Command-Community-Project-Data/Cortex Command.debug.release.exe",
+      "cwd": "${workspaceFolder}/../Cortex-Command-Community-Project-Data",
+      "preLaunchTask": "msbuild (Debug Release)",
+      "presentation": {
+        "group": "windows"
+      }
+    },
+    {
+      "name": "msbuild Debug (Minimal)",
+      "type": "cppvsdbg",
+      "request": "launch",
+      "program": "${workspaceFolder}/../Cortex-Command-Community-Project-Data/Cortex Command.debug.minimal.exe",
+      "cwd": "${workspaceFolder}/../Cortex-Command-Community-Project-Data",
+      "preLaunchTask": "msbuild (Debug Minimal)",
+      "presentation": {
+        "group": "windows"
+      }
+    },
+    {
+      "name": "msbuild Debug (Full)",
+      "type": "cppvsdbg",
+      "request": "launch",
+      "program": "${workspaceFolder}/../Cortex-Command-Community-Project-Data/Cortex Command.debug.full.exe",
+      "cwd": "${workspaceFolder}/../Cortex-Command-Community-Project-Data",
+      "preLaunchTask": "msbuild (Debug Full)",
+      "presentation": {
+        "group": "windows"
+      }
+    },
+
+    {
+      "name": "meson Launch [Windows]",
+      "type": "cppvsdbg",
+      "request": "launch",
+      "program": "${workspaceFolder}/${config:mesonbuild.buildFolder}/Cortex Command.exe",
+      "cwd": "${workspaceFolder}/../Cortex-Command-Community-Project-Data",
+      "preLaunchTask": "meson Build Release",
+      "envFile": "${workspaceFolder}/${config:mesonbuild.buildFolder}/meson-vscode.env",
+      "presentation": {
+        "group": "windows"
+      }
+    },
+    {
+      "name": "meson Debug (Release) [Windows]",
+      "type": "cppvsdbg",
+      "request": "launch",
+      "program": "${workspaceFolder}/${config:mesonbuild.buildFolder}/Cortex Command.debug.release.exe",
+      "cwd": "${workspaceFolder}/../Cortex-Command-Community-Project-Data",
+      "preLaunchTask": "meson Build Debug (Release)",
+      "envFile": "${workspaceFolder}/${config:mesonbuild.buildFolder}/meson-vscode.env",
+      "presentation": {
+        "group": "windows"
+      }
+    },
+    {
+      "name": "meson Debug (Minimal) [Windows]",
+      "type": "cppvsdbg",
+      "request": "launch",
+      "program": "${workspaceFolder}/${config:mesonbuild.buildFolder}/Cortex Command.debug.minimal.exe",
+      "cwd": "${workspaceFolder}/../Cortex-Command-Community-Project-Data",
+      "preLaunchTask": "meson Build Debug (Minimal)",
+      "envFile": "${workspaceFolder}/${config:mesonbuild.buildFolder}/meson-vscode.env",
+      "presentation": {
+        "group": "windows"
+      }
+    },
+    {
+      "name": "meson Debug (Full) [Windows]",
+      "type": "cppvsdbg",
+      "request": "launch",
+      "program": "${workspaceFolder}/${config:mesonbuild.buildFolder}/Cortex Command.debug.full.exe",
+      "cwd": "${workspaceFolder}/../Cortex-Command-Community-Project-Data",
+      "preLaunchTask": "meson Build Debug (Full)",
+      "envFile": "${workspaceFolder}/${config:mesonbuild.buildFolder}/meson-vscode.env",
+      "presentation": {
+        "group": "windows"
+      }
+    }
+  ]
+}