diff --git a/Cargo.toml b/Cargo.toml index 76350a1..511805f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -4,13 +4,11 @@ name = "core_text" version = "0.1.0" authors = ["The Servo Project Developers"] -[dependencies.core_foundation] - -git = "https://github.com/servo/rust-core-foundation" - -[dependencies.core_graphics] - -git = "https://github.com/servo/rust-core-graphics" - [dependencies] libc = "*" + +[target.x86_64-apple-darwin.dependencies.core_foundation] +git = "https://github.com/servo/rust-core-foundation" + +[target.x86_64-apple-darwin.dependencies.core_graphics] +git = "https://github.com/servo/rust-core-graphics" diff --git a/Makefile.in b/Makefile.in deleted file mode 100644 index a7d621b..0000000 --- a/Makefile.in +++ /dev/null @@ -1,25 +0,0 @@ -VPATH=%VPATH% - -RUSTC ?= rustc -RUSTFLAGS ?= -EXT_DEPS ?= - -RUST_SRC=$(shell find $(VPATH)/src -type f -name '*.rs') - -.PHONY: all -all: libcore_text.dummy - -libcore_text.dummy: src/lib.rs $(RUST_SRC) $(EXT_DEPS) - $(RUSTC) $(RUSTFLAGS) $< --out-dir . - touch $@ - -core_text-test: src/lib.rs $(RUST_SRC) $(EXT_DEPS) - $(RUSTC) $(RUSTFLAGS) $< -o $@ --test - -.PHONY: check -check: core_text-test - ./core_text-test $(TEST) - -.PHONY: clean -clean: - rm -f *.o *.a *.so *.dylib *.rlib *.dll *.dummy *-test diff --git a/configure b/configure deleted file mode 100755 index 62a0f4c..0000000 --- a/configure +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash - -SRCDIR="$(cd $(dirname $0) && pwd)" -sed "s#%VPATH%#${SRCDIR}#" ${SRCDIR}/Makefile.in > Makefile diff --git a/src/lib.rs b/src/lib.rs index 2f362f8..d564bc6 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -17,11 +17,7 @@ extern crate libc; extern crate core_foundation; extern crate core_graphics; -#[cfg(target_os="macos")] pub mod font; -#[cfg(target_os="macos")] pub mod font_collection; -#[cfg(target_os="macos")] pub mod font_descriptor; -#[cfg(target_os="macos")] pub mod font_manager;