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

Fix VC10 project files. Fix code to build with CUDA 5.5 (the cudaMemcpyToSymbol overload that takes the symbol name as a string was removed).

Browse Source
This commit is contained in:
nathaniel.reed@gmail.com
2013-10-16 21:18:16 +00:00
parent 57b99a1595
commit 77188a42ac
13 changed files with 151 additions and 235 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
project/vc10/nvtt/nvtt.vcxproj
View File

@ -75,7 +75,7 @@
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
<Import Project="$(VCTargetsPath)\BuildCustomizations\CUDA 4.1.props" />
<Import Project="$(VCTargetsPath)\BuildCustomizations\CUDA 5.5.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
@ -112,28 +112,28 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug-CUDA|Win32'">$(Configuration)\$(Platform)\</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug-CUDA|Win32'">$(SolutionDir)\$(Configuration).$(Platform)\bin\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug-CUDA|Win32'">$(Configuration)\$(Platform)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug-CUDA|Win32'">true</LinkIncremental>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug-CUDA|x64'">$(Configuration)\$(Platform)\</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug-CUDA|x64'">$(SolutionDir)\$(Configuration).$(Platform)\bin\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug-CUDA|x64'">$(Configuration)\$(Platform)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug-CUDA|x64'">true</LinkIncremental>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release-CUDA|Win32'">$(Configuration)\$(Platform)\</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release-CUDA|Win32'">$(SolutionDir)\$(Configuration).$(Platform)\bin\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release-CUDA|Win32'">$(Configuration)\$(Platform)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release-CUDA|Win32'">false</LinkIncremental>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release-CUDA|x64'">$(Configuration)\$(Platform)\</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release-CUDA|x64'">$(SolutionDir)\$(Configuration).$(Platform)\bin\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release-CUDA|x64'">$(Configuration)\$(Platform)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release-CUDA|x64'">false</LinkIncremental>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\$(Platform)\</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)\$(Configuration).$(Platform)\bin\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\$(Platform)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Configuration)\$(Platform)\</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\$(Configuration).$(Platform)\bin\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Configuration)\$(Platform)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\$(Platform)\</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)\$(Configuration).$(Platform)\bin\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\$(Platform)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Configuration)\$(Platform)\</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)\$(Configuration).$(Platform)\bin\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Configuration)\$(Platform)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
</PropertyGroup>
@ -152,7 +152,6 @@
</ClCompile>
<Link>
<AdditionalDependencies>cudart.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(SolutionDir)\$(Configuration).$(Platform)\bin\$(ProjectName).dll</OutputFile>
<AdditionalLibraryDirectories>$(CUDA_PATH)\lib\Win32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
@ -193,7 +192,6 @@
</ClCompile>
<Link>
<AdditionalDependencies>cudart.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(SolutionDir)\$(Configuration).$(Platform)\bin\$(ProjectName).dll</OutputFile>
<AdditionalLibraryDirectories>$(CUDA_PATH)\lib\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
@ -235,7 +233,6 @@
</ClCompile>
<Link>
<AdditionalDependencies>cudart.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(SolutionDir)\$(Configuration).$(Platform)\bin\$(ProjectName).dll</OutputFile>
<AdditionalLibraryDirectories>$(CUDA_PATH)\lib\Win32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<SubSystem>Windows</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
@ -277,7 +274,6 @@
</ClCompile>
<Link>
<AdditionalDependencies>cudart.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(SolutionDir)\$(Configuration).$(Platform)\bin\$(ProjectName).dll</OutputFile>
<AdditionalLibraryDirectories>$(CUDA_PATH)\lib\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<SubSystem>Windows</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
@ -310,7 +306,6 @@
</ClCompile>
<Link>
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(SolutionDir)\$(Configuration).$(Platform)\bin\$(ProjectName).dll</OutputFile>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
@ -337,7 +332,6 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
<OutputFile>$(SolutionDir)\$(Configuration).$(Platform)\bin\$(ProjectName).dll</OutputFile>
<AdditionalLibraryDirectories>$(CUDA_LIB_PATH)\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
@ -366,7 +360,6 @@
</ClCompile>
<Link>
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(SolutionDir)\$(Configuration).$(Platform)\bin\$(ProjectName).dll</OutputFile>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<SubSystem>Windows</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
@ -393,7 +386,6 @@
<WarningLevel>Level3</WarningLevel>
</ClCompile>
<Link>
<OutputFile>$(SolutionDir)\$(Configuration).$(Platform)\bin\$(ProjectName).dll</OutputFile>
<AdditionalLibraryDirectories>$(CUDA_LIB_PATH)\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<SubSystem>Windows</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
@ -411,7 +403,9 @@
<ResourceCompile Include="nvtt.rc" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\src\nvtt\BlockCompressor.h" />
<ClInclude Include="..\..\..\src\nvtt\CubeSurface.h" />
<ClInclude Include="..\..\..\src\nvtt\SingleColorLookup.h" />
<ClInclude Include="..\..\..\src\nvtt\Surface.h" />
<ClInclude Include="resource.h" />
<ClInclude Include="..\..\..\src\nvtt\cuda\CudaCompressorDXT.h" />
@ -421,18 +415,17 @@
<ClInclude Include="..\..\..\src\nvtt\CompressionOptions.h" />
<ClInclude Include="..\..\..\src\nvtt\Compressor.h" />
<ClInclude Include="..\..\..\src\nvtt\CompressorDX10.h" />
<CustomBuildStep Include="..\..\..\src\nvtt\CompressorDX11.h">
<ClInclude Include="..\..\..\src\nvtt\CompressorDX11.h">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-CUDA|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-CUDA|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-CUDA|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-CUDA|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-CUDA|x64'">true</ExcludedFromBuild>
</CustomBuildStep>
</ClInclude>
<ClInclude Include="..\..\..\src\nvtt\CompressorDX9.h" />
<ClInclude Include="..\..\..\src\nvtt\CompressorDXT.h" />
<ClInclude Include="..\..\..\src\nvtt\CompressorRGB.h" />
<ClInclude Include="..\..\..\src\nvtt\Context.h" />
<ClInclude Include="..\..\..\src\nvtt\InputOptions.h" />
@ -457,6 +450,7 @@
</CustomBuildStep>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\..\src\nvtt\BlockCompressor.cpp" />
<ClCompile Include="..\..\..\src\nvtt\CubeSurface.cpp" />
<ClCompile Include="..\..\..\src\nvtt\cuda\CudaCompressorDXT.cpp" />
<ClCompile Include="..\..\..\src\nvtt\cuda\CudaUtils.cpp" />
@ -465,16 +459,15 @@
<ClCompile Include="..\..\..\src\nvtt\CompressorDX10.cpp" />
<ClCompile Include="..\..\..\src\nvtt\CompressorDX11.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-CUDA|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-CUDA|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-CUDA|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-CUDA|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-CUDA|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\src\nvtt\CompressorDX9.cpp" />
<ClCompile Include="..\..\..\src\nvtt\CompressorDXT.cpp" />
<ClCompile Include="..\..\..\src\nvtt\CompressorRGB.cpp" />
<ClCompile Include="..\..\..\src\nvtt\Context.cpp" />
<ClCompile Include="..\..\..\src\nvtt\InputOptions.cpp" />
@ -485,6 +478,7 @@
<ClCompile Include="..\..\..\src\nvtt\QuickCompressDXT.cpp" />
<ClCompile Include="..\..\..\src\nvtt\SingleColorLookup.cpp" />
<ClCompile Include="..\..\..\src\nvtt\Surface.cpp" />
<ClCompile Include="..\..\..\src\nvtt\TaskDispatcher.cpp" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\bc6h\bc6h.vcxproj">
@ -530,6 +524,6 @@
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
<Import Project="$(VCTargetsPath)\BuildCustomizations\CUDA 4.1.targets" />
<Import Project="$(VCTargetsPath)\BuildCustomizations\CUDA 5.5.targets" />
</ImportGroup>
</Project>

