Merge branch 'master' into refactor/enums_commonh

Author: tederis

.github/workflows/build.yaml

@@ -70,15 +70,10 @@ jobs:
     strategy:
       matrix:
         architecture: [x64, arm64]
-        include:
-        - architecture: x64
-          image-tag: latest
-        - architecture: arm64
-          image-tag: arm64
     name: linux-${{ matrix.architecture }}
     runs-on: ubuntu-latest
     container:
-      image: docker://ghcr.io/multitheftauto/mtasa-blue-build:${{ matrix.image-tag }}
+      image: docker://ghcr.io/multitheftauto/mtasa-blue-build:latest
     steps:
       - uses: actions/checkout@v4
 

.github/workflows/dockerimage.yaml

@@ -8,25 +8,10 @@ on:
     paths: 
     - '.github/workflows/build.yaml'
     - '.github/workflows/dockerimage.yaml'
-    - 'utils/compat/**'
-    - 'Dockerfile'
-    - 'Dockerfile.i386'
-    - 'Dockerfile.armhf'
-    - 'Dockerfile.arm64'
+    - 'utils/docker/**'
 
 jobs:
   build:
-    strategy:
-      matrix:
-        include:
-        - tag: latest
-          dockerfile: Dockerfile
-        - tag: i386
-          dockerfile: Dockerfile.i386
-        - tag: armhf
-          dockerfile: Dockerfile.armhf
-        - tag: arm64
-          dockerfile: Dockerfile.arm64
     if: github.event.repository.fork == false
     runs-on: ubuntu-latest
     steps:
@@ -40,5 +25,5 @@ jobs:
     - uses: docker/build-push-action@v5
       with:
         push: true
-        file: ./${{ matrix.dockerfile }}
-        tags: ghcr.io/multitheftauto/mtasa-blue-build:${{ matrix.tag }}
+        context: utils/docker
+        tags: ghcr.io/multitheftauto/mtasa-blue-build:latest

Dockerfile

