From fbc327a332e99c08707ef7f3e16ca47e9a7c6a89 Mon Sep 17 00:00:00 2001 From: Jack Moffitt Date: Thu, 26 Dec 2013 20:08:06 -0700 Subject: [PATCH] Build with make instead of rustpkg. --- Makefile.in | 24 ++++++++++++++++++++++++ configure | 4 ++++ lib.rs | 10 ++++++---- 3 files changed, 34 insertions(+), 4 deletions(-) create mode 100644 Makefile.in create mode 100755 configure diff --git a/Makefile.in b/Makefile.in new file mode 100644 index 0000000..51691c6 --- /dev/null +++ b/Makefile.in @@ -0,0 +1,24 @@ +VPATH=%VPATH% + +RUSTC ?= rustc +RUSTFLAGS ?= + +RUST_SRC=$(shell find $(VPATH)/. -type f -name '*.rs') + +.PHONY: all +all: libsharegl.dummy + +libsharegl.dummy: lib.rs $(RUST_SRC) + $(RUSTC) $(RUSTFLAGS) $< --lib --out-dir . + touch $@ + +sharegl-test: lib.rs $(RUST_SRC) + $(RUSTC) $(RUSTFLAGS) $< -o $@ --test + +.PHONY: check +check: sharegl-test + ./sharegl-test $(TEST) + +.PHONY: clean +clean: + rm -f *.o *.a *.so *.dylib *.dll *.dummy *-test diff --git a/configure b/configure new file mode 100755 index 0000000..62a0f4c --- /dev/null +++ b/configure @@ -0,0 +1,4 @@ +#!/bin/bash + +SRCDIR="$(cd $(dirname $0) && pwd)" +sed "s#%VPATH%#${SRCDIR}#" ${SRCDIR}/Makefile.in > Makefile diff --git a/lib.rs b/lib.rs index 74de893..a397e3d 100644 --- a/lib.rs +++ b/lib.rs @@ -7,16 +7,18 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +#[link(name = "sharegl", vers = "0.1")]; + extern mod std; extern mod extra; -extern mod geom = "rust-geom"; +extern mod geom; #[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; #[cfg(target_os="macos")] -extern mod opengles = "rust-opengles"; +extern mod opengles; pub mod base; pub mod context;