Merge branch 'development'

Author: garethyr

.github/workflows/build-check.yml

@@ -2,30 +2,33 @@ name: Compile check
 
 # Controls when the action will run.
 on:
-  # Triggers the workflow on push or pull request events but only for the development branch
+  # Triggers the workflow for pushes to master or development, for pull request events, and for the merge queue
   push:
     branches: [master, development]
   pull_request:
     types: [opened, reopened, ready_for_review, synchronize]
+  merge_group:
+    types: [checks_requested]
 
   workflow_dispatch:
 
 jobs:
   build-linux:
     # The type of runner that the job will run on
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
 
 
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v2
-      - uses: actions/setup-python@v2
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v3
 
       - name: Install Dependencies
         run: |
           sudo apt-get update -yq
-          sudo apt-get install --no-install-recommends liballegro4-dev libloadpng4-dev libflac++-dev luajit-5.1-dev liblua5.2-dev libminizip-dev liblz4-dev libpng++-dev libx11-dev libboost-dev
+          sudo apt-get install --no-install-recommends 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 ninja-build
+          sudo pip install meson==0.60.3
 
       - name: Install Clang
         # You may pin to the exact commit or the version.
@@ -35,26 +38,33 @@ jobs:
           # Set up cc/c++ executables
           cc: 1 # optional, default is 1
 
-      - name: Setup ccache
-        uses: hendrikmuhs/ccache-action@v1
-        with:
-          key: build-check-${{runner.os}}-regressed
-          max-size: 5G
+      - name: Build
+        env:
+          CC: "gcc"
+          CXX: "g++"
+        run: |
+          meson setup --buildtype=debug -Ddebug_type=full build
+          meson compile -C build
+
+  build-macos:
+    runs-on: macos-latest
+
+
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v3
+
+      - name: Install Dependencies
+        run: |
+          brew install pkg-config tbb sdl2 minizip lz4 flac luajit [email protected] libpng gcc@12 ninja meson
 
       - name: Build
-        # You may pin to the exact commit or the version.
-        # uses: BSFishy/meson-build@6f1930d878fd3eed3853c1c91285ec604c37f3a5
-        uses: BSFishy/[email protected]
         env:
-          CC: "clang"
-          CXX: "clang++"
-          CCACHE_SLOPPINESS: pch_defines,time_macros,include_file_mtime,include_file_ctime
-        with:
-          # The action to run
-          setup-options: --buildtype=debug -Ddebug_type=full
-          meson-version: 0.55.3
-          ninja-version: 1.10.0
-          action: build
+          CC: "gcc-12"
+          CXX: "g++-12"
+        run: |
+          meson setup --buildtype=debug -Ddebug_type=full build
+          meson compile -C build
 
   build-windows:
     env:
@@ -69,7 +79,7 @@ jobs:
     runs-on: windows-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
 
     - name: Add MSBuild to PATH
       uses: microsoft/setup-msbuild@v1

.github/workflows/meson.yml

@@ -1,4 +1,4 @@
-name: Linux Build
+name: Meson Build (Linux, macOS)
 # Controls when the action will run.
 on:
   # Triggers the workflow on push or pull request events but only for the development branch
@@ -13,19 +13,20 @@ jobs:
   # This workflow contains a single job called "build"
   build-release-linux:
     # The type of runner that the job will run on
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
 
 
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v2
-      - uses: actions/setup-python@v2
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v3
 
       - 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
+          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==0.60.0
 
       - name: Install Clang
         # You may pin to the exact commit or the version.
@@ -35,26 +36,13 @@ jobs:
           # Set up cc/c++ executables
           cc: 1 # optional, default is 1
 
-      - name: Setup ccache
-        uses: hendrikmuhs/ccache-action@v1
-        with:
-          key: build-release-${{runner.os}}
-          max-size: 5G
-
       - name: Build
-        # You may pin to the exact commit or the version.
-        # uses: BSFishy/meson-build@6f1930d878fd3eed3853c1c91285ec604c37f3a5
-        uses: BSFishy/[email protected]
         env:
-          CC: "clang"
-          CXX: "clang++"
-          CCACHE_SLOPPINESS: pch_defines,time_macros,include_file_mtime,include_file_ctime
-        with:
-          # The action to run
-          setup-options: --buildtype=release -Dinstall_data=false -Dinstall_runner=false -Dfmod_dir=/usr/lib/ --prefix=/usr/
-          meson-version: 0.55.3
-          ninja-version: 1.10.0
-          action: build
+          CC: "gcc"
+          CXX: "g++"
+        run: |
+          meson setup --buildtype=release -Dinstall_data=false -Dinstall_runner=false -Dfmod_dir=/usr/lib/ --prefix=/usr/ build
+          meson compile -C build
 
       - name: Create AppDir
         run: |