@@ -4,10 +4,6 @@
 
 [Multi Theft Auto](https://www.multitheftauto.com/) (MTA) is a software project that adds network play functionality to Rockstar North's Grand Theft Auto game series, in which this functionality is not originally found. It is a unique modification that incorporates an extendable network play element into a proprietary commercial single-player PC game.
 
-> **Note**
-> If you're a fork developer, please read this note carefully. We have changed the default build type back to *CUSTOM* in `Shared/sdk/version.h`. If you're developing without the anti-cheat in mind, say in the Debug configuration, this doesn't affect you at all. Now, if you plan to test your custom client with anti-cheat enabled, you should change your build type to `UNTESTED`. If you want to publish a release of your custom client, you must switch to a *fork support* hardened release of `netc.dll`.
-> Please read our [Forks_Full_AC](https://wiki.multitheftauto.com/wiki/Forks_Full_AC) wiki page for more information.
-
 ## Introduction
 
 Multi Theft Auto is based on code injection and hooking techniques whereby the game is manipulated without altering any original files supplied with the game. The software functions as a game engine that installs itself as an extension of the original game, adding core functionality such as networking and GUI rendering while exposing the original game's engine functionality through a scripting language.
@@ -58,13 +54,10 @@ You can build the MTA:SA server on GNU/Linux distributions only for x86, x86_64,
 
 **Build dependencies**
 
-*Please always read the Dockerfiles for up-to-date build dependencies.*
-*Note: ncftp is not required for building the MTA:SA server.*
+*Please always read the utils/docker/Dockerfile for up-to-date build dependencies.*
 
-- git
 - make
 - GNU GCC compiler (version 10 or newer)
-- libncursesw6
 - libncurses-dev
 - libmysqlclient-dev
 
@@ -73,15 +66,17 @@ You can build the MTA:SA server on GNU/Linux distributions only for x86, x86_64,
 **Note:** This script always deletes `Build/` and `Bin/` directories and does a clean build.
 
 ```sh
-$ ./linux-build.sh [--arch=x86|x64|arm|arm64] [--config=debug|release]
+$ ./linux-build.sh [--arch=x86|x64|arm|arm64] [--config=debug|release] [--cores=<n>]
 $ ./linux-install-data.sh  # optional step
 ```
 
 If build architecture `--arch` is not provided, then it's taken from the environment variable `BUILD_ARCHITECTURE` (defaults to: x64).
 
 If build configuration `--config` is not provided, then it's taken from the environment variable `BUILD_CONFIG` (defaults to: release).
 
-If you are trying to **cross-compile** to another architecture, then set `AR`, `CC`, `CXX`, `GCC_PREFIX` environment variables accordingly (see Dockerfile.arm64 for an example).
+If the number of jobs `--cores` is not provided, then the build will default to the amount of CPU cores.
+
+If you are trying to **cross-compile** to another architecture, then set `AR`, `CC`, `CXX`, `GCC_PREFIX` environment variables accordingly (see `utils/docker/Dockerfile` for an example).
 
 **Build instructions: Manual**
 
@@ -103,23 +98,23 @@ If you have problems resolving the required dependencies or want maximum compati
 $ docker pull ghcr.io/multitheftauto/mtasa-blue-build:latest
 ```
 
-| Architecture | Docker image tag |
-| ------------ | ---------------- |
-| x86_64       | latest           |
-| x86          | i386             |
-| arm          | armhf            |
-| arm64        | arm64            |
-
 **Building with Docker**
 
-These examples assume that your current directory is the mtasa-blue checkout directory. You should also know that `/build` is the code directory required by our Docker images inside the container. If the current directory is not a valid git repository, it instead create a (shallow) clone of the mtasa-blue repository. After compiling, you will find the resulting binaries in `./Bin`. To build the unoptimised debug build, add `-e BUILD_CONFIG=debug` to the docker run arguments.
+These examples assume that your current directory is the mtasa-blue checkout directory. You should also know that `/build` is the code directory required by our Docker image inside the container. After compiling, you will find the resulting binaries in `./Bin`. To build the unoptimised debug build, add `--config=debug` to the docker run arguments.
+
+```sh
+# x86_64
+docker run --rm -v `pwd`:/build ghcr.io/multitheftauto/mtasa-blue-build:latest --arch=x64
+
+# x86
+docker run --rm -v `pwd`:/build ghcr.io/multitheftauto/mtasa-blue-build:latest --arch=x86
 
-| Architecture | Build command                                                                          |
-| ------------ | -------------------------------------------------------------------------------------- |
-| x86_64       | ``` docker run --rm -v `pwd`:/build ghcr.io/multitheftauto/mtasa-blue-build:latest ``` |
-| x86          | ``` docker run --rm -v `pwd`:/build ghcr.io/multitheftauto/mtasa-blue-build:i386 ```   |
-| arm          | ``` docker run --rm -v `pwd`:/build ghcr.io/multitheftauto/mtasa-blue-build:armhf ```  |
-| arm64        | ``` docker run --rm -v `pwd`:/build ghcr.io/multitheftauto/mtasa-blue-build:arm64 ```  |
+# arm
+docker run --rm -v `pwd`:/build ghcr.io/multitheftauto/mtasa-blue-build:latest --arch=arm
+
+# arm64
+docker run --rm -v `pwd`:/build ghcr.io/multitheftauto/mtasa-blue-build:latest --arch=arm64
+```
 
 ### Premake FAQ
 
@@ -131,4 +126,4 @@ Execute `win-create-projects.bat`
 
 Unless otherwise specified, all source code hosted on this repository is licensed under the GPLv3 license. See the [LICENSE](./LICENSE) file for more details.
 
-Grand Theft Auto and all related trademarks are © Rockstar North 1997–2024.
+Grand Theft Auto and all related trademarks are © Rockstar North 1997–2025.