Merge changes from The Witness.

2011-04-06 02:41:15 +00:00
parent 9ebcff93de
commit 8a837981b6
19 changed files with 212 additions and 45 deletions
--- a/project/vc9/nvconfig.h
+++ b/project/vc9/nvconfig.h
@ -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