Skip to content

Commit d5eae15

Browse files
committed
Attempted compile fix
1 parent e55d30f commit d5eae15

File tree

2 files changed

+9
-7
lines changed

2 files changed

+9
-7
lines changed

.github/workflows/main.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,15 @@ jobs:
1313
strategy:
1414
fail-fast: false
1515
matrix:
16-
os: [ubuntu-22.04, windows-2022]
16+
# os: [ubuntu-22.04, windows-2022]
17+
os: [windows-2022]
1718
platform: [x64]
18-
build-cfg: [Debug, DebugOpt, Release]
19+
# build-cfg: [Debug, DebugOpt, Release]
20+
build-cfg: [Release]
1921
include:
2022
- os: windows-2022
2123
platform: x64
22-
build-cfg: Debug
24+
# build-cfg: Debug
2325

2426
runs-on: ${{ matrix.os }}
2527

build/build.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ build()
3838
fi
3939

4040
find_msbuild
41-
$msbuild "$slnpath" -p:Configuration=$configuration -p:Platform=$platform -v:$verbosity -nologo
41+
$msbuild "$slnpath" -p:Configuration=$configuration -p:Platform=$platform -v:$verbosity -nologo /p:DefineConstants="_ALLOW_COMPILER_AND_STL_VERSION_MISMATCH"
4242

4343
if [ $ci = true ]; then
4444
test
@@ -103,7 +103,7 @@ test()
103103
}
104104

105105
clean()
106-
{
106+
{
107107
rm -rf "$objdir"
108108
rm -rf "$gendir"
109109
rm -rf "$bindir"
@@ -202,7 +202,7 @@ while [[ $# > 0 ]]; do
202202
-configuration)
203203
configuration=$2
204204
shift
205-
;;
205+
;;
206206
-platform)
207207
platform=$2
208208
shift
@@ -240,7 +240,7 @@ case "$cmd" in
240240
;;
241241
generate_config)
242242
generate_config
243-
;;
243+
;;
244244
prepack)
245245
prepack
246246
;;

0 commit comments

Comments
 (0)