Updating to 0.3.2 (windows version)

2 files changed, 20 insertions, 9 deletions

diff --git a/Samples/OculusWorldDemo/Projects/Win/VS2010/OculusWorldDemo.vcxproj b/Samples/OculusWorldDemo/Projects/Win/VS2010/OculusWorldDemo.vcxproj
index 2167237..b113a51 100644
--- a/Samples/OculusWorldDemo/Projects/Win/VS2010/OculusWorldDemo.vcxproj
+++ b/Samples/OculusWorldDemo/Projects/Win/VS2010/OculusWorldDemo.vcxproj
@@ -19,7 +19,7 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{456DA1F5-7D65-4B77-8336-277F3921639B}</ProjectGuid>
+    <ProjectGuid>{8051B877-2992-4F64-8C3B-FAF88B6D83AA}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>OculusWorldDemo</RootNamespace>
     <ProjectName>OculusWorldDemo</ProjectName>
@@ -192,11 +192,11 @@
     </ClCompile>
     <ClCompile Include="..\..\..\..\..\3rdParty\TinyXml\tinyxml2.cpp" />
     <ClCompile Include="..\..\..\..\CommonSrc\Render\Render_XmlSceneLoader.cpp" />
+    <ClCompile Include="..\..\..\..\CommonSrc\Util\OptionMenu.cpp" />
+    <ClCompile Include="..\..\..\..\CommonSrc\Util\RenderProfiler.cpp" />
     <ClCompile Include="..\..\..\OculusWorldDemo.cpp" />
     <ClCompile Include="..\..\..\OculusWorldDemo_Scene.cpp" />
-    <ClCompile Include="..\..\..\OptionMenu.cpp" />
     <ClCompile Include="..\..\..\Player.cpp" />
-    <ClCompile Include="..\..\..\RenderProfiler.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\..\CommonSrc\Platform\Gamepad.h" />
@@ -211,12 +211,12 @@
     <ClInclude Include="..\..\..\..\CommonSrc\Render\Render_D3D1X_Device.h" />
     <ClInclude Include="..\..\..\..\CommonSrc\Render\Render_GL_Device.h" />
     <ClInclude Include="..\..\..\..\CommonSrc\Render\Render_GL_Win32_Device.h" />
-    <ClInclude Include="..\..\..\OptionMenu.h" />
+    <ClInclude Include="..\..\..\..\CommonSrc\Util\OptionMenu.h" />
+    <ClInclude Include="..\..\..\..\CommonSrc\Util\RenderProfiler.h" />
     <ClInclude Include="..\..\3rdParty\TinyXml\tinyxml2.h" />
     <ClInclude Include="..\..\..\..\CommonSrc\Render\Render_XmlSceneLoader.h" />
     <ClInclude Include="..\..\..\OculusWorldDemo.h" />
     <ClInclude Include="..\..\..\Player.h" />
-    <ClInclude Include="..\..\..\RenderProfiler.h" />
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\..\..\OculusWorldDemo.rc" />
diff --git a/Samples/OculusWorldDemo/Projects/Win/VS2010/OculusWorldDemo.vcxproj.filters b/Samples/OculusWorldDemo/Projects/Win/VS2010/OculusWorldDemo.vcxproj.filters
index 67678ea..6e568ee 100644
--- a/Samples/OculusWorldDemo/Projects/Win/VS2010/OculusWorldDemo.vcxproj.filters
+++ b/Samples/OculusWorldDemo/Projects/Win/VS2010/OculusWorldDemo.vcxproj.filters
@@ -10,6 +10,9 @@
     <Filter Include="CommonSrc\Render">
       <UniqueIdentifier>{1b6d51ae-a405-4f3d-be93-41a50db4f328}</UniqueIdentifier>
     </Filter>
+    <Filter Include="CommonSrc\Util">
+      <UniqueIdentifier>{604daee3-bd81-41a5-ac3f-181bbbe9416a}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\..\CommonSrc\Platform\Platform.cpp">
@@ -45,8 +48,6 @@
       <Filter>CommonSrc\Platform</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\OculusWorldDemo_Scene.cpp" />
-    <ClCompile Include="..\..\..\OptionMenu.cpp" />
-    <ClCompile Include="..\..\..\RenderProfiler.cpp" />
     <ClCompile Include="..\..\..\..\..\3rdParty\TinyXml\tinyxml2.cpp" />
     <ClCompile Include="..\..\..\..\CommonSrc\Render\Render_GL_Device.cpp">
       <Filter>CommonSrc\Render</Filter>
@@ -54,6 +55,12 @@
     <ClCompile Include="..\..\..\..\CommonSrc\Render\Render_GL_Win32_Device.cpp">
       <Filter>CommonSrc\Render</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\..\CommonSrc\Util\OptionMenu.cpp">
+      <Filter>CommonSrc\Util</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\CommonSrc\Util\RenderProfiler.cpp">
+      <Filter>CommonSrc\Util</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\..\CommonSrc\Platform\Win32_Platform.h">
@@ -91,15 +98,19 @@
       <Filter>CommonSrc\Platform</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\OculusWorldDemo.h" />
-    <ClInclude Include="..\..\..\RenderProfiler.h" />
     <ClInclude Include="..\..\..\Player.h" />
-    <ClInclude Include="..\..\..\OptionMenu.h" />
     <ClInclude Include="..\..\..\..\CommonSrc\Render\Render_GL_Device.h">
       <Filter>CommonSrc\Render</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\..\CommonSrc\Render\Render_GL_Win32_Device.h">
       <Filter>CommonSrc\Render</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\..\CommonSrc\Util\OptionMenu.h">
+      <Filter>CommonSrc\Util</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\CommonSrc\Util\RenderProfiler.h">
+      <Filter>CommonSrc\Util</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\..\..\OculusWorldDemo.rc" />