diff options
author | Keegan McAllister <kmcallister@mozilla.com> | 2013-11-04 13:03:42 -0800 |
---|---|---|
committer | Keegan McAllister <kmcallister@mozilla.com> | 2013-11-14 11:21:08 +0900 |
commit | db6d25ff13bb9a55e6e88b10c8abced77d6bb132 (patch) | |
tree | 1945e7886dda2df64be66ed9b597c6c5c7a66ead /src/components/gfx | |
parent | 4eb84496211bb48d2804a0ddcd16849536546103 (diff) | |
download | servo-db6d25ff13bb9a55e6e88b10c8abced77d6bb132.tar.gz servo-db6d25ff13bb9a55e6e88b10c8abced77d6bb132.zip |
Build some dependencies with rustpkg
Also take a rust-layers bugfix.
In collaboration with Jack Moffitt.
Diffstat (limited to 'src/components/gfx')
-rw-r--r-- | src/components/gfx/gfx.rc | 10 | ||||
-rw-r--r-- | src/components/gfx/platform/macos/font.rs | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/components/gfx/gfx.rc b/src/components/gfx/gfx.rc index e803ccd2192..4e882ba57b4 100644 --- a/src/components/gfx/gfx.rc +++ b/src/components/gfx/gfx.rc @@ -12,8 +12,8 @@ extern mod azure; extern mod extra; -extern mod geom; -extern mod layers; +extern mod geom = "rust-geom"; +extern mod layers = "rust-layers"; extern mod stb_image; extern mod servo_net (name = "net"); extern mod servo_util (name = "util"); @@ -29,9 +29,9 @@ extern mod harfbuzz; #[cfg(target_os="linux")] #[cfg(target_os="android")] extern mod freetype; // Mac OS-specific library dependencies -#[cfg(target_os="macos")] extern mod core_foundation; -#[cfg(target_os="macos")] extern mod core_graphics; -#[cfg(target_os="macos")] extern mod core_text; +#[cfg(target_os="macos")] extern mod core_foundation = "rust-core-foundation"; +#[cfg(target_os="macos")] extern mod core_graphics = "rust-core-graphics"; +#[cfg(target_os="macos")] extern mod core_text = "rust-core-text"; pub use gfx_font = font; pub use gfx_font_context = font_context; diff --git a/src/components/gfx/platform/macos/font.rs b/src/components/gfx/platform/macos/font.rs index 9705bb29822..885f35ecf04 100644 --- a/src/components/gfx/platform/macos/font.rs +++ b/src/components/gfx/platform/macos/font.rs @@ -4,9 +4,9 @@ /// Implementation of Quartz (CoreGraphics) fonts. -extern mod core_foundation; -extern mod core_graphics; -extern mod core_text; +extern mod core_foundation = "rust-core-foundation"; +extern mod core_graphics = "rust-core-graphics"; +extern mod core_text = "rust-core-text"; use font::{CSSFontWeight, FontHandleMethods, FontMetrics, FontTableMethods}; use font::{FontTableTag, FontWeight100, FontWeight200, FontWeight300, FontWeight400}; |