drewcassidy/nvidia-texture-tools
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #225 from Skylark13/master

Browse Source 
Fix compilation on VS2013 (non-CUDA)
This commit is contained in:
Ignacio 2015-07-20 13:15:55 +02:00
commit 592c8b8b0a
4 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
project/vc12/nvcore/nvcore.vcxproj
View File

@ -154,7 +154,6 @@
<ClInclude Include="..\..\..\src\nvcore\Debug.h" /> <ClInclude Include="..\..\..\src\nvcore\Debug.h" />
<ClInclude Include="..\..\..\src\nvcore\DefsVcWin32.h" /> <ClInclude Include="..\..\..\src\nvcore\DefsVcWin32.h" />
<ClInclude Include="..\..\..\src\nvcore\FileSystem.h" /> <ClInclude Include="..\..\..\src\nvcore\FileSystem.h" />
<ClInclude Include="..\..\..\src\nvcore\Library.h" />
<ClInclude Include="..\..\..\src\nvcore\Memory.h" /> <ClInclude Include="..\..\..\src\nvcore\Memory.h" />
<ClInclude Include="..\..\..\src\nvcore\nvcore.h" /> <ClInclude Include="..\..\..\src\nvcore\nvcore.h" />
<ClInclude Include="..\..\..\src\nvcore\Ptr.h" /> <ClInclude Include="..\..\..\src\nvcore\Ptr.h" />
@ -166,7 +165,6 @@
<ItemGroup> <ItemGroup>
<ClCompile Include="..\..\..\src\nvcore\Debug.cpp" /> <ClCompile Include="..\..\..\src\nvcore\Debug.cpp" />
<ClCompile Include="..\..\..\src\nvcore\FileSystem.cpp" /> <ClCompile Include="..\..\..\src\nvcore\FileSystem.cpp" />
<ClCompile Include="..\..\..\src\nvcore\Library.cpp" />
<ClCompile Include="..\..\..\src\nvcore\Memory.cpp" /> <ClCompile Include="..\..\..\src\nvcore\Memory.cpp" />
<ClCompile Include="..\..\..\src\nvcore\StrLib.cpp" /> <ClCompile Include="..\..\..\src\nvcore\StrLib.cpp" />
<ClCompile Include="..\..\..\src\nvcore\TextWriter.cpp" /> <ClCompile Include="..\..\..\src\nvcore\TextWriter.cpp" />

8
project/vc12/nvdecompress/nvdecompress.vcxproj
View File

@ -226,6 +226,14 @@
<Project>{50c465fe-b308-42bc-894d-89484482af06}</Project> <Project>{50c465fe-b308-42bc-894d-89484482af06}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly> <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\nvtt\nvtt.vcxproj">
<Project>{1aeb7681-57d8-48ee-813d-5c41cc38b647}</Project>
<Private>false</Private>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
<CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
<LinkLibraryDependencies>true</LinkLibraryDependencies>
<UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
</ProjectReference>
</ItemGroup> </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets"> <ImportGroup Label="ExtensionTargets">

8
project/vc12/nvimgdiff/nvimgdiff.vcxproj
View File

@ -228,6 +228,14 @@
<Project>{50c465fe-b308-42bc-894d-89484482af06}</Project> <Project>{50c465fe-b308-42bc-894d-89484482af06}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly> <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\nvtt\nvtt.vcxproj">
<Project>{1aeb7681-57d8-48ee-813d-5c41cc38b647}</Project>
<Private>false</Private>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
<CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
<LinkLibraryDependencies>true</LinkLibraryDependencies>
<UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
</ProjectReference>
</ItemGroup> </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets"> <ImportGroup Label="ExtensionTargets">

3
project/vc12/nvtt.sln
View File

@ -343,7 +343,4 @@ Global
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE
EndGlobalSection EndGlobalSection
GlobalSection(Performance) = preSolution
HasPerformanceSessions = true
EndGlobalSection
EndGlobal EndGlobal