Skip to content

Commit b1fb78c

Browse files
committed
disable ninja in windows builds
1 parent da1b605 commit b1fb78c

File tree

2 files changed

+19
-38
lines changed

2 files changed

+19
-38
lines changed

.github/workflows/build.yml

Lines changed: 19 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
name: Build Binaries
22

3-
on: [push, pull_request]
3+
on:
4+
- push
5+
- pull_request
6+
- workflow_dispatch
47

58
jobs:
69
build:
@@ -26,27 +29,29 @@ jobs:
2629
if: startsWith(matrix.os, 'macos')
2730
uses: ./.github/actions/setup-apple
2831

29-
- name: Build
30-
run: ./generate_build
31-
32-
- name: Move Windows files
32+
- name: Build (Windows)
3333
if: startsWith(matrix.os, 'windows')
3434
run: |
35-
mkdir -p dist/win-x64
36-
cp build/yogacore.dll dist/win-x64/yoga.dll
35+
cmake -B build -S yoga -D CMAKE_BUILD_TYPE=Release -D BUILD_SHARED_LIBS=ON
36+
cmake -B build32 -S yoga -D CMAKE_BUILD_TYPE=Release -D BUILD_SHARED_LIBS=ON -A Win32
37+
cmake --build build --config Release
38+
cmake --build build32 --config Release
3739
38-
- name: Build (x86)
40+
- name: Move Windows files
3941
if: startsWith(matrix.os, 'windows')
40-
run: ./generate_build -A Win32
42+
run: |
43+
mkdir -p dist/win-x64 dist/win-x86
44+
cp build/Release/yogacore.dll dist/win-x64/yoga.dll
45+
cp build32/Release/yogacore.dll dist/win-x86/yoga.dll
4146
42-
- name: Move Windows files (x86)
43-
if: startsWith(matrix.os, 'windows')
47+
- name: Build (non-Windows)
48+
if: startsWith(matrix.os, 'windows') != true
4449
run: |
45-
mkdir -p dist/win-x86
46-
cp build/Release/yogacore.dll dist/win-x86/yoga.dll
50+
cmake -B build -S yoga -D CMAKE_BUILD_TYPE=Release -D BUILD_SHARED_LIBS=ON -G Ninja
51+
cmake --build build --config Release
4752
4853
- name: Move MacOS files
49-
if: startsWith(matrix.os, 'macos')
54+
if: startsWith(matrix.os, 'macos')
5055
run: |
5156
mkdir -p dist/osx
5257
cp build/libyogacore.dylib dist/osx/libyoga.dylib

generate_build

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

0 commit comments

Comments
 (0)