From f373b725b462fac6adf6c4c561c85bbb9000f80f Mon Sep 17 00:00:00 2001 From: Gabriele Musco Date: Thu, 15 Jun 2023 17:18:02 +0200 Subject: [PATCH] feat: can build opencomposite --- scripts/build_opencomposite.sh | 17 +++++++++++++++++ src/builders/build_monado.rs | 1 - src/builders/build_opencomposite.rs | 12 ++++++++++++ src/builders/mod.rs | 3 +-- src/dependencies/mod.rs | 2 -- 5 files changed, 30 insertions(+), 5 deletions(-) create mode 100644 scripts/build_opencomposite.sh create mode 100644 src/builders/build_opencomposite.rs diff --git a/scripts/build_opencomposite.sh b/scripts/build_opencomposite.sh new file mode 100644 index 0000000..1e4c31b --- /dev/null +++ b/scripts/build_opencomposite.sh @@ -0,0 +1,17 @@ +#!/bin/bash + +# exit on error +# echo commands +set -ev + +REPO_DIR=$1 + +"$(dirname -- "$0")/_clone_or_pull.sh" "https://gitlab.com/znixian/OpenOVR.git" "$REPO_DIR" + +cd "$REPO_DIR" +mkdir -p build +cd build +cmake -DCMAKE_BUILD_TYPE=Release .. +make clean +make -j$(nproc) +make install diff --git a/src/builders/build_monado.rs b/src/builders/build_monado.rs index ca7da4a..4eb97ce 100644 --- a/src/builders/build_monado.rs +++ b/src/builders/build_monado.rs @@ -1,6 +1,5 @@ use crate::{runner::Runner, profile::Profile}; -// TODO: link non-system libsurvive pub fn get_build_monado_runner(profile: Profile) -> Runner { let runner = Runner::new( None, diff --git a/src/builders/build_opencomposite.rs b/src/builders/build_opencomposite.rs new file mode 100644 index 0000000..ddca54d --- /dev/null +++ b/src/builders/build_opencomposite.rs @@ -0,0 +1,12 @@ +use crate::{profile::Profile, runner::Runner}; + +pub fn get_build_opencomposite_runner(profile: Profile) -> Runner { + let runner = Runner::new( + None, + "./scripts/build_opencomposite.sh".into(), + vec![ + profile.opencomposite_path, + ] + ); + runner +} diff --git a/src/builders/mod.rs b/src/builders/mod.rs index 6ddadd6..8543e4d 100644 --- a/src/builders/mod.rs +++ b/src/builders/mod.rs @@ -1,4 +1,3 @@ - pub mod build_monado; pub mod build_libsurvive; - +pub mod build_opencomposite; diff --git a/src/dependencies/mod.rs b/src/dependencies/mod.rs index 217d14c..f73b0eb 100644 --- a/src/dependencies/mod.rs +++ b/src/dependencies/mod.rs @@ -1,4 +1,2 @@ - pub mod monado_deps; pub mod libsurvive_deps; -