Skip to content

Commit 79f9536

Browse files
authored
Merge pull request #28 from ParadoxGameConverters/wxwidgets
Update wxWidgets submodule
2 parents dee8178 + 48a41f8 commit 79f9536

File tree

4 files changed

+7
-30
lines changed

4 files changed

+7
-30
lines changed

.github/workflows/build.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
name: Build
22
on:
33
push:
4-
branches: [main]
4+
branches: [master]
55
pull_request:
6-
branches: [main]
6+
branches: [master]
77
jobs:
88
build_windows:
9-
runs-on: windows-2019
9+
runs-on: windows-latest
1010
steps:
1111
- uses: actions/checkout@v2
1212
with:
@@ -16,5 +16,5 @@ jobs:
1616
git submodule update --init --recursive
1717
- name: "Build solution"
1818
run: |
19-
cd "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\MSBuild\Current\Bin\"
19+
cd "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Current\Bin\"
2020
.\MSBuild.exe -m -p:Configuration=Release $Env:GITHUB_WORKSPACE\ProvinceMapper.sln

ProvinceMapper.vcxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,12 +111,12 @@
111111
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
112112
<ConfigurationType>Application</ConfigurationType>
113113
<UseDebugLibraries>true</UseDebugLibraries>
114-
<PlatformToolset>v142</PlatformToolset>
114+
<PlatformToolset>v143</PlatformToolset>
115115
<CharacterSet>Unicode</CharacterSet>
116116
</PropertyGroup>
117117
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
118118
<ConfigurationType>Application</ConfigurationType>
119-
<PlatformToolset>v142</PlatformToolset>
119+
<PlatformToolset>v143</PlatformToolset>
120120
<CharacterSet>Unicode</CharacterSet>
121121
</PropertyGroup>
122122
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

appveyor.yml

Lines changed: 0 additions & 23 deletions
This file was deleted.

wxWidgets

0 commit comments

Comments
 (0)