Update vs2017 project files.

4 years ago · ea53e0b1ee
parent 721cc85da7
commit ea53e0b1ee
10 changed files with 21 additions and 28 deletions
--- a/.gitignore
+++ b/.gitignore
@ -13,3 +13,4 @@
 *.sdf
 *.suo
 build
+.vs
--- a/project/vc2017/nvassemble/nvassemble.vcxproj
+++ b/project/vc2017/nvassemble/nvassemble.vcxproj
@ -114,8 +114,8 @@
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <Link>
-      <AdditionalDependencies>libpng.lib;jpeg.lib;tiff.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\..\extern\gnuwin32\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <RandomizedBaseAddress>false</RandomizedBaseAddress>
      <DataExecutionPrevention>
      </DataExecutionPrevention>
@ -164,8 +164,8 @@
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <Link>
-      <AdditionalDependencies>libpng.lib;jpeg.lib;tiff.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\..\extern\gnuwin32\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <RandomizedBaseAddress>false</RandomizedBaseAddress>
      <DataExecutionPrevention>
      </DataExecutionPrevention>
--- a/project/vc2017/nvddsinfo/nvddsinfo.vcxproj
+++ b/project/vc2017/nvddsinfo/nvddsinfo.vcxproj
@ -114,8 +114,8 @@
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <Link>
-      <AdditionalDependencies>libpng.lib;jpeg.lib;tiff.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\..\extern\gnuwin32\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <RandomizedBaseAddress>false</RandomizedBaseAddress>
      <DataExecutionPrevention>
      </DataExecutionPrevention>
@ -164,8 +164,8 @@
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <Link>
-      <AdditionalDependencies>libpng.lib;jpeg.lib;tiff.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\..\extern\gnuwin32\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <RandomizedBaseAddress>false</RandomizedBaseAddress>
      <DataExecutionPrevention>
      </DataExecutionPrevention>
