mii/rust-openvr
1
0
Fork 0
mirror of https://github.com/mii443/rust-openvr.git synced 2025-08-23 08:45:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/csherratt/ovr-rs

Browse Source 
Conflicts:
	src/oculus-vr/lib.rs
This commit is contained in:
Colin Sherratt
2014-07-28 02:56:43 -04:00
parent b64d67fe90 c20f81dec9
commit 47e11c66a5
4 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.toml
View File

@ -18,6 +18,6 @@ path = "src/oculus-vr/lib.rs"
name = "oculus-info" name = "oculus-info"
path = "src/oculus-info/main.rs" path = "src/oculus-info/main.rs"
[dependencies.cgmath-rs] [dependencies.cgmath]
git = "https://github.com/bjz/cgmath-rs.git" git = "https://github.com/bjz/cgmath-rs.git"

1
scripts/compile-for-cargo
View File

@ -2,6 +2,7 @@
set -e set -e
git submodule update --init --recursive
./configure ./configure
make lib/libovr.a make lib/libovr.a
cp lib/libovr.a target/ cp lib/libovr.a target/

2
src/oculus-info/main.rs
View File

@ -1,7 +1,7 @@
#![crate_name = "oculus-info"] #![crate_name = "oculus-info"]
extern crate debug; extern crate debug;
extern crate ovr = "oculus-vr"; extern crate ovr = "ovr-rs";
use ovr::{SensorCapabilities, Ovr}; use ovr::{SensorCapabilities, Ovr};

2
src/oculus-vr/lib.rs
View File

@ -1,4 +1,4 @@
#![crate_name = "oculus-vr"] #![crate_name = "ovr-vr"]
#![crate_type = "lib"] #![crate_type = "lib"]
#![feature(link_args)] #![feature(link_args)]