diff options
author | Brad Davis <[email protected]> | 2013-08-16 12:01:23 -0700 |
---|---|---|
committer | Brad Davis <[email protected]> | 2013-08-16 12:01:23 -0700 |
commit | e384cffd7245d1141f9ca81633ab62b07b8907f3 (patch) | |
tree | c5e4debbbe6079ff14b7862cde49bf3b916ffb62 /LibOVR/Projects | |
parent | 20cfcf9dc9485002f05cf50d74ab45375cf0db59 (diff) | |
parent | f29e505a7df820e1376d97b41515bdc89d472499 (diff) |
Merge branch 'master' into stable
Diffstat (limited to 'LibOVR/Projects')
-rw-r--r-- | LibOVR/Projects/Win32/LibOVR_Msvc2010.vcxproj | 8 | ||||
-rw-r--r-- | LibOVR/Projects/Win32/LibOVR_Msvc2010.vcxproj.filters | 6 |
2 files changed, 12 insertions, 2 deletions
diff --git a/LibOVR/Projects/Win32/LibOVR_Msvc2010.vcxproj b/LibOVR/Projects/Win32/LibOVR_Msvc2010.vcxproj index 1cc44e8..2e7fc31 100644 --- a/LibOVR/Projects/Win32/LibOVR_Msvc2010.vcxproj +++ b/LibOVR/Projects/Win32/LibOVR_Msvc2010.vcxproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|Win32"> @@ -50,7 +50,9 @@ <ClInclude Include="..\..\Src\OVR_HIDDevice.h" /> <ClInclude Include="..\..\Src\OVR_HIDDeviceBase.h" /> <ClInclude Include="..\..\Src\OVR_HIDDeviceImpl.h" /> + <ClInclude Include="..\..\Src\OVR_JSON.h" /> <ClInclude Include="..\..\Src\OVR_LatencyTestImpl.h" /> + <ClInclude Include="..\..\Src\OVR_Profile.h" /> <ClInclude Include="..\..\Src\OVR_SensorFilter.h" /> <ClInclude Include="..\..\Src\Util\Util_LatencyTest.h" /> <ClInclude Include="..\..\Src\OVR_SensorFusion.h" /> @@ -84,7 +86,9 @@ <ClCompile Include="..\..\Src\Kernel\OVR_UTF8Util.cpp" /> <ClCompile Include="..\..\Src\OVR_DeviceHandle.cpp" /> <ClCompile Include="..\..\Src\OVR_DeviceImpl.cpp" /> + <ClCompile Include="..\..\Src\OVR_JSON.cpp" /> <ClCompile Include="..\..\Src\OVR_LatencyTestImpl.cpp" /> + <ClCompile Include="..\..\Src\OVR_Profile.cpp" /> <ClCompile Include="..\..\Src\OVR_SensorFilter.cpp" /> <ClCompile Include="..\..\Src\OVR_SensorFusion.cpp" /> <ClCompile Include="..\..\Src\OVR_SensorImpl.cpp" /> @@ -234,6 +238,7 @@ <MultiProcessorCompilation>true</MultiProcessorCompilation> <OmitDefaultLibName>true</OmitDefaultLibName> <DebugInformationFormat>OldStyle</DebugInformationFormat> + <WholeProgramOptimization>false</WholeProgramOptimization> </ClCompile> <Link> <SubSystem>Windows</SubSystem> @@ -258,6 +263,7 @@ <MultiProcessorCompilation>true</MultiProcessorCompilation> <OmitDefaultLibName>true</OmitDefaultLibName> <DebugInformationFormat>OldStyle</DebugInformationFormat> + <WholeProgramOptimization>false</WholeProgramOptimization> </ClCompile> <Link> <SubSystem>Windows</SubSystem> diff --git a/LibOVR/Projects/Win32/LibOVR_Msvc2010.vcxproj.filters b/LibOVR/Projects/Win32/LibOVR_Msvc2010.vcxproj.filters index 7e00c30..016a15d 100644 --- a/LibOVR/Projects/Win32/LibOVR_Msvc2010.vcxproj.filters +++ b/LibOVR/Projects/Win32/LibOVR_Msvc2010.vcxproj.filters @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup> <ClCompile Include="..\..\Src\OVR_SensorFusion.cpp" /> @@ -73,6 +73,8 @@ <Filter>Util</Filter> </ClCompile> <ClCompile Include="..\..\Src\OVR_SensorFilter.cpp" /> + <ClCompile Include="..\..\Src\OVR_JSON.cpp" /> + <ClCompile Include="..\..\Src\OVR_Profile.cpp" /> </ItemGroup> <ItemGroup> <ClInclude Include="..\..\Src\OVR_DeviceImpl.h" /> @@ -171,6 +173,8 @@ <Filter>Util</Filter> </ClInclude> <ClInclude Include="..\..\Src\OVR_SensorFilter.h" /> + <ClInclude Include="..\..\Src\OVR_JSON.h" /> + <ClInclude Include="..\..\Src\OVR_Profile.h" /> </ItemGroup> <ItemGroup> <Filter Include="Kernel"> |