aboutsummaryrefslogtreecommitdiffstats
path: root/src/components
diff options
context:
space:
mode:
authorJack Moffitt <jack@metajack.im>2013-12-26 20:43:05 -0700
committerJack Moffitt <jack@metajack.im>2013-12-26 23:57:58 -0700
commit0c62b995594082abbc0792a2e47b4d21924815c1 (patch)
treee4c9c83e1f5ad29e0556fcaf05f08b69903f22d8 /src/components
parentcb336a18317195512a276971856081cb8ef86b0e (diff)
downloadservo-0c62b995594082abbc0792a2e47b4d21924815c1.tar.gz
servo-0c62b995594082abbc0792a2e47b4d21924815c1.zip
Build with make instead of rustpkg.
Diffstat (limited to 'src/components')
-rw-r--r--src/components/gfx/gfx.rc10
-rw-r--r--src/components/gfx/platform/macos/font.rs6
-rwxr-xr-xsrc/components/main/servo.rc10
-rw-r--r--src/components/msg/msg.rc8
-rw-r--r--src/components/net/net.rc2
-rw-r--r--src/components/script/script.rc2
-rw-r--r--src/components/util/util.rc2
7 files changed, 20 insertions, 20 deletions
diff --git a/src/components/gfx/gfx.rc b/src/components/gfx/gfx.rc
index e8b9420461e..0eb60d63fb5 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 = "rust-geom";
-extern mod layers = "rust-layers";
+extern mod geom;
+extern mod layers;
extern mod stb_image;
extern mod png;
extern mod servo_net (name = "net");
@@ -30,9 +30,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 = "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";
+#[cfg(target_os="macos")] extern mod core_foundation;
+#[cfg(target_os="macos")] extern mod core_graphics;
+#[cfg(target_os="macos")] extern mod 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 884d71e7064..86b0864b666 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 = "rust-core-foundation";
-extern mod core_graphics = "rust-core-graphics";
-extern mod core_text = "rust-core-text";
+extern mod core_foundation;
+extern mod core_graphics;
+extern mod core_text;
use font::{CSSFontWeight, FontHandleMethods, FontMetrics, FontTableMethods};
use font::{FontTableTag, FontWeight100, FontWeight200, FontWeight300, FontWeight400};
diff --git a/src/components/main/servo.rc b/src/components/main/servo.rc
index cc451b4e7ce..43bd737bdd7 100755
--- a/src/components/main/servo.rc
+++ b/src/components/main/servo.rc
@@ -15,15 +15,15 @@
extern mod alert;
extern mod azure;
-extern mod geom = "rust-geom";
+extern mod geom;
extern mod gfx (name = "gfx");
#[cfg(not(target_os="android"))]
extern mod glfw;
#[cfg(target_os="android")]
extern mod glut;
extern mod js;
-extern mod layers = "rust-layers";
-extern mod opengles = "rust-opengles";
+extern mod layers;
+extern mod opengles;
extern mod png;
extern mod script;
extern mod servo_net (name = "net");
@@ -35,9 +35,9 @@ extern mod stb_image;
extern mod extra;
#[cfg(target_os="macos")]
-extern mod core_graphics = "rust-core-graphics";
+extern mod core_graphics;
#[cfg(target_os="macos")]
-extern mod core_text = "rust-core-text";
+extern mod core_text;
use compositing::{CompositorChan, CompositorTask};
use constellation::Constellation;
diff --git a/src/components/msg/msg.rc b/src/components/msg/msg.rc
index 2cef8db14a2..3811f5bffa7 100644
--- a/src/components/msg/msg.rc
+++ b/src/components/msg/msg.rc
@@ -10,14 +10,14 @@
extern mod azure;
extern mod extra;
-extern mod geom = "rust-geom";
-extern mod layers = "rust-layers";
+extern mod geom;
+extern mod layers;
extern mod std;
#[cfg(target_os="macos")]
-extern mod core_foundation = "rust-core-foundation";
+extern mod core_foundation;
#[cfg(target_os="macos")]
-extern mod io_surface = "rust-io-surface";
+extern mod io_surface;
pub mod compositor_msg;
pub mod constellation_msg;
diff --git a/src/components/net/net.rc b/src/components/net/net.rc
index 30c80f885bb..da445e1e964 100644
--- a/src/components/net/net.rc
+++ b/src/components/net/net.rc
@@ -10,7 +10,7 @@
#[feature(globs, managed_boxes)];
-extern mod geom = "rust-geom";
+extern mod geom;
extern mod http;
extern mod servo_util (name = "util");
extern mod stb_image;
diff --git a/src/components/script/script.rc b/src/components/script/script.rc
index 7490024aeb8..1715ff8de8f 100644
--- a/src/components/script/script.rc
+++ b/src/components/script/script.rc
@@ -13,7 +13,7 @@
#[feature(globs, macro_rules, struct_variant, managed_boxes)];
-extern mod geom = "rust-geom";
+extern mod geom;
extern mod hubbub;
extern mod encoding;
extern mod js;
diff --git a/src/components/util/util.rc b/src/components/util/util.rc
index d4b6b63483f..95e3b4e4662 100644
--- a/src/components/util/util.rc
+++ b/src/components/util/util.rc
@@ -11,7 +11,7 @@
#[feature(macro_rules, managed_boxes)];
extern mod extra;
-extern mod geom = "rust-geom";
+extern mod geom;
pub mod cache;
pub mod geometry;