From 664e9d4b3c89cee26750d5c4ddd87c9d0e4aa671 Mon Sep 17 00:00:00 2001 From: Jack Moffitt Date: Wed, 3 Apr 2013 22:03:39 -0600 Subject: [PATCH] Copy cairo and pixman libs and fix linking flags. --- Makefile.in | 9 +++++++-- cairo.rc | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/Makefile.in b/Makefile.in index eefd835..b9469e6 100644 --- a/Makefile.in +++ b/Makefile.in @@ -12,11 +12,16 @@ UNAME=$(shell uname) RUST_SRC=$(shell find $(VPATH)/. -type f -name '*.rs') .PHONY: all -all: librustcairo.dummy +all: extlibs librustcairo.dummy %.o: %.c $(CC) $< -o $@ -c $(CFLAGS) +.PHONY: extlibs +extlibs: + @cp ../cairo/src/.libs/libcairo.a . + @cp ../pixman/pixman/.libs/libpixman-1.a . + librustcairo.dummy: cairo.rc $(RUST_SRC) $(RUSTC) $(RUSTFLAGS) $< -o $@ touch $@ @@ -25,7 +30,7 @@ cairo-test: cairo.rc $(RUST_SRC) $(RUSTC) $(RUSTFLAGS) $< -o $@ --test .PHONY: check -check: cairo-test +check: extlibs cairo-test ./cairo-test .PHONY: clean diff --git a/cairo.rc b/cairo.rc index 0099d2d..24733d5 100644 --- a/cairo.rc +++ b/cairo.rc @@ -17,7 +17,7 @@ pub mod cairo_ft; pub mod cairo_quartz; #[nolink] -#[link_args = "../cairo/src/.libs/libcairo.a ../pixman/pixman/.libs/libpixman-1.a"] +#[link_args = "-L. -lcairo -lpixman-1"] extern mod linkhack { } #[nolink]