From ead67f1ed72c82cfaeeb0ec1703b94d186078e5c Mon Sep 17 00:00:00 2001 From: Patrick Walton Date: Mon, 13 May 2013 21:26:00 -0700 Subject: [PATCH] Update for directory shuffle --- Makefile.in | 2 +- ll.rs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile.in b/Makefile.in index 26a77b2..0c51d07 100644 --- a/Makefile.in +++ b/Makefile.in @@ -6,7 +6,7 @@ CXXFLAGS ?= AR ?= ar RUSTC ?= rustc RUSTFLAGS ?= -CFLAGS += -fPIC +CFLAGS += -fPIC -I$(VPATH)/../libwapcaplet/include RUST_SRC=$(shell find $(VPATH)/. -type f -name '*.rs') diff --git a/ll.rs b/ll.rs index e1672a4..8de5690 100644 --- a/ll.rs +++ b/ll.rs @@ -11,7 +11,7 @@ use core::libc::{c_char, size_t}; use core::libc::types::common::c99::uint32_t; #[nolink] -#[link_args="-L../libwapcaplet -lwapcaplet -L. -lrustwapcaplet"] +#[link_args="-L../../wapcaplet/libwapcaplet -lwapcaplet -L. -lrustwapcaplet"] pub extern mod linking { } pub enum lwc_error_e { @@ -38,4 +38,4 @@ pub extern { fn lwc_intern_string(s: *c_char, slen: size_t, ret: *mut *lwc_string) -> lwc_error; fn rust_lwc_string_ref(s: *lwc_string); fn rust_lwc_string_unref(s: *lwc_string); -} \ No newline at end of file +}