From e3d48dbb8f97367c2826825822b27a2722ce3fde Mon Sep 17 00:00:00 2001
From: Brad Davis <bradd@amazon.com>
Date: Fri, 6 Mar 2015 12:53:10 -0800
Subject: [PATCH] Working on Xcode build

---
 cmake/externals/LibOVR/CMakeLists.txt | 10 ++++++++--
 interface/src/devices/OculusManager.h |  2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/cmake/externals/LibOVR/CMakeLists.txt b/cmake/externals/LibOVR/CMakeLists.txt
index b85014cec9..878af64053 100644
--- a/cmake/externals/LibOVR/CMakeLists.txt
+++ b/cmake/externals/LibOVR/CMakeLists.txt
@@ -16,5 +16,11 @@ message(${INSTALL_DIR})
 string(TOUPPER ${EXTERNAL_NAME} EXTERNAL_NAME_UPPER)
 
 set(${EXTERNAL_NAME_UPPER}_INCLUDE_DIRS ${INSTALL_DIR}/include  CACHE TYPE STRING)
-set(${EXTERNAL_NAME_UPPER}_LIBRARY_RELEASE ${INSTALL_DIR}/lib/ovr.lib CACHE TYPE FILEPATH)
-set(${EXTERNAL_NAME_UPPER}_LIBRARY_DEBUG ${INSTALL_DIR}/lib/ovrd.lib  CACHE TYPE FILEPATH)
+
+if (WIN32)
+	set(${EXTERNAL_NAME_UPPER}_LIBRARY_RELEASE ${INSTALL_DIR}/lib/ovr.lib CACHE TYPE FILEPATH)
+	set(${EXTERNAL_NAME_UPPER}_LIBRARY_DEBUG ${INSTALL_DIR}/lib/ovrd.lib  CACHE TYPE FILEPATH)
+else()
+	set(${EXTERNAL_NAME_UPPER}_LIBRARY_RELEASE ${INSTALL_DIR}/lib/libovr.a CACHE TYPE FILEPATH)
+	set(${EXTERNAL_NAME_UPPER}_LIBRARY_DEBUG ${INSTALL_DIR}/lib/libovrd.a  CACHE TYPE FILEPATH)
+endif()
\ No newline at end of file
diff --git a/interface/src/devices/OculusManager.h b/interface/src/devices/OculusManager.h
index 35012d37cc..bc7ec1ad10 100644
--- a/interface/src/devices/OculusManager.h
+++ b/interface/src/devices/OculusManager.h
@@ -184,7 +184,7 @@ inline ovrVector2f ovrFromGlm(const glm::vec2 & v) {
 }
 
 inline ovrSizei ovrFromGlm(const glm::uvec2 & v) {
-    return{ v.x, v.y };
+    return{ (int)v.x, (int)v.y };
 }
 
 inline ovrQuatf ovrFromGlm(const glm::quat & q) {