From c6650f9329030aff2d295c3cb0791a19cad6f4c0 Mon Sep 17 00:00:00 2001
From: erwin coumans <erwincoumans@google.com>
Date: Sat, 31 Dec 2016 11:35:56 -0800
Subject: [PATCH] fix win32 UNICODE build re-enable VR teleport

---
 examples/SharedMemory/PhysicsServerExample.cpp | 2 +-
 examples/SharedMemory/Win32SharedMemory.cpp    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/examples/SharedMemory/PhysicsServerExample.cpp b/examples/SharedMemory/PhysicsServerExample.cpp
index c45a2461d..ca4d9e204 100644
--- a/examples/SharedMemory/PhysicsServerExample.cpp
+++ b/examples/SharedMemory/PhysicsServerExample.cpp
@@ -1908,7 +1908,7 @@ void	PhysicsServerExample::vrControllerButtonCallback(int controllerId, int butt
 		if (button == 1 && state == 0)
 		{
 			//gResetSimulation = true;
-			//gVRTeleportPos1 = gLastPickPos;
+			gVRTeleportPos1 = gLastPickPos;
 		}
 	} else
 	{
diff --git a/examples/SharedMemory/Win32SharedMemory.cpp b/examples/SharedMemory/Win32SharedMemory.cpp
index 038705364..5e95f9be0 100644
--- a/examples/SharedMemory/Win32SharedMemory.cpp
+++ b/examples/SharedMemory/Win32SharedMemory.cpp
@@ -36,7 +36,7 @@ void*   Win32SharedMemory::allocateSharedMemory(int key, int size, bool allowCre
 	b3Assert(m_internalData->m_buf==0);
 
 #ifdef UNICODE
-	swprintf_s (m_internalData->m_szName,"MyFileMappingObject%d",key);
+	swprintf_s (m_internalData->m_szName,TEXT("MyFileMappingObject%d"),key);
 #else
 	
 	sprintf(m_internalData->m_szName,"MyFileMappingObject%d",key);