Merge pull request #225 from Skylark13/master

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

View File

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

View File

@ -226,6 +226,14 @@
<Project>{50c465fe-b308-42bc-894d-89484482af06}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</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>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">

View File

@ -228,6 +228,14 @@
<Project>{50c465fe-b308-42bc-894d-89484482af06}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</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>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">

View File

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