@@ -77,79 +65,33 @@ jobs:
           ./lindeploy --appdir=build/AppDir --output appimage
 
       - name: Upload Appimage
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
-          name: CortexCommand.AppImage
+          name: CortexCommand (Linux)
           path: CortexCommand.AppImage
 
+  build-release-macos:
+    runs-on: macos-latest
 
-  build-debug-linux:
-    # The type of runner that the job will run on
-    runs-on: ubuntu-20.04
-
-
-    # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
-      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v2
-      - uses: actions/setup-python@v2
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v3
 
       - 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 libminizip-dev liblz4-dev libpng++-dev libx11-dev libboost-dev
-
-      - name: Install Clang
-        # You may pin to the exact commit or the version.
-        # uses: egor-tensin/setup-clang@d16e36d5f8a7eb00aa6627c1a536d94dfc4a913d
-        uses: egor-tensin/setup-clang@v1
-        with:
-          # Set up cc/c++ executables
-          cc: 1 # optional, default is 1
-
-      - name: Setup ccache
-        uses: hendrikmuhs/ccache-action@v1
-        with:
-          key: build-release-${{runner.os}}
-          max-size: 5G
+          brew install pkg-config tbb sdl2 minizip lz4 flac luajit [email protected] libpng gcc ninja meson
 
       - name: Build
-        # You may pin to the exact commit or the version.
-        # uses: BSFishy/meson-build@6f1930d878fd3eed3853c1c91285ec604c37f3a5
-        uses: BSFishy/[email protected]
         env:
-          CC: "clang"
-          CXX: "clang++"
-          CCACHE_SLOPPINESS: pch_defines,time_macros,include_file_mtime,include_file_ctime
-        with:
-          # The action to run
-          setup-options: -Ddebug=true --optimization=g -Dinstall_data=false -Dinstall_runner=false -Dfmod_dir=/usr/lib/ --prefix=/usr/ -Ddebug_type=release
-          meson-version: 0.55.3
-          ninja-version: 1.10.0
-          action: build
-
-      - name: Create AppDir
+          CC: "gcc-12"
+          CXX: "g++-12"
+          LDFLAGS: "-static-libgcc -static-libstdc++"
         run: |
-          echo "Setting output prefix"
-          DESTDIR=${GITHUB_WORKSPACE}/build/AppDir meson install -C $GITHUB_WORKSPACE"/build"
+          meson setup --buildtype=release -Ddebug_type=release build
+          meson compile -C build
 
-      - name: Download linuxdeploy
-        working-directory: ${{env.GITHUB_WORKSPACE}}
-        run: |
-          wget https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage -O lindeploy
-          chmod +x lindeploy
-
-      - name: Create AppImage
-        working-directory: ${{env.GITHUB_WORKSPACE}}
-        env:
-          LD_LIBRARY_PATH: ./external/lib/linux/x86_64/
-          OUTPUT: CortexCommand-debug.AppImage
-        run: |
-          echo ${LD_LIBRARY_PATH}
-          ./lindeploy --appdir=build/AppDir --output appimage
-
-      - name: Upload Appimage
-        uses: actions/upload-artifact@v2
+      - name: Artifact Deploy
+        uses: actions/upload-artifact@v3
         with:
-          name: CortexCommand-debug.AppImage
-          path: CortexCommand-debug.AppImage
+          name: CortexCommand (macOS)
+          path: build/CortexCommand

.github/workflows/msbuild.yml

@@ -22,7 +22,7 @@ jobs:
     runs-on: windows-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
 
     - name: Add MSBuild to PATH
       uses: microsoft/setup-msbuild@v1
@@ -34,7 +34,7 @@ jobs:
       run: msbuild /m /p:Configuration="${{env.BUILD_CONFIGURATION}}" ${{env.SOLUTION_FILE_PATH}}
 
     - name: Upload Artifact2
-      uses: actions/upload-artifact@v2.2.2
+      uses: actions/upload-artifact@v3
       with:
         name: Cortex Command.exe
         path: D:/a/Cortex-Command-Community-Project-Source/Cortex-Command-Community-Project-Data/Cortex Command x64.exe

.gitignore

@@ -6,15 +6,20 @@
 *.obj
 *.vs
 *.APS
+*.user
 
 compile_commands.json
 /.ccls-cache
 
 /build*
 
+/enc_temp_folder
+
 /_Bin
 /NATPunchServer/Server/NATCompleteServer/Debug
 /NATPunchServer/Server/NATCompleteServer/Release
 /Documentation/Doxygen/Output
 MemCleanupInfo.txt
-RTEA.vcxproj.user
+RTEA.vcxproj.user
+.DS_Store
+.vscode