diff options
| author | Brad Davis <[email protected]> | 2014-08-11 21:18:59 -0700 |
|---|---|---|
| committer | Brad Davis <[email protected]> | 2014-08-11 21:18:59 -0700 |
| commit | 04a03e83f135fbfccbc960b13e05729490ccd375 (patch) | |
| tree | 7878b192a3fd24eb69f54744dc17f44f53b0ac1a /LibOVR/Projects/Win32 | |
| parent | 0f49ce8fc6aa54224e4c0d6fda8c4527ad39cce1 (diff) | |
Adding 0.4.1 windows files
Diffstat (limited to 'LibOVR/Projects/Win32')
| -rw-r--r-- | LibOVR/Projects/Win32/VS2010/LibOVR.vcxproj | 2 | ||||
| -rw-r--r-- | LibOVR/Projects/Win32/VS2010/LibOVR.vcxproj.filters | 6 | ||||
| -rw-r--r-- | LibOVR/Projects/Win32/VS2012/LibOVR.vcxproj | 2 | ||||
| -rw-r--r-- | LibOVR/Projects/Win32/VS2012/LibOVR.vcxproj.filters | 6 | ||||
| -rw-r--r-- | LibOVR/Projects/Win32/VS2013/LibOVR.vcxproj | 26 | ||||
| -rw-r--r-- | LibOVR/Projects/Win32/VS2013/LibOVR.vcxproj.filters | 20 |
6 files changed, 28 insertions, 34 deletions
diff --git a/LibOVR/Projects/Win32/VS2010/LibOVR.vcxproj b/LibOVR/Projects/Win32/VS2010/LibOVR.vcxproj index f2d730a..e130392 100644 --- a/LibOVR/Projects/Win32/VS2010/LibOVR.vcxproj +++ b/LibOVR/Projects/Win32/VS2010/LibOVR.vcxproj @@ -95,7 +95,6 @@ <ClInclude Include="..\..\..\Src\Util\Util_LatencyTest2Reader.h" />
<ClInclude Include="..\..\..\Src\Util\Util_LatencyTest2State.h" />
<ClInclude Include="..\..\..\Src\Util\Util_Render_Stereo.h" />
- <ClInclude Include="..\..\..\Src\Util\Util_Settings.h" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\..\Src\CAPI\CAPI_DistortionRenderer.cpp" />
@@ -168,7 +167,6 @@ <ClCompile Include="..\..\..\Src\Util\Util_Interface.cpp" />
<ClCompile Include="..\..\..\Src\Util\Util_LatencyTest2Reader.cpp" />
<ClCompile Include="..\..\..\Src\Util\Util_Render_Stereo.cpp" />
- <ClCompile Include="..\..\..\Src\Util\Util_Settings.cpp" />
</ItemGroup>
<ItemGroup>
<CustomBuild Include="..\..\..\Src\CAPI\Shaders\DistortionChroma_ps.psh">
diff --git a/LibOVR/Projects/Win32/VS2010/LibOVR.vcxproj.filters b/LibOVR/Projects/Win32/VS2010/LibOVR.vcxproj.filters index 1bd6a64..eb06f95 100644 --- a/LibOVR/Projects/Win32/VS2010/LibOVR.vcxproj.filters +++ b/LibOVR/Projects/Win32/VS2010/LibOVR.vcxproj.filters @@ -156,9 +156,6 @@ <ClCompile Include="..\..\..\Src\Util\Util_LatencyTest2Reader.cpp">
<Filter>Util</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\Src\Util\Util_Settings.cpp">
- <Filter>Util</Filter>
- </ClCompile>
<ClCompile Include="..\..\..\Src\CAPI\CAPI_HSWDisplay.cpp">
<Filter>CAPI</Filter>
</ClCompile>
@@ -375,9 +372,6 @@ <ClInclude Include="..\..\..\Src\Util\Util_LatencyTest2State.h">
<Filter>Util</Filter>
</ClInclude>
- <ClInclude Include="..\..\..\Src\Util\Util_Settings.h">
- <Filter>Util</Filter>
- </ClInclude>
<ClInclude Include="..\..\..\Src\CAPI\CAPI_HSWDisplay.h">
<Filter>CAPI</Filter>
</ClInclude>
diff --git a/LibOVR/Projects/Win32/VS2012/LibOVR.vcxproj b/LibOVR/Projects/Win32/VS2012/LibOVR.vcxproj index e813cee..8e3a2d6 100644 --- a/LibOVR/Projects/Win32/VS2012/LibOVR.vcxproj +++ b/LibOVR/Projects/Win32/VS2012/LibOVR.vcxproj @@ -96,7 +96,6 @@ <ClInclude Include="..\..\..\Src\Util\Util_LatencyTest2Reader.h" />
<ClInclude Include="..\..\..\Src\Util\Util_LatencyTest2State.h" />
<ClInclude Include="..\..\..\Src\Util\Util_Render_Stereo.h" />
- <ClInclude Include="..\..\..\Src\Util\Util_Settings.h" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\..\Src\CAPI\CAPI_DistortionRenderer.cpp" />
@@ -170,7 +169,6 @@ <ClCompile Include="..\..\..\Src\Util\Util_Interface.cpp" />
<ClCompile Include="..\..\..\Src\Util\Util_LatencyTest2Reader.cpp" />
<ClCompile Include="..\..\..\Src\Util\Util_Render_Stereo.cpp" />
- <ClCompile Include="..\..\..\Src\Util\Util_Settings.cpp" />
</ItemGroup>
<ItemGroup>
<CustomBuild Include="..\..\..\Src\CAPI\Shaders\DistortionChroma_ps.psh">
diff --git a/LibOVR/Projects/Win32/VS2012/LibOVR.vcxproj.filters b/LibOVR/Projects/Win32/VS2012/LibOVR.vcxproj.filters index e7aa773..945e5b9 100644 --- a/LibOVR/Projects/Win32/VS2012/LibOVR.vcxproj.filters +++ b/LibOVR/Projects/Win32/VS2012/LibOVR.vcxproj.filters @@ -159,9 +159,6 @@ <ClCompile Include="..\..\..\Src\Kernel\OVR_ThreadCommandQueue.cpp">
<Filter>Kernel</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\Src\Util\Util_Settings.cpp">
- <Filter>Util</Filter>
- </ClCompile>
<ClCompile Include="..\..\..\Src\CAPI\CAPI_HSWDisplay.cpp">
<Filter>CAPI</Filter>
</ClCompile>
@@ -381,9 +378,6 @@ <ClInclude Include="..\..\..\Src\Kernel\OVR_ThreadCommandQueue.h">
<Filter>Kernel</Filter>
</ClInclude>
- <ClInclude Include="..\..\..\Src\Util\Util_Settings.h">
- <Filter>Util</Filter>
- </ClInclude>
<ClInclude Include="..\..\..\Src\CAPI\CAPI_HSWDisplay.h">
<Filter>CAPI</Filter>
</ClInclude>
diff --git a/LibOVR/Projects/Win32/VS2013/LibOVR.vcxproj b/LibOVR/Projects/Win32/VS2013/LibOVR.vcxproj index 842da0a..92c5826 100644 --- a/LibOVR/Projects/Win32/VS2013/LibOVR.vcxproj +++ b/LibOVR/Projects/Win32/VS2013/LibOVR.vcxproj @@ -97,7 +97,6 @@ <ClInclude Include="..\..\..\Src\Util\Util_LatencyTest2Reader.h" />
<ClInclude Include="..\..\..\Src\Util\Util_LatencyTest2State.h" />
<ClInclude Include="..\..\..\Src\Util\Util_Render_Stereo.h" />
- <ClInclude Include="..\..\..\Src\Util\Util_Settings.h" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\..\Src\CAPI\CAPI_DistortionRenderer.cpp" />
@@ -171,7 +170,6 @@ <ClCompile Include="..\..\..\Src\Util\Util_Interface.cpp" />
<ClCompile Include="..\..\..\Src\Util\Util_LatencyTest2Reader.cpp" />
<ClCompile Include="..\..\..\Src\Util\Util_Render_Stereo.cpp" />
- <ClCompile Include="..\..\..\Src\Util\Util_Settings.cpp" />
</ItemGroup>
<ItemGroup>
<CustomBuild Include="..\..\..\Src\CAPI\Shaders\DistortionChroma_ps.psh">
@@ -266,8 +264,28 @@ </CustomBuild>
</ItemGroup>
<ItemGroup>
- <None Include="..\..\..\Src\CAPI\Shaders\SimpleTexturedQuad_ps.psh" />
- <None Include="..\..\..\Src\CAPI\Shaders\SimpleTexturedQuad_vs.vsh" />
+ <CustomBuild Include="..\..\..\Src\CAPI\Shaders\SimpleTexturedQuad_ps.psh">
+ <FileType>Document</FileType>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">call %(RelativeDir)genPixelShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">call %(RelativeDir)genPixelShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">call %(RelativeDir)genPixelShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">call %(RelativeDir)genPixelShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RelativeDir)%(Filename).h</Outputs>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RelativeDir)%(Filename).h</Outputs>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(RelativeDir)%(Filename).h</Outputs>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RelativeDir)%(Filename).h</Outputs>
+ </CustomBuild>
+ <CustomBuild Include="..\..\..\Src\CAPI\Shaders\SimpleTexturedQuad_vs.vsh">
+ <FileType>Document</FileType>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">call %(RelativeDir)genVertexShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">call %(RelativeDir)genVertexShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">call %(RelativeDir)genVertexShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">call %(RelativeDir)genVertexShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RelativeDir)%(Filename).h</Outputs>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RelativeDir)%(Filename).h</Outputs>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(RelativeDir)%(Filename).h</Outputs>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RelativeDir)%(Filename).h</Outputs>
+ </CustomBuild>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{EA50E705-5113-49E5-B105-2512EDC8DDC6}</ProjectGuid>
diff --git a/LibOVR/Projects/Win32/VS2013/LibOVR.vcxproj.filters b/LibOVR/Projects/Win32/VS2013/LibOVR.vcxproj.filters index a97b935..d4a0265 100644 --- a/LibOVR/Projects/Win32/VS2013/LibOVR.vcxproj.filters +++ b/LibOVR/Projects/Win32/VS2013/LibOVR.vcxproj.filters @@ -159,9 +159,6 @@ <ClCompile Include="..\..\..\Src\Kernel\OVR_ThreadCommandQueue.cpp">
<Filter>Kernel</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\Src\Util\Util_Settings.cpp">
- <Filter>Util</Filter>
- </ClCompile>
<ClCompile Include="..\..\..\Src\CAPI\CAPI_HSWDisplay.cpp">
<Filter>CAPI</Filter>
</ClCompile>
@@ -381,9 +378,6 @@ <ClInclude Include="..\..\..\Src\Displays\OVR_Display.h">
<Filter>Displays</Filter>
</ClInclude>
- <ClInclude Include="..\..\..\Src\Util\Util_Settings.h">
- <Filter>Util</Filter>
- </ClInclude>
<ClInclude Include="..\..\..\Src\CAPI\CAPI_HSWDisplay.h">
<Filter>CAPI</Filter>
</ClInclude>
@@ -428,6 +422,12 @@ <CustomBuild Include="..\..\..\Src\CAPI\Shaders\SimpleQuad_ps.psh">
<Filter>CAPI\Shaders</Filter>
</CustomBuild>
+ <CustomBuild Include="..\..\..\Src\CAPI\Shaders\SimpleTexturedQuad_ps.psh">
+ <Filter>CAPI\Shaders</Filter>
+ </CustomBuild>
+ <CustomBuild Include="..\..\..\Src\CAPI\Shaders\SimpleTexturedQuad_vs.vsh">
+ <Filter>CAPI\Shaders</Filter>
+ </CustomBuild>
</ItemGroup>
<ItemGroup>
<Filter Include="CAPI">
@@ -467,12 +467,4 @@ <UniqueIdentifier>{4133d45b-be4b-4813-afea-9ad61ce3fe11}</UniqueIdentifier>
</Filter>
</ItemGroup>
- <ItemGroup>
- <None Include="..\..\..\Src\CAPI\Shaders\SimpleTexturedQuad_ps.psh">
- <Filter>CAPI\Shaders</Filter>
- </None>
- <None Include="..\..\..\Src\CAPI\Shaders\SimpleTexturedQuad_vs.vsh">
- <Filter>CAPI\Shaders</Filter>
- </None>
- </ItemGroup>
</Project>
\ No newline at end of file |