From 2ec9b81aa6880a13d83269df2c8fa0b37960365e Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Fri, 16 Dec 2016 15:48:16 -0800
Subject: [PATCH] fix passing of OCULUS_APP_ID to platform SDK initialization
---
plugins/oculus/CMakeLists.txt | 2 +-
plugins/oculus/src/OculusHelpers.cpp | 3 +--
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/plugins/oculus/CMakeLists.txt b/plugins/oculus/CMakeLists.txt
index 6b8d1a2ff9..55eb9c7b85 100644
--- a/plugins/oculus/CMakeLists.txt
+++ b/plugins/oculus/CMakeLists.txt
@@ -13,7 +13,7 @@ if (WIN32)
# if we were passed an Oculus App ID for entitlement checks, send that along
if (DEFINED ENV{OCULUS_APP_ID})
- add_definitions(-DOCULUS_APP_ID="\\"$ENV{OCULUS_APP_ID}\\"")
+ add_definitions(-DOCULUS_APP_ID="$ENV{OCULUS_APP_ID}")
endif ()
set(TARGET_NAME oculus)
diff --git a/plugins/oculus/src/OculusHelpers.cpp b/plugins/oculus/src/OculusHelpers.cpp
index 92cfbcc5bd..7cafe9a1d4 100644
--- a/plugins/oculus/src/OculusHelpers.cpp
+++ b/plugins/oculus/src/OculusHelpers.cpp
@@ -96,8 +96,7 @@ ovrSession acquireOculusSession() {
if (ovr_PlatformInitializeWindows(OCULUS_APP_ID) != ovrPlatformInitialize_Success) {
// we were unable to initialize the platform for entitlement check - fail the check
_quitRequested = true;
- }
- else {
+ } else {
qCDebug(oculus) << "Performing Oculus Platform entitlement check";
ovr_Entitlement_GetIsViewerEntitled();
}