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

Added Oculus submodule and updated link

Browse Source
This commit is contained in:
Colin Sherratt
2014-05-25 16:37:49 -04:00
parent 523f094165
commit 0f6af09526
4 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored
View File

@ -1,3 +1,6 @@
[submodule "modules/cgmath"] [submodule "modules/cgmath"]
path = modules/cgmath path = modules/cgmath
url = https://github.com/bjz/cgmath-rs url = https://github.com/bjz/cgmath-rs
[submodule "modules/OculusSDK"]
path = modules/OculusSDK
url = https://github.com/jherico/OculusSDK.git

8
configure vendored
View File

@ -173,10 +173,10 @@ modules = [Bin("oculus-info", ["oculus-vr"]),
Lib("cgmath")] Lib("cgmath")]
if platform.system() == "Linux": if platform.system() == "Linux":
modules += [Lib("oculus-vr", ["libovr.a", "cgmath"]), modules += [Lib("oculus-vr", ["libOVR_C.so", "cgmath"]),
LibMakefile("libovr.a", LibCMake("libOVR_C.so",
"modules/OculusSDK/", "modules/OculusSDK/",
"modules/OculusSDK/LibOVR/Lib/Linux/Release/x86_64/libovr.a")] "modules/OculusSDK/output/libOVR_C.so")]
elif platform.system() == "Darwin": elif platform.system() == "Darwin":
modules += [Lib("oculus-vr", ["libovr.a", "cgmath"])] modules += [Lib("oculus-vr", ["libovr.a", "cgmath"])]

1
modules/OculusSDK Submodule

Submodule modules/OculusSDK added at ccd12dd9b2

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

@ -15,7 +15,7 @@ use cgmath::vector::{Vector2, Vector3};
use cgmath::matrix::{Matrix4}; use cgmath::matrix::{Matrix4};
#[cfg(target_os = "linux")] #[cfg(target_os = "linux")]
#[link(name="ovr")] #[link(name="OVR_C")]
#[link(name="stdc++")] #[link(name="stdc++")]
#[link(name="udev")] #[link(name="udev")]
#[link(name="Xinerama")] #[link(name="Xinerama")]
@ -25,7 +25,7 @@ use cgmath::matrix::{Matrix4};
extern {} extern {}
#[cfg(target_os = "macos")] #[cfg(target_os = "macos")]
#[link(name="ovr")] #[link(name="OVR_C")]
#[link(name="stdc++")] #[link(name="stdc++")]
#[link(name = "Cocoa", kind = "framework")] #[link(name = "Cocoa", kind = "framework")]
#[link(name = "IOKit", kind = "framework")] #[link(name = "IOKit", kind = "framework")]