8
project/vc10/nvtt/nvtt.vcxproj.filters
View File

@ -32,7 +32,6 @@
<ClInclude Include="..\..\..\src\nvtt\Compressor.h" />
<ClInclude Include="..\..\..\src\nvtt\CompressorDX10.h" />
<ClInclude Include="..\..\..\src\nvtt\CompressorDX9.h" />
<ClInclude Include="..\..\..\src\nvtt\CompressorDXT.h" />
<ClInclude Include="..\..\..\src\nvtt\CompressorRGB.h" />
<ClInclude Include="..\..\..\src\nvtt\Context.h" />
<ClInclude Include="..\..\..\src\nvtt\InputOptions.h" />
@ -44,6 +43,9 @@
<ClInclude Include="..\..\..\src\nvtt\TaskDispatcher.h" />
<ClInclude Include="..\..\..\src\nvtt\CubeSurface.h" />
<ClInclude Include="..\..\..\src\nvtt\Surface.h" />
<ClInclude Include="..\..\..\src\nvtt\BlockCompressor.h" />
<ClInclude Include="..\..\..\src\nvtt\SingleColorLookup.h" />
<ClInclude Include="..\..\..\src\nvtt\CompressorDX11.h" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\..\src\nvtt\cuda\CudaCompressorDXT.cpp">
@ -57,7 +59,6 @@
<ClCompile Include="..\..\..\src\nvtt\CompressorDX10.cpp" />
<ClCompile Include="..\..\..\src\nvtt\CompressorDX11.cpp" />
<ClCompile Include="..\..\..\src\nvtt\CompressorDX9.cpp" />
<ClCompile Include="..\..\..\src\nvtt\CompressorDXT.cpp" />
<ClCompile Include="..\..\..\src\nvtt\CompressorRGB.cpp" />
<ClCompile Include="..\..\..\src\nvtt\Context.cpp" />
<ClCompile Include="..\..\..\src\nvtt\InputOptions.cpp" />
@ -69,12 +70,13 @@
<ClCompile Include="..\..\..\src\nvtt\SingleColorLookup.cpp" />
<ClCompile Include="..\..\..\src\nvtt\CubeSurface.cpp" />
<ClCompile Include="..\..\..\src\nvtt\Surface.cpp" />
<ClCompile Include="..\..\..\src\nvtt\BlockCompressor.cpp" />
<ClCompile Include="..\..\..\src\nvtt\TaskDispatcher.cpp" />
</ItemGroup>
<ItemGroup>
<CustomBuildStep Include="..\..\..\src\nvtt\cuda\ConvolveKernel.cu">
<Filter>cuda</Filter>
</CustomBuildStep>
<CustomBuildStep Include="..\..\..\src\nvtt\CompressorDX11.h" />
</ItemGroup>
<ItemGroup>
<CudaCompile Include="..\..\..\src\nvtt\cuda\CompressKernel.cu">