Skip to content

Commit d3d415b

Browse files
authored
Merge pull request #78 from apple1417/v2_support_b
support unrealsdk v2
2 parents c98c662 + 7a3f28b commit d3d415b

26 files changed

+380
-370
lines changed

.github/workflows/build.yml

Lines changed: 21 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,6 @@ on: [
66
workflow_dispatch
77
]
88

9-
env:
10-
LLVM_MINGW_VERSION: llvm-mingw-20240619-msvcrt-ubuntu-20.04-x86_64
11-
LLVM_MINGW_DOWNLOAD: https://github.com/mstorsjo/llvm-mingw/releases/download/20240619/llvm-mingw-20240619-msvcrt-ubuntu-20.04-x86_64.tar.xz
12-
139
jobs:
1410
build-windows:
1511
runs-on: windows-latest
@@ -18,10 +14,10 @@ jobs:
1814
fail-fast: false
1915
matrix:
2016
preset: [
21-
"clang-ue3-x86-release",
22-
"clang-ue4-x64-release",
23-
"msvc-ue3-x86-release",
24-
"msvc-ue4-x64-release",
17+
"clang-willow-release",
18+
"clang-oak-release",
19+
"msvc-willow-release",
20+
"msvc-oak-release",
2521
]
2622

2723
steps:
@@ -33,7 +29,7 @@ jobs:
3329
if: startswith(matrix.preset, 'msvc')
3430
uses: TheMrMilchmann/setup-msvc-dev@v3
3531
with:
36-
arch: ${{ fromJSON('["x86", "x64"]')[contains(matrix.preset, 'x64')] }}
32+
arch: ${{ fromJSON('["x86", "x64"]')[contains(matrix.preset, 'oak')] }}
3733

3834
- name: Setup CMake and Ninja
3935
uses: lukka/get-cmake@latest
@@ -60,24 +56,23 @@ jobs:
6056
run: cmake --build out/build/${{ matrix.preset }}
6157

6258
build-ubuntu:
63-
# Require at least 24 for the mingw build
64-
runs-on: ubuntu-24.04
59+
runs-on: ubuntu-latest
6560

6661
strategy:
6762
fail-fast: false
6863
matrix:
6964
toolchain:
70-
- preset: clang-cross-ue3-x86-release
65+
- preset: clang-cross-willow-release
7166
container: clang-cross
72-
- preset: clang-cross-ue4-x64-release
67+
- preset: clang-cross-oak-release
7368
container: clang-cross
74-
- preset: llvm-mingw-ue3-x86-release
69+
- preset: llvm-mingw-willow-release
7570
container: llvm-mingw
76-
- preset: llvm-mingw-ue4-x64-release
71+
- preset: llvm-mingw-oak-release
7772
container: llvm-mingw
78-
- preset: mingw-ue3-x86-release
73+
- preset: mingw-willow-release
7974
container: mingw
80-
- preset: mingw-ue4-x64-release
75+
- preset: mingw-oak-release
8176
container: mingw
8277

8378
steps:
@@ -86,6 +81,13 @@ jobs:
8681
with:
8782
submodules: recursive
8883

84+
- name: Login to GitHub Container Registry
85+
uses: docker/login-action@v2
86+
with:
87+
registry: ghcr.io
88+
username: ${{ github.repository_owner }}
89+
password: ${{ secrets.GITHUB_TOKEN }}
90+
8991
- name: Build
9092
uses: devcontainers/[email protected]
9193
with:
@@ -109,13 +111,12 @@ jobs:
109111
fail-fast: false
110112
matrix:
111113
preset: [
112-
"clang-ue3-x86-release",
113-
"clang-ue4-x64-release",
114+
"clang-willow-release",
115+
"clang-oak-release",
114116
]
115117

116118
steps:
117119
- name: Setup Clang
118-
if: startswith(matrix.preset, 'clang')
119120
uses: egor-tensin/setup-clang@v1
120121

121122
- name: Setup CMake and Ninja
@@ -137,7 +138,6 @@ jobs:
137138
submodules: recursive
138139

139140
- name: Configure CMake
140-
working-directory: ${{ env.GITHUB_WORKSPACE }}
141141
run: cmake . --preset ${{ matrix.preset }} -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On
142142

143143
- name: Remove `.modmap`s from compile commands
@@ -148,7 +148,6 @@ jobs:
148148
-Path "out\build\${{ matrix.preset }}\compile_commands.json"
149149
150150
- name: Run clang-tidy
151-
working-directory: ${{ env.GITHUB_WORKSPACE }}
152151
run: |
153152
python (Get-Command run-clang-tidy).Source `
154153
-p "out\build\${{ matrix.preset }}" `
@@ -165,7 +164,6 @@ jobs:
165164

166165
steps:
167166
- name: Setup Clang
168-
if: startswith(matrix.preset, 'clang')
169167
uses: egor-tensin/setup-clang@v1
170168

171169
- name: Checkout repository

CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
cmake_minimum_required(VERSION 3.25)
22

3-
project(pyunrealsdk VERSION 1.7.0)
3+
project(pyunrealsdk VERSION 1.8.0)
44

55
function(_pyunrealsdk_add_base_target_args target_name)
6-
target_compile_features(${target_name} PUBLIC cxx_std_20)
6+
target_compile_features(${target_name} PUBLIC cxx_std_23)
77
set_target_properties(${target_name} PROPERTIES
88
COMPILE_WARNING_AS_ERROR True
99
INTERPROCEDURAL_OPTIMIZATION True

0 commit comments

Comments
 (0)