diff --git a/project/vc9/nvassemble/nvassemble.vcproj b/project/vc9/nvassemble/nvassemble.vcproj
index aa1aa5b..99a45df 100644
--- a/project/vc9/nvassemble/nvassemble.vcproj
+++ b/project/vc9/nvassemble/nvassemble.vcproj
@@ -246,6 +246,7 @@
 			IntermediateDirectory="$(ConfigurationName)\$(PlatformName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(SolutionDir)\nvtt.vsprops"
+			WholeProgramOptimization="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
diff --git a/project/vc9/nvconfig.h b/project/vc9/nvconfig.h
index e409e60..486d087 100644
--- a/project/vc9/nvconfig.h
+++ b/project/vc9/nvconfig.h
@@ -7,6 +7,10 @@
 //#cmakedefine HAVE_EXECINFO_H
 #define HAVE_MALLOC_H
 
+#if !defined(_DEBUG)
+#define HAVE_OPENMP
+#endif
+
 #if !defined(_M_X64)
 #define HAVE_FREEIMAGE
 //#define HAVE_PNG
diff --git a/project/vc9/nvcore/nvcore.vcproj b/project/vc9/nvcore/nvcore.vcproj
index 238706e..dff9fde 100644
--- a/project/vc9/nvcore/nvcore.vcproj
+++ b/project/vc9/nvcore/nvcore.vcproj
@@ -340,6 +340,10 @@
 				RelativePath="..\..\..\src\nvcore\FileSystem.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\..\src\nvcore\HashMap.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\..\src\nvcore\Library.h"
 				>
diff --git a/project/vc9/nvimage/nvimage.vcproj b/project/vc9/nvimage/nvimage.vcproj
index e211a3f..e203c91 100644
--- a/project/vc9/nvimage/nvimage.vcproj
+++ b/project/vc9/nvimage/nvimage.vcproj
@@ -308,6 +308,10 @@
 				RelativePath="..\..\..\src\nvimage\FloatImage.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\..\..\src\nvmath\Half.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\..\..\src\nvimage\Image.cpp"
 				>
@@ -354,6 +358,10 @@
 				RelativePath="..\..\..\src\nvimage\FloatImage.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\..\src\nvmath\Half.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\..\src\nvimage\Image.h"
 				>
diff --git a/project/vc9/nvtt.sln b/project/vc9/nvtt.sln
index 657b2eb..95f5e38 100644
--- a/project/vc9/nvtt.sln
+++ b/project/vc9/nvtt.sln
@@ -76,6 +76,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "imperativeapi", "imperativeapi\imperativeapi.vcproj", "{7DCF280E-702B-49F3-84A7-AE7E146384D6}"
 	ProjectSection(ProjectDependencies) = postProject
+		{F143D180-D4C4-4037-B3DE-BE89A21C8D1D} = {F143D180-D4C4-4037-B3DE-BE89A21C8D1D}
 		{1AEB7681-57D8-48EE-813D-5C41CC38B647} = {1AEB7681-57D8-48EE-813D-5C41CC38B647}
 	EndProjectSection
 EndProject
@@ -405,22 +406,26 @@ Global
 		{7DCF280E-702B-49F3-84A7-AE7E146384D6}.Debug (no cuda)|Mixed Platforms.Build.0 = Debug|Win32
 		{7DCF280E-702B-49F3-84A7-AE7E146384D6}.Debug (no cuda)|Win32.ActiveCfg = Debug|Win32
 		{7DCF280E-702B-49F3-84A7-AE7E146384D6}.Debug (no cuda)|Win32.Build.0 = Debug|Win32
-		{7DCF280E-702B-49F3-84A7-AE7E146384D6}.Debug (no cuda)|x64.ActiveCfg = Debug|Win32
+		{7DCF280E-702B-49F3-84A7-AE7E146384D6}.Debug (no cuda)|x64.ActiveCfg = Debug|x64
+		{7DCF280E-702B-49F3-84A7-AE7E146384D6}.Debug (no cuda)|x64.Build.0 = Debug|x64
 		{7DCF280E-702B-49F3-84A7-AE7E146384D6}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
 		{7DCF280E-702B-49F3-84A7-AE7E146384D6}.Debug|Mixed Platforms.Build.0 = Debug|Win32
 		{7DCF280E-702B-49F3-84A7-AE7E146384D6}.Debug|Win32.ActiveCfg = Debug|Win32
 		{7DCF280E-702B-49F3-84A7-AE7E146384D6}.Debug|Win32.Build.0 = Debug|Win32