--- a/project/vc2017/nvdecompress/nvdecompress.vcxproj
+++ b/project/vc2017/nvdecompress/nvdecompress.vcxproj
@ -98,7 +98,7 @@
    </ClCompile>
    <Link>
      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(GnuWinDir)\lib; $(FreeImageDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <GenerateDebugInformation>true</GenerateDebugInformation>
      <SubSystem>Console</SubSystem>
      <RandomizedBaseAddress>false</RandomizedBaseAddress>
@ -125,13 +125,14 @@
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <Link>
-      <AdditionalLibraryDirectories>..\..\..\extern\gnuwin32\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <GenerateDebugInformation>true</GenerateDebugInformation>
      <SubSystem>Console</SubSystem>
      <RandomizedBaseAddress>false</RandomizedBaseAddress>
      <DataExecutionPrevention>
      </DataExecutionPrevention>
      <TargetMachine>MachineX64</TargetMachine>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
    </Link>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@ -155,7 +156,7 @@
    </ClCompile>
    <Link>
      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(GnuWinDir)\lib; $(FreeImageDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <GenerateDebugInformation>false</GenerateDebugInformation>
      <SubSystem>Console</SubSystem>
      <OptimizeReferences>true</OptimizeReferences>
@ -186,7 +187,7 @@
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <Link>
-      <AdditionalLibraryDirectories>..\..\..\extern\gnuwin32\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <SubSystem>Console</SubSystem>
      <OptimizeReferences>true</OptimizeReferences>
      <EnableCOMDATFolding>true</EnableCOMDATFolding>
@ -194,6 +195,7 @@
      <DataExecutionPrevention>
      </DataExecutionPrevention>
      <TargetMachine>MachineX64</TargetMachine>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
    </Link>
  </ItemDefinitionGroup>
  <ItemGroup>
--- a/project/vc2017/nvimgdiff/nvimgdiff.vcxproj
+++ b/project/vc2017/nvimgdiff/nvimgdiff.vcxproj
@ -98,7 +98,7 @@
    </ClCompile>
    <Link>
      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(GnuWinDir)\lib; $(FreeImageDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <GenerateDebugInformation>true</GenerateDebugInformation>
      <SubSystem>Console</SubSystem>
      <RandomizedBaseAddress>false</RandomizedBaseAddress>
@ -125,7 +125,7 @@
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <Link>
-      <AdditionalLibraryDirectories>..\..\..\extern\gnuwin32\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <GenerateDebugInformation>true</GenerateDebugInformation>
      <SubSystem>Console</SubSystem>
      <RandomizedBaseAddress>false</RandomizedBaseAddress>
@ -156,7 +156,7 @@
    </ClCompile>
    <Link>
      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(GnuWinDir)\lib; $(FreeImageDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <GenerateDebugInformation>false</GenerateDebugInformation>
      <SubSystem>Console</SubSystem>
      <OptimizeReferences>true</OptimizeReferences>
@ -187,7 +187,7 @@
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <Link>
-      <AdditionalLibraryDirectories>..\..\..\extern\gnuwin32\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <SubSystem>Console</SubSystem>
      <OptimizeReferences>true</OptimizeReferences>
      <EnableCOMDATFolding>true</EnableCOMDATFolding>
--- a/project/vc2017/nvmath/nvmath.vcxproj
+++ b/project/vc2017/nvmath/nvmath.vcxproj
@ -163,9 +163,6 @@
    <ClInclude Include="..\..\..\src\nvmath\Matrix.h" />
    <ClInclude Include="..\..\..\src\nvmath\nvmath.h" />
    <ClInclude Include="..\..\..\src\nvmath\Plane.h" />
-    <ClInclude Include="..\..\..\src\nvmath\SimdVector.h" />
-    <ClInclude Include="..\..\..\src\nvmath\SimdVector_SSE.h" />
-    <ClInclude Include="..\..\..\src\nvmath\SimdVector_VE.h" />
    <ClInclude Include="..\..\..\src\nvmath\SphericalHarmonic.h" />
    <ClInclude Include="..\..\..\src\nvmath\Vector.h" />
  </ItemGroup>
--- a/project/vc2017/nvtt.props
+++ b/project/vc2017/nvtt.props
@ -4,6 +4,5 @@
 	<PropertyGroup Label="UserMacros">
 		<SrcDir>$(SolutionDir)..\..\src</SrcDir>
 		<ExternDir>$(SolutionDir)..\..\extern</ExternDir>
-		<GnuWinDir>$(ExternDir)\gnuwin32</GnuWinDir>
 	</PropertyGroup>
 </Project>
--- a/project/vc2017/nvtt/nvtt.vcxproj
+++ b/project/vc2017/nvtt/nvtt.vcxproj
@ -430,7 +430,6 @@
    <ClInclude Include="..\..\..\src\nvtt\cuda\CudaCompressorDXT.h" />
    <ClInclude Include="..\..\..\src\nvtt\cuda\CudaMath.h" />
    <ClInclude Include="..\..\..\src\nvtt\cuda\CudaUtils.h" />
-    <ClInclude Include="..\..\..\src\nvtt\ClusterFit.h" />
    <ClInclude Include="..\..\..\src\nvtt\CompressionOptions.h" />
    <ClInclude Include="..\..\..\src\nvtt\Compressor.h" />
    <ClInclude Include="..\..\..\src\nvtt\CompressorDX10.h" />
@ -466,7 +465,6 @@
    <ClCompile Include="..\..\..\src\nvtt\CubeSurface.cpp" />
    <ClCompile Include="..\..\..\src\nvtt\cuda\CudaCompressorDXT.cpp" />
    <ClCompile Include="..\..\..\src\nvtt\cuda\CudaUtils.cpp" />
-    <ClCompile Include="..\..\..\src\nvtt\ClusterFit.cpp" />
    <ClCompile Include="..\..\..\src\nvtt\CompressionOptions.cpp" />
    <ClCompile Include="..\..\..\src\nvtt\CompressorDX10.cpp" />
    <ClCompile Include="..\..\..\src\nvtt\CompressorDX11.cpp" />
@ -482,7 +480,6 @@
    <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">
--- a/project/vc2017/nvtt/nvtt.vcxproj.filters
+++ b/project/vc2017/nvtt/nvtt.vcxproj.filters
@ -27,7 +27,6 @@
    <ClInclude Include="..\..\..\src\nvtt\cuda\CudaUtils.h">
      <Filter>cuda</Filter>
    </ClInclude>
-    <ClInclude Include="..\..\..\src\nvtt\ClusterFit.h" />
    <ClInclude Include="..\..\..\src\nvtt\CompressionOptions.h" />
    <ClInclude Include="..\..\..\src\nvtt\Compressor.h" />
    <ClInclude Include="..\..\..\src\nvtt\CompressorDX10.h" />
@ -56,7 +55,6 @@
    <ClCompile Include="..\..\..\src\nvtt\cuda\CudaUtils.cpp">
      <Filter>cuda</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\..\src\nvtt\ClusterFit.cpp" />
    <ClCompile Include="..\..\..\src\nvtt\CompressionOptions.cpp" />
    <ClCompile Include="..\..\..\src\nvtt\CompressorDX10.cpp" />
    <ClCompile Include="..\..\..\src\nvtt\CompressorDX11.cpp" />
@ -73,7 +71,6 @@
    <ClCompile Include="..\..\..\src\nvtt\CubeSurface.cpp" />
    <ClCompile Include="..\..\..\src\nvtt\Surface.cpp" />
    <ClCompile Include="..\..\..\src\nvtt\BlockCompressor.cpp" />
-    <ClCompile Include="..\..\..\src\nvtt\TaskDispatcher.cpp" />
    <ClCompile Include="..\..\..\src\nvtt\CompressorDXT5_RGBM.cpp" />
    <ClCompile Include="..\..\..\src\nvtt\CompressorETC.cpp" />
    <ClCompile Include="..\..\..\src\nvtt\icbc.cpp" />
--- a/src/nvtt/CompressorETC.cpp
+++ b/src/nvtt/CompressorETC.cpp
@ -6,8 +6,8 @@
 #include "nvmath/Color.inl"
 #include "nvcore/Utils.h"    // clamp

-#define HAVE_RGETC 1
-#define HAVE_ETCPACK 0 // Only enable in OSX for debugging.
+//#define HAVE_RGETC 0
+//#define HAVE_ETCPACK 0 // Only enable in OSX for debugging.

 #if HAVE_RGETC
 #include "rg_etc1.h"