mirror of
https://github.com/ModOrganizer2/mob.git
synced 2026-07-27 14:07:05 -07:00
Compare commits
2
Commits
master
...
dev/vs2026
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
5f88eeab02 | ||
|
|
74d415f2a4 |
@@ -11,7 +11,7 @@ env:
|
|||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
build:
|
build:
|
||||||
runs-on: windows-2022
|
runs-on: windows-2025-vs2026
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v6
|
- uses: actions/checkout@v6
|
||||||
- name: Build Mob
|
- name: Build Mob
|
||||||
|
|||||||
+4
-22
@@ -2,8 +2,8 @@
|
|||||||
"version": 6,
|
"version": 6,
|
||||||
"configurePresets": [
|
"configurePresets": [
|
||||||
{
|
{
|
||||||
"name": "vcpkg",
|
"name": "vs2026-windows",
|
||||||
"generator": "Visual Studio 17 2022",
|
"generator": "Visual Studio 18 2026",
|
||||||
"architecture": "x64",
|
"architecture": "x64",
|
||||||
"binaryDir": "${sourceDir}/build/",
|
"binaryDir": "${sourceDir}/build/",
|
||||||
"toolchainFile": "$env{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake",
|
"toolchainFile": "$env{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake",
|
||||||
@@ -15,32 +15,14 @@
|
|||||||
],
|
],
|
||||||
"buildPresets": [
|
"buildPresets": [
|
||||||
{
|
{
|
||||||
"name": "Base",
|
"name": "vs2026-windows",
|
||||||
"hidden": true,
|
"configurePreset": "vs2026-windows",
|
||||||
"nativeToolOptions": [
|
"nativeToolOptions": [
|
||||||
"-m",
|
"-m",
|
||||||
"-noLogo",
|
"-noLogo",
|
||||||
"-p:UseMultiToolTask=true",
|
"-p:UseMultiToolTask=true",
|
||||||
"-p:EnforceProcessCountAcrossBuilds=true"
|
"-p:EnforceProcessCountAcrossBuilds=true"
|
||||||
]
|
]
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "Debug",
|
|
||||||
"configurePreset": "vcpkg",
|
|
||||||
"inherits": "Base",
|
|
||||||
"configuration": "Debug"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "Release",
|
|
||||||
"configurePreset": "vcpkg",
|
|
||||||
"inherits": "Base",
|
|
||||||
"configuration": "Release"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "RelWithDebInfo",
|
|
||||||
"configurePreset": "vcpkg",
|
|
||||||
"inherits": "Base",
|
|
||||||
"configuration": "RelWithDebInfo"
|
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|||||||
+5
-4
@@ -13,12 +13,13 @@ if (!$root) {
|
|||||||
|
|
||||||
$logLevel = if ($Verbose) { "STATUS" } else { "ERROR" }
|
$logLevel = if ($Verbose) { "STATUS" } else { "ERROR" }
|
||||||
|
|
||||||
cmake --preset vcpkg --log-level=$logLevel
|
cmake --preset vs2026-windows --log-level=$logLevel
|
||||||
|
|
||||||
if ($Verbose) {
|
if ($Verbose) {
|
||||||
cmake --build --preset $Config --verbose
|
cmake --build --preset vs2026-windows --config $Config --verbose
|
||||||
} else {
|
}
|
||||||
cmake --build --preset $Config
|
else {
|
||||||
|
cmake --build --preset vs2026-windows --config $Config
|
||||||
}
|
}
|
||||||
|
|
||||||
if (! $?) {
|
if (! $?) {
|
||||||
|
|||||||
Reference in New Issue
Block a user