-		{7DCF280E-702B-49F3-84A7-AE7E146384D6}.Debug|x64.ActiveCfg = Debug|Win32
+		{7DCF280E-702B-49F3-84A7-AE7E146384D6}.Debug|x64.ActiveCfg = Debug|x64
+		{7DCF280E-702B-49F3-84A7-AE7E146384D6}.Debug|x64.Build.0 = Debug|x64
 		{7DCF280E-702B-49F3-84A7-AE7E146384D6}.Release (no cuda)|Mixed Platforms.ActiveCfg = Release|x64
 		{7DCF280E-702B-49F3-84A7-AE7E146384D6}.Release (no cuda)|Mixed Platforms.Build.0 = Release|x64
 		{7DCF280E-702B-49F3-84A7-AE7E146384D6}.Release (no cuda)|Win32.ActiveCfg = Release|Win32
 		{7DCF280E-702B-49F3-84A7-AE7E146384D6}.Release (no cuda)|Win32.Build.0 = Release|Win32
-		{7DCF280E-702B-49F3-84A7-AE7E146384D6}.Release (no cuda)|x64.ActiveCfg = Release|Win32
+		{7DCF280E-702B-49F3-84A7-AE7E146384D6}.Release (no cuda)|x64.ActiveCfg = Release|x64
+		{7DCF280E-702B-49F3-84A7-AE7E146384D6}.Release (no cuda)|x64.Build.0 = Release|x64
 		{7DCF280E-702B-49F3-84A7-AE7E146384D6}.Release|Mixed Platforms.ActiveCfg = Release|Win32
 		{7DCF280E-702B-49F3-84A7-AE7E146384D6}.Release|Mixed Platforms.Build.0 = Release|Win32
 		{7DCF280E-702B-49F3-84A7-AE7E146384D6}.Release|Win32.ActiveCfg = Release|Win32
 		{7DCF280E-702B-49F3-84A7-AE7E146384D6}.Release|Win32.Build.0 = Release|Win32
-		{7DCF280E-702B-49F3-84A7-AE7E146384D6}.Release|x64.ActiveCfg = Release|Win32
+		{7DCF280E-702B-49F3-84A7-AE7E146384D6}.Release|x64.ActiveCfg = Release|x64
+		{7DCF280E-702B-49F3-84A7-AE7E146384D6}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/project/vc9/nvtt/nvtt.vcproj b/project/vc9/nvtt/nvtt.vcproj
index 06c01e7..4fff4aa 100644
--- a/project/vc9/nvtt/nvtt.vcproj
+++ b/project/vc9/nvtt/nvtt.vcproj
@@ -762,6 +762,14 @@
 					/>
 				</FileConfiguration>
 			</File>
+			<File
+				RelativePath="..\..\..\src\nvtt\CompressorDX10.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\nvtt\CompressorDX11.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\..\..\src\nvtt\CompressorDXT.cpp"
 				>
@@ -854,10 +862,6 @@
 				RelativePath="..\..\..\src\nvtt\cuda\CudaUtils.cpp"
 				>
 			</File>
-			<File
-				RelativePath="..\..\..\src\nvmath\Half.cpp"
-				>
-			</File>
 			<File
 				RelativePath="..\..\..\src\nvtt\InputOptions.cpp"
 				>
@@ -904,6 +908,14 @@
 				RelativePath="..\..\..\src\nvtt\Compressor.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\..\src\nvtt\CompressorDX10.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\nvtt\CompressorDX11.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\..\src\nvtt\CompressorDXT.h"
 				>
@@ -932,10 +944,6 @@
 				RelativePath="..\..\..\src\nvtt\cuda\CudaUtils.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\..\src\nvmath\Half.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\..\src\nvtt\InputOptions.h"
 				>