From f3d72b55d2e757758b5ec04d87e5f87b53663690 Mon Sep 17 00:00:00 2001 From: Jack Moffitt Date: Fri, 27 Sep 2013 15:20:08 -0600 Subject: [PATCH 1/2] Use rustpkg to build. --- sharegl.rc => lib.rs | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) rename sharegl.rc => lib.rs (83%) diff --git a/sharegl.rc b/lib.rs similarity index 83% rename from sharegl.rc rename to lib.rs index b8e305e..74de893 100644 --- a/sharegl.rc +++ b/lib.rs @@ -7,20 +7,16 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#[link(name = "sharegl", - vers = "0.1")]; -#[crate_type = "lib"]; - extern mod std; extern mod extra; -extern mod geom; +extern mod geom = "rust-geom"; #[cfg(target_os="macos")] -extern mod core_foundation; +extern mod core_foundation = "rust-core-foundation"; #[cfg(target_os="macos")] -extern mod io_surface; +extern mod io_surface = "rust-io-surface"; #[cfg(target_os="macos")] -extern mod opengles; +extern mod opengles = "rust-opengles"; pub mod base; pub mod context; From 62bc59f24dab4148ee24d5a7c9c3557632d2b689 Mon Sep 17 00:00:00 2001 From: Keegan McAllister Date: Wed, 6 Nov 2013 17:50:35 -0800 Subject: [PATCH 2/2] Remove old build system --- Makefile.in | 31 ------------------------------- configure | 5 ----- 2 files changed, 36 deletions(-) delete mode 100644 Makefile.in delete mode 100644 configure diff --git a/Makefile.in b/Makefile.in deleted file mode 100644 index 3d08539..0000000 --- a/Makefile.in +++ /dev/null @@ -1,31 +0,0 @@ -VPATH=%VPATH% - -CC ?= gcc -CXX ?= g++ -CXXFLAGS ?= -AR ?= ar -RUSTC ?= rustc -RUSTFLAGS ?= - -RUST_SRC=$(shell find $(VPATH)/. -type f -name '*.rs') - -.PHONY: all -all: libsharegl.dummy - -%.o: %.c - $(CC) $< -o $@ -c $(CFLAGS) - -libsharegl.dummy: sharegl.rc $(RUST_SRC) - $(RUSTC) $(RUSTFLAGS) $< --lib --out-dir . - touch $@ - -sharegl-test: sharegl.rc $(RUST_SRC) - $(RUSTC) $(RUSTFLAGS) $< -o $@ --test - -check: sharegl-test - ./sharegl-test - -.PHONY: clean -clean: - rm -f *.o *.a *.so *.dylib *.dll *.dummy *-test - diff --git a/configure b/configure deleted file mode 100644 index ed6c06e..0000000 --- a/configure +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash - -SRCDIR="$(cd $(dirname $0) && pwd)" -sed "s#%VPATH%#${SRCDIR}#" ${SRCDIR}/Makefile.in > Makefile -