Merge branch 'vc12' into monogame

This commit is contained in:
Tom Spilman 2018-02-23 20:00:47 -06:00
commit 73d8da0ea1
4 changed files with 5 additions and 0 deletions

View File

@ -158,6 +158,7 @@
<ClCompile Include="..\..\..\src\nvimage\ErrorMetric.cpp" />
<ClCompile Include="..\..\..\src\nvimage\Filter.cpp" />
<ClCompile Include="..\..\..\src\nvimage\FloatImage.cpp" />
<ClCompile Include="..\..\..\src\nvimage\KtxFile.cpp" />
<ClCompile Include="..\..\..\src\nvmath\Half.cpp" />
<ClCompile Include="..\..\..\src\nvimage\Image.cpp" />
<ClCompile Include="..\..\..\src\nvimage\ImageIO.cpp" />
@ -171,6 +172,7 @@
<ClInclude Include="..\..\..\src\nvimage\ErrorMetric.h" />
<ClInclude Include="..\..\..\src\nvimage\Filter.h" />
<ClInclude Include="..\..\..\src\nvimage\FloatImage.h" />
<ClInclude Include="..\..\..\src\nvimage\KtxFile.h" />
<ClInclude Include="..\..\..\src\nvmath\Half.h" />
<ClInclude Include="..\..\..\src\nvimage\Image.h" />
<ClInclude Include="..\..\..\src\nvimage\ImageIO.h" />

View File

@ -173,6 +173,7 @@
<ClCompile Include="..\..\..\src\nvmath\Fitting.cpp" />
<ClCompile Include="..\..\..\src\nvmath\Gamma.cpp" />
<ClCompile Include="..\..\..\src\nvmath\Half.cpp" />
<ClCompile Include="..\..\..\src\nvmath\Matrix.cpp" />
<ClCompile Include="..\..\..\src\nvmath\Plane.cpp" />
<ClCompile Include="..\..\..\src\nvmath\SphericalHarmonic.cpp" />
</ItemGroup>

View File

@ -462,6 +462,7 @@
<ClCompile Include="..\..\..\src\nvtt\BlockCompressor.cpp" />
<ClCompile Include="..\..\..\src\nvtt\CompressorDXT1.cpp" />
<ClCompile Include="..\..\..\src\nvtt\CompressorDXT5_RGBM.cpp" />
<ClCompile Include="..\..\..\src\nvtt\CompressorETC.cpp" />
<ClCompile Include="..\..\..\src\nvtt\CubeSurface.cpp" />
<ClCompile Include="..\..\..\src\nvtt\cuda\CudaCompressorDXT.cpp" />
<ClCompile Include="..\..\..\src\nvtt\cuda\CudaUtils.cpp" />

View File

@ -76,6 +76,7 @@
<ClCompile Include="..\..\..\src\nvtt\TaskDispatcher.cpp" />
<ClCompile Include="..\..\..\src\nvtt\CompressorDXT1.cpp" />
<ClCompile Include="..\..\..\src\nvtt\CompressorDXT5_RGBM.cpp" />
<ClCompile Include="..\..\..\src\nvtt\CompressorETC.cpp" />
</ItemGroup>
<ItemGroup>
<CustomBuildStep Include="..\..\..\src\nvtt\cuda\ConvolveKernel.cu">