Skip to content

Commit 5d9e6e3

Browse files
authored
Merge pull request #54 from TeeMidnight/pr-install-fix
Improve the package and modernize the libraries import
2 parents 46ffdaa + d4dfefa commit 5d9e6e3

11 files changed

Lines changed: 110 additions & 366 deletions

File tree

.github/workflows/build.yaml

Lines changed: 7 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ jobs:
1414
include:
1515
- os: ubuntu-latest
1616
cmake-args: -G Ninja
17-
build-target: package
1817
package-file: "*-linux_x86_64.tar.xz"
1918
archtitecture: "x86_64"
2019
shell: "bash"
@@ -23,8 +22,7 @@ jobs:
2322
CXXFLAGS: -Werror
2423
- os: windows-latest
2524
cmake-args: -G Ninja
26-
build-target: package
27-
package-file: "*-win64.zip"
25+
package-file: "*-win64.7z"
2826
archtitecture: "x86_64"
2927
shell: "msys2"
3028
env:
@@ -33,7 +31,6 @@ jobs:
3331
LDFLAGS: -Werror
3432
- os: macOS-latest
3533
cmake-args: -G Ninja
36-
build-target: package_dmg
3734
package-file: "*-macos.dmg"
3835
archtitecture: "arm64"
3936
shell: "bash"
@@ -61,6 +58,7 @@ jobs:
6158
ninja:p
6259
zlib:p
6360
sdl3:p
61+
freetype:p
6462
opus:p
6563
opusfile:p
6664
openssl:p
@@ -81,26 +79,10 @@ jobs:
8179
sudo apt-get install pkg-config ninja-build libfreetype6-dev libopus-dev libopusfile-dev libcurl4-openssl-dev libgl1-mesa-dev -y
8280
sudo apt-get install build-essential git cmake libasound2-dev libpulse-dev libaudio-dev libjack-dev libsndio-dev libx11-dev libxext-dev libxrandr-dev libxcursor-dev libxfixes-dev libxi-dev libxss-dev libwayland-dev libxkbcommon-dev libdrm-dev libgbm-dev libgl1-mesa-dev libgles2-mesa-dev libegl1-mesa-dev libibus-1.0-dev libdbus-1-dev libudev-dev libinput-dev libts-dev libjpeg-dev libwebp-dev -y
8381
cd SDL
84-
cmake . -DCMAKE_BUILD_TYPE=Release
82+
cmake . -DCMAKE_BUILD_TYPE=Release -DSDL_TEST=OFF -DSDL_STATIC=OFF
8583
sudo make install
84+
sudo ldconfig
8685
87-
- name: Checkout Freetype
88-
if: contains(matrix.os, 'windows')
89-
uses: actions/checkout@v4
90-
with:
91-
repository: freetype/freetype
92-
ref: VER-2-14-1
93-
path: ./freetype
94-
95-
- name: Prepare Windows
96-
if: contains(matrix.os, 'windows')
97-
run: |
98-
cd freetype
99-
mkdir build
100-
cd build
101-
cmake .. -G Ninja -DCMAKE_INSTALL_PREFIX=/ucrt64 -D BUILD_SHARED_LIBS=true -D CMAKE_BUILD_TYPE=Release -D FT_DISABLE_ZLIB=TRUE -D FT_DISABLE_BZIP2=TRUE -D FT_DISABLE_PNG=TRUE -D FT_DISABLE_HARFBUZZ=TRUE -D FT_DISABLE_BROTLI=TRUE
102-
ninja install
103-
10486
- name: Prepare MacOS
10587
if: contains(matrix.os, 'macOS')
10688
run: |
@@ -151,7 +133,9 @@ jobs:
151133
- name: Package
152134
run: |
153135
cd release
154-
cmake --build . --config Release --target ${{ matrix.build-target }}
136+
cmake ${{ matrix.cmake-args }} -DCMAKE_BUILD_TYPE=Releas -DMACOS_DO_INSTALL=ON -Werror=dev -DDOWNLOAD_GTEST=ON -DCMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE=. ..
137+
cmake --build . --config Release --target everything
138+
cpack -V
155139
mkdir artifacts
156140
mv ${{ matrix.package-file }} artifacts
157141

0 commit comments

Comments
 (0)