From 12044b218363bdd93f9fc1b3c71167d700144e45 Mon Sep 17 00:00:00 2001
From: Mikko Rasa <tdb@tdb.fi>
Date: Thu, 15 Sep 2016 19:39:23 +0300
Subject: [PATCH] Make LibOVR support optional at compile-time

---
 Build                                       | 18 ++++++++++++++----
 source/{ => ovr}/oculusriftcamera.cpp       |  0
 source/{ => ovr}/oculusriftcamera.h         |  2 +-
 source/{ => ovr}/oculusriftcombiner.cpp     |  0
 source/{ => ovr}/oculusriftcombiner.h       |  2 +-
 source/{ => ovr}/oculusriftdevice.cpp       |  2 +-
 source/{ => ovr}/oculusriftdevice.h         |  2 +-
 source/{ => ovr}/oculusriftdevice_private.h |  0
 8 files changed, 18 insertions(+), 8 deletions(-)
 rename source/{ => ovr}/oculusriftcamera.cpp (100%)
 rename source/{ => ovr}/oculusriftcamera.h (91%)
 rename source/{ => ovr}/oculusriftcombiner.cpp (100%)
 rename source/{ => ovr}/oculusriftcombiner.h (95%)
 rename source/{ => ovr}/oculusriftdevice.cpp (98%)
 rename source/{ => ovr}/oculusriftdevice.h (96%)
 rename source/{ => ovr}/oculusriftdevice_private.h (100%)

diff --git a/Build b/Build
index 4afd3c3..06d04e0 100644
--- a/Build
+++ b/Build
@@ -4,17 +4,27 @@ package "mspvr"
 	version "0.1";
 
 	require "mspgl";
-	require "libovr";
-	require "libudev";
 
-	build_info
+	feature "libovr" "Support Oculus Rift through LibOVR";
+
+	if_feature "libovr"
 	{
-		warning_level 1;
+		require "libovr";
+		require "libudev";
+
+		build_info
+		{
+			warning_level 1;
+		};
 	};
 
 	library "mspvr"
 	{
 		source "source";
+		if_feature "libovr"
+		{
+			source "source/ovr";
+		};
 		install true;
 		install_map
 		{
diff --git a/source/oculusriftcamera.cpp b/source/ovr/oculusriftcamera.cpp
similarity index 100%
rename from source/oculusriftcamera.cpp
rename to source/ovr/oculusriftcamera.cpp
diff --git a/source/oculusriftcamera.h b/source/ovr/oculusriftcamera.h
similarity index 91%
rename from source/oculusriftcamera.h
rename to source/ovr/oculusriftcamera.h
index 7abaa81..a2b0b28 100644
--- a/source/oculusriftcamera.h
+++ b/source/ovr/oculusriftcamera.h
@@ -1,7 +1,7 @@
 #ifndef MSP_VR_OCULUSRIFTCAMERA_H_
 #define MSP_VR_OCULUSRIFTCAMERA_H_
 
-#include "headtrackingcamera.h"
+#include <msp/vr/headtrackingcamera.h>
 
 namespace Msp {
 namespace VR {
diff --git a/source/oculusriftcombiner.cpp b/source/ovr/oculusriftcombiner.cpp
similarity index 100%
rename from source/oculusriftcombiner.cpp
rename to source/ovr/oculusriftcombiner.cpp
diff --git a/source/oculusriftcombiner.h b/source/ovr/oculusriftcombiner.h
similarity index 95%
rename from source/oculusriftcombiner.h
rename to source/ovr/oculusriftcombiner.h
index 32ab9cc..65809a3 100644
--- a/source/oculusriftcombiner.h
+++ b/source/ovr/oculusriftcombiner.h
@@ -4,7 +4,7 @@
 #include <msp/gl/mesh.h>
 #include <msp/gl/program.h>
 #include <msp/gl/programdata.h>
-#include "stereocombiner.h"
+#include <msp/vr/stereocombiner.h>
 
 namespace Msp {
 namespace VR {
diff --git a/source/oculusriftdevice.cpp b/source/ovr/oculusriftdevice.cpp
similarity index 98%
rename from source/oculusriftdevice.cpp
rename to source/ovr/oculusriftdevice.cpp
index f73371f..32558e0 100644
--- a/source/oculusriftdevice.cpp
+++ b/source/ovr/oculusriftdevice.cpp
@@ -1,6 +1,6 @@
+#include <msp/vr/stereoview.h>
 #include "oculusriftdevice.h"
 #include "oculusriftdevice_private.h"
-#include "stereoview.h"
 
 using namespace std;
 
diff --git a/source/oculusriftdevice.h b/source/ovr/oculusriftdevice.h
similarity index 96%
rename from source/oculusriftdevice.h
rename to source/ovr/oculusriftdevice.h
index 9eee6e3..a5105d6 100644
--- a/source/oculusriftdevice.h
+++ b/source/ovr/oculusriftdevice.h
@@ -1,7 +1,7 @@
 #ifndef MSP_VR_OCULUSRIFTDEVICE_H_
 #define MSP_VR_OCULUSRIFTDEVICE_H_
 
-#include "displaydevice.h"
+#include <msp/vr/displaydevice.h>
 #include "oculusriftcamera.h"
 #include "oculusriftcombiner.h"
 
diff --git a/source/oculusriftdevice_private.h b/source/ovr/oculusriftdevice_private.h
similarity index 100%
rename from source/oculusriftdevice_private.h
rename to source/ovr/oculusriftdevice_private.h
-- 
2.43.0