BeamMP/BeamMP-Server
1
0
Fork 0
mirror of https://github.com/BeamMP/BeamMP-Server.git synced 2026-05-18 23:50:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix build (#444)

Browse Source 
By creating this pull request, I understand that code that is AI
generated or otherwise automatically generated may be rejected without
further discussion.
I declare that I fully understand all code I pushed into this PR, and
wrote all this code myself and own the rights to this code.
This commit is contained in:
Tixx
2025-12-20 20:13:15 +01:00
committed by GitHub
parent 184d50bf8c add45c085b
commit 420c64f6cf
6 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/linux.yml
+2 -4
View File
@@ -19,8 +19,6 @@ jobs:
strategy: strategy:
matrix: matrix:
include: include:
- distro: debian
version: 11
- distro: debian - distro: debian
version: 12 version: 12
- distro: ubuntu - distro: ubuntu
@@ -48,6 +46,7 @@ jobs:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
with: with:
submodules: 'recursive' submodules: 'recursive'
fetch-depth: 0
- name: Git config safe directory - name: Git config safe directory
shell: bash shell: bash
@@ -90,8 +89,6 @@ jobs:
strategy: strategy:
matrix: matrix:
include: include:
- distro: debian
version: 11
- distro: debian - distro: debian
version: 12 version: 12
- distro: ubuntu - distro: ubuntu
@@ -119,6 +116,7 @@ jobs:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
with: with:
submodules: 'recursive' submodules: 'recursive'
fetch-depth: 0
- name: Git config safe directory - name: Git config safe directory
shell: bash shell: bash
.github/workflows/release.yml
+3 -4
View File
@@ -38,8 +38,6 @@ jobs:
strategy: strategy:
matrix: matrix:
include: include:
- distro: debian
version: 11
- distro: debian - distro: debian
version: 12 version: 12
- distro: ubuntu - distro: ubuntu
@@ -67,6 +65,7 @@ jobs:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
with: with:
submodules: 'recursive' submodules: 'recursive'
fetch-depth: 0
- name: Git config safe directory - name: Git config safe directory
shell: bash shell: bash
@@ -109,8 +108,6 @@ jobs:
strategy: strategy:
matrix: matrix:
include: include:
- distro: debian
version: 11
- distro: debian - distro: debian
version: 12 version: 12
- distro: ubuntu - distro: ubuntu
@@ -141,6 +138,7 @@ jobs:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
with: with:
submodules: 'recursive' submodules: 'recursive'
fetch-depth: 0
- name: Git config safe directory - name: Git config safe directory
shell: bash shell: bash
@@ -194,6 +192,7 @@ jobs:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
with: with:
submodules: 'recursive' submodules: 'recursive'
fetch-depth: 0
- name: Create Build Environment - name: Create Build Environment
shell: bash shell: bash
.github/workflows/windows.yml
+1
View File
@@ -26,6 +26,7 @@ jobs:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
with: with:
submodules: 'recursive' submodules: 'recursive'
fetch-depth: 0
- name: Setup vcpkg - name: Setup vcpkg
uses: lukka/run-vcpkg@v11 uses: lukka/run-vcpkg@v11
CMakeLists.txt
+2 -1
View File
@@ -148,7 +148,8 @@ if(UNIX)
endif(UNIX) endif(UNIX)
if (WIN32) if (WIN32)
add_compile_options("-D_WIN32_WINNT=0x0601") add_compile_definitions(_WIN32_WINNT=0x0A00)
add_compile_options("/bigobj") add_compile_options("/bigobj")
endif(WIN32) endif(WIN32)
vcpkg
+1 -1
Submodule vcpkg updated: 6353ece09f...5bf0c55239
vcpkg.json
+8 -1
View File
@@ -15,5 +15,12 @@
"rapidjson", "rapidjson",
"sol2", "sol2",
"curl" "curl"
] ],
"overrides": [
{
"name": "sol2",
"version": "3.3.1"
}
],
"builtin-baseline": "5bf0c55239da398b8c6f450818c9e28d36bf9966"
} }