8000 Depend on servo-fontconfig-sys properly by nox · Pull Request #107 · servo/skia · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content
This repository was archived by the owner on Jun 8, 2020. It is now read-only.

Depend on servo-fontconfig-sys properly #107

Merged
merged 2 commits into from
Aug 10, 2016
Merged

Depend on servo-fontconfig-sys properly #107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
592910a
Run cargo test with VERBOSE=1 and -Z print-link-args
nox Jul 29, 2016
f5fe2ac
Depend on servo-fontconfig-sys properly
nox Aug 10, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,5 @@ os:
- linux
notifications:
webhooks: http://build.servo.org:54856/travis
script: cargo build --verbose
env:
- RUSTFLAGS="-Z print-link-args" VERBOSE=1
4 changes: 2 additions & 2 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]

name = "servo-skia"
version = "0.20130412.15"
version = "0.20130412.16"
authors = ["The Skia Project Developers and The Servo Project Developers"]
description = "2D graphic library for drawing Text, Geometries, and Images"
license = "BSD-3-Clause"
Expand Down Expand Up @@ -35,7 +35,7 @@ servo-glutin = "0.4"
expat-sys = "2.1.1"

[target.'cfg(any(target_os = "android", target_os = "linux", all(target_os = "windows", target_env = "gnu")))'.dependencies]
servo-fontconfig = "0.2.1"
servo-fontconfig-sys = "4.0.0"
servo-freetype-sys = "4.0.0"

[target.'cfg(target_os = "linux")'.dependencies]
Expand Down
4 changes: 2 additions & 2 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ extern crate egl;
#[cfg(any(target_os="linux", target_os="android", all(target_os="windows", target_env="gnu")))]
extern crate freetype_sys;

#[cfg(all(target_os="windows", target_env="gnu"))]
extern crate fontconfig;
#[cfg(any(target_os="linux", target_os="android", all(target_os="windows", target_env="gnu")))]
extern crate fontconfig_sys;

pub use skia::{
SkiaGrContextRef,
Expand Down
0