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

Merge changes from The Witness.

Browse Source
This commit is contained in:
castano
2011-04-06 02:41:15 +00:00
parent 9ebcff93de
commit 8a837981b6
19 changed files with 212 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
project/vc9/nvconfig.h
View File

@ -7,15 +7,15 @@
//#cmakedefine HAVE_EXECINFO_H
#define HAVE_MALLOC_H
#if !defined(_DEBUG)
#if defined(_OPENMP)
#define HAVE_OPENMP
#endif
#if !defined(_M_X64)
/*#if !defined(_M_X64)
//#define HAVE_FREEIMAGE
#define HAVE_PNG
#define HAVE_JPEG
#define HAVE_TIFF
#endif
#endif*/
#endif // NV_CONFIG

4
project/vc9/nvcore/nvcore.vcproj
View File

@ -312,10 +312,6 @@
RelativePath="..\..\..\src\nvcore\FileSystem.h"
>
</File>
<File
RelativePath="..\..\..\src\nvcore\HashMap.h"
>
</File>
<File
RelativePath="..\..\..\src\nvcore\Library.cpp"
>

4
project/vc9/nvtt/nvtt.vcproj
View File

@ -217,7 +217,7 @@
StringPooling="true"
RuntimeLibrary="2"
EnableEnhancedInstructionSet="2"
OpenMP="true"
OpenMP="false"
UsePrecompiledHeader="0"
WarningLevel="3"
DebugInformationFormat="3"
@ -304,7 +304,7 @@
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;NVTT_EXPORTS;NVTT_SHARED;HAVE_CUDA;__SSE2__;__SSE__;__MMX__"
StringPooling="true"
RuntimeLibrary="2"
OpenMP="true"
OpenMP="false"
UsePrecompiledHeader="0"
WarningLevel="3"
DebugInformationFormat="3"