mirror of
https://github.com/mii443/rust-openvr.git
synced 2025-08-22 16:25:36 +00:00
-updated cgmath to master
-Updated some stale code. -removed steamworks from the default build -Added missing frameworks from ovr-rs -add missing libudev-dev -add missing xrandr
This commit is contained in:
@ -1,4 +1,5 @@
|
|||||||
install:
|
install:
|
||||||
|
- sudo apt-get install libudev-dev libxrandr-dev
|
||||||
- wget http://static.rust-lang.org/dist/rust-nightly-x86_64-unknown-linux-gnu.tar.gz
|
- wget http://static.rust-lang.org/dist/rust-nightly-x86_64-unknown-linux-gnu.tar.gz
|
||||||
- tar xzf rust-nightly-x86_64-unknown-linux-gnu.tar.gz
|
- tar xzf rust-nightly-x86_64-unknown-linux-gnu.tar.gz
|
||||||
- export PATH=$PATH:$(pwd)/rust-nightly-x86_64-unknown-linux-gnu/bin
|
- export PATH=$PATH:$(pwd)/rust-nightly-x86_64-unknown-linux-gnu/bin
|
||||||
|
17
configure
vendored
17
configure
vendored
@ -170,13 +170,18 @@ def write_makefile(modules):
|
|||||||
|
|
||||||
|
|
||||||
modules = [Bin("oculus-info", ["oculus-vr"]),
|
modules = [Bin("oculus-info", ["oculus-vr"]),
|
||||||
Lib("oculus-vr", ["cgmath", "libovr_wrapper.a"]),
|
LibMakefile("libovr_wrapper.a", "src/oculus-vr/", "src/oculus-vr/libovr_wrapper.a", ["cgmath", "libOculusVR.a"]),
|
||||||
LibMakefile("libovr_wrapper.a", "src/oculus-vr/", "src/oculus-vr/libovr_wrapper.a", ["libovr.a"]),
|
LibCMake("libOculusVR.a", "modules/OculusSDK/LibOVR/", "modules/OculusSDK/LibOVR/libOculusVR.a"),
|
||||||
LibMakefile("libovr.a", "thirdparty/OculusSDK/", "thirdparty/OculusSDK/LibOVR/Lib/Linux/Release/x86_64/libovr.a"),
|
#Bin("steamworks-info", ["steamworks-vr"], other_flags="-L thirdparty/Steamworks/redistributable_bin/linux64/"),
|
||||||
Bin("steamworks-info", ["steamworks-vr"], other_flags="-L thirdparty/Steamworks/redistributable_bin/linux64/"),
|
#Lib("steamworks-vr", ["cgmath", "libsteamvr_wrapper.a"]),
|
||||||
Lib("steamworks-vr", ["cgmath", "libsteamvr_wrapper.a"]),
|
#LibMakefile("libsteamvr_wrapper.a", "src/steamworks-vr/", "src/steamworks-vr/libsteamvr_wrapper.a"),
|
||||||
LibMakefile("libsteamvr_wrapper.a", "src/steamworks-vr/", "src/steamworks-vr/libsteamvr_wrapper.a"),
|
|
||||||
Lib("cgmath")]
|
Lib("cgmath")]
|
||||||
|
|
||||||
|
if platform.system() == "Linux":
|
||||||
|
modules += [Lib("oculus-vr", ["libOculusVR.a", "libedid.a", "cgmath", "libovr_wrapper.a"]),
|
||||||
|
LibCMake("libedid.a", "modules/OculusSDK/3rdParty/EDID/", "modules/OculusSDK/3rdParty/EDID/libedid.a")]
|
||||||
|
|
||||||
|
elif platform.system() == "Darwin":
|
||||||
|
modules += [Lib("oculus-vr", ["libOculusVR.a", "cgmath", "libovr_wrapper.a"])]
|
||||||
|
|
||||||
write_makefile(modules)
|
write_makefile(modules)
|
Submodule modules/cgmath updated: 0aa401109a...29b8f4ea16
@ -1,4 +1,4 @@
|
|||||||
#[crate_id = "oculus-info#0.1"];
|
#![crate_id = "oculus-info#0.1"]
|
||||||
|
|
||||||
extern crate ovr = "oculus-vr";
|
extern crate ovr = "oculus-vr";
|
||||||
|
|
||||||
|
@ -22,12 +22,16 @@ use cgmath::angle::rad;
|
|||||||
#[link(name="udev")]
|
#[link(name="udev")]
|
||||||
#[link(name="Xinerama")]
|
#[link(name="Xinerama")]
|
||||||
#[link(name="edid")]
|
#[link(name="edid")]
|
||||||
|
#[link(name="Xrandr")]
|
||||||
extern {}
|
extern {}
|
||||||
|
|
||||||
#[cfg(target_os = "macos")]
|
#[cfg(target_os = "macos")]
|
||||||
#[link(name="ovr_wrapper")]
|
#[link(name="ovr_wrapper")]
|
||||||
#[link(name="OculusVR")]
|
#[link(name="OculusVR")]
|
||||||
#[link(name="stdc++")]
|
#[link(name="stdc++")]
|
||||||
|
#[link(name = "Cocoa", kind = "framework")]
|
||||||
|
#[link(name = "IOKit", kind = "framework")]
|
||||||
|
#[link(name = "CoreFoundation", kind = "framework")]
|
||||||
extern {}
|
extern {}
|
||||||
|
|
||||||
pub mod ll {
|
pub mod ll {
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
#[crate_id = "steamworks-info#0.1"];
|
#![crate_id = "steamworks-info#0.1"]
|
||||||
|
|
||||||
extern crate vr = "steamworks-vr";
|
extern crate vr = "steamworks-vr";
|
||||||
|
|
||||||
|
@ -1,8 +1,8 @@
|
|||||||
#[allow(non_camel_case_types)];
|
#![allow(non_camel_case_types)]
|
||||||
|
|
||||||
#[crate_id = "steamworks-vr#0.1"];
|
#![crate_id = "steamworks-vr#0.1"]
|
||||||
#[crate_type = "lib"];
|
#![crate_type = "lib"]
|
||||||
#[feature(link_args)];
|
#![feature(link_args)]
|
||||||
|
|
||||||
|
|
||||||
extern crate cgmath;
|
extern crate cgmath;
|
||||||
@ -121,7 +121,7 @@ pub mod ll {
|
|||||||
|
|
||||||
pub struct Hmd
|
pub struct Hmd
|
||||||
{
|
{
|
||||||
priv ptr: *ll::IHmd
|
ptr: *ll::IHmd
|
||||||
}
|
}
|
||||||
|
|
||||||
pub enum HmdErrorInit
|
pub enum HmdErrorInit
|
||||||
|
Reference in New Issue
Block a user