Skip to content

Commit

Permalink
wip: fonts and status bar
Browse files Browse the repository at this point in the history
  • Loading branch information
adamws committed Dec 14, 2023
1 parent 35e1433 commit 2f62ca5
Show file tree
Hide file tree
Showing 6 changed files with 310 additions and 8 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/build-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
name: Build and test on linux
runs-on: ubuntu-latest
container:
image: ghcr.io/${{ github.repository_owner }}/lukaj-test:latest
image: ghcr.io/${{ github.repository_owner }}/lukaj-test:develop
credentials:
username: ${{ github.actor }}
password: ${{ secrets.github_token }}
Expand Down Expand Up @@ -66,6 +66,7 @@ jobs:
mingw-w64-x86_64-pkgconf
mingw-w64-x86_64-gcc
mingw-w64-x86_64-SDL2
mingw-w64-x86_64-SDL2_ttf
- run: rustup update stable-gnu && rustup default stable-gnu
- shell: bash
run: echo "D:/msys64/mingw64/bin" >> $GITHUB_PATH
Expand Down
4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ path = "src/lib.rs"
clap = { version = "4.4.6", features = ["derive"] }
env_logger = "0.10.0"
log = "0.4.20"
sdl2 = { version = "0.36.0", default-features = false }
sdl2 = { version = "0.36.0", default-features = false, features = ["ttf"] }
cairo-rs = { version = "0.18.2", optional = true }
librsvg = { version = "2.57.0", optional = true }
resvg = { version = "0.36.0", optional = true }
Expand All @@ -44,7 +44,7 @@ rgb = "0.8.37"
rstest = "0.18.2"

[package.metadata.vcpkg]
dependencies = ["sdl2"]
dependencies = ["sdl2", "sdl2-ttf"]
git = "https://github.com/microsoft/vcpkg"
rev = "a42af01" # release 2023.11.20

Expand Down
7 changes: 7 additions & 0 deletions build.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
fn main() {
// fix for static linking issue (undefined references to 'deflate')
// caused by wrong order of -lz -png (defining group with correct order
// fixes that)
#[cfg(target_os="linux")]
println!("cargo:rustc-link-arg=-Wl,--start-group,-lpng,-lz,--end-group");
}
2 changes: 1 addition & 1 deletion docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ RUN apt-get update \
&& apt-get install -y \
automake autoconf build-essential curl cmake git libtool ninja-build tar unzip zip \
libcairo2-dev libgdk-pixbuf-2.0-dev libglib2.0-dev libpango1.0-dev \
libsdl2-dev libxml2-dev \
libsdl2-dev libsdl2-ttf-dev libxml2-dev \
xvfb x11-xserver-utils \
&& rm -rf /var/lib/apt/lists/*

Expand Down
Binary file added resources/DejaVuSansMono.ttf
Binary file not shown.
Loading

0 comments on commit 2f62ca5

Please sign in to comment.