Merge changes from The Witness.

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

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"