Skip to content

Commit 75cfc5d

Browse files
committed
Clean up iOS/tvOS/Windows CI configuration
- Use BUILD_SHARED_LIBS=OFF for iOS/tvOS instead of CRATE_TYPES hack - Install tvOS target via rustup instead of rust-src + build-std - Remove Rust_RUSTUP_INSTALL_MISSING_TARGET and NOD_BUILD_STD - Install bzip2, zstd, liblzma via vcpkg on Windows alongside zlib - Update nod with MSVC-conditional zlib link name
1 parent 308ee99 commit 75cfc5d

File tree

3 files changed

+11
-11
lines changed

3 files changed

+11
-11
lines changed

.github/workflows/build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -232,10 +232,10 @@ jobs:
232232
brew install cmake ninja
233233
pip3 install --break-system-packages markupsafe
234234
235-
- name: Install Rust nightly (tvOS is a tier 3 target)
235+
- name: Install Rust nightly + tvOS target
236236
run: |
237237
rustup toolchain install nightly
238-
rustup +nightly component add rust-src
238+
rustup target add --toolchain nightly aarch64-apple-tvos
239239
240240
- name: Verify CMake version
241241
run: cmake --version
@@ -301,7 +301,7 @@ jobs:
301301
run: echo "VCPKG_ROOT=C:\vcpkg" >> $env:GITHUB_ENV
302302

303303
- name: Install vcpkg packages
304-
run: vcpkg install zlib:x64-windows-static
304+
run: vcpkg install zlib:x64-windows-static bzip2:x64-windows-static zstd:x64-windows-static liblzma:x64-windows-static
305305

306306
- name: Acquire Dawn Deps
307307
continue-on-error: true

CMakePresets.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -248,6 +248,10 @@
248248
"value": false
249249
},
250250
"Rust_CARGO_TARGET": "aarch64-apple-ios",
251+
"BUILD_SHARED_LIBS": {
252+
"type": "BOOL",
253+
"value": false
254+
},
251255
"IMGUI_USE_FREETYPE": {
252256
"type": "BOOL",
253257
"value": false
@@ -289,17 +293,13 @@
289293
},
290294
"Rust_CARGO_TARGET": "aarch64-apple-tvos",
291295
"Rust_TOOLCHAIN": "nightly",
292-
"IMGUI_USE_FREETYPE": {
296+
"BUILD_SHARED_LIBS": {
293297
"type": "BOOL",
294298
"value": false
295299
},
296-
"Rust_RUSTUP_INSTALL_MISSING_TARGET": {
297-
"type": "BOOL",
298-
"value": true
299-
},
300-
"NOD_BUILD_STD": {
300+
"IMGUI_USE_FREETYPE": {
301301
"type": "BOOL",
302-
"value": true
302+
"value": false
303303
},
304304
"CMAKE_DISABLE_FIND_PACKAGE_BZip2": {
305305
"type": "BOOL",

extern/nod

0 commit comments

Comments
 (0)