mirror of
https://github.com/mii443/rust-openvr.git
synced 2025-08-23 16:49:31 +00:00
Merge branch 'master' of https://github.com/csherratt/ovr-rs
Conflicts: src/oculus-vr/lib.rs
This commit is contained in:
@ -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"
|
||||||
|
@ -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/
|
||||||
|
@ -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};
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
#![crate_name = "oculus-vr"]
|
#![crate_name = "ovr-vr"]
|
||||||
#![crate_type = "lib"]
|
#![crate_type = "lib"]
|
||||||
#![feature(link_args)]
|
#![feature(link_args)]
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user