diff --git a/Source/CMakeLib.dsp b/Source/CMakeLib.dsp
index 56a982ee2..9da72ea41 100644
--- a/Source/CMakeLib.dsp
+++ b/Source/CMakeLib.dsp
@@ -41,7 +41,7 @@ RSC=rc.exe
 # PROP Intermediate_Dir "Release"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
 BSC32=bscmake.exe
@@ -63,8 +63,8 @@ LIB32=link.exe -lib
 # PROP Output_Dir "Debug"
 # PROP Intermediate_Dir "Debug"
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ  /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ  /c
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
 BSC32=bscmake.exe
@@ -85,51 +85,51 @@ LIB32=link.exe -lib
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
 # Begin Source File
 
-SOURCE=..\cmCacheManager.cxx
+SOURCE=.\cmCacheManager.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\cmClassFile.cxx
+SOURCE=.\cmClassFile.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\cmCommands.cxx
+SOURCE=.\cmCommands.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\cmDirectory.cxx
+SOURCE=.\cmDirectory.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\cmDSPMakefile.cxx
+SOURCE=.\cmDSPMakefile.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\cmDSWMakefile.cxx
+SOURCE=.\cmDSWMakefile.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\cmMakefile.cxx
+SOURCE=.\cmMakefile.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\cmMakefileGenerator.cxx
+SOURCE=.\cmMakefileGenerator.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\cmMSProjectGenerator.cxx
+SOURCE=.\cmMSProjectGenerator.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\cmRegularExpression.cxx
+SOURCE=.\cmRegularExpression.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\cmSystemTools.cxx
+SOURCE=.\cmSystemTools.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\cmWindowsConfigure.cxx
+SOURCE=.\cmWindowsConfigure.cxx
 # End Source File
 # End Group
 # Begin Group "Header Files"
@@ -141,140 +141,280 @@ SOURCE=..\cmAbstractFilesCommand.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\cmAbstractFilesCommand.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\cmAddTargetCommand.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\cmAddTargetCommand.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\cmAuxSourceDirectoryCommand.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\cmAuxSourceDirectoryCommand.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\cmCacheManager.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\cmCacheManager.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\cmClassFile.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\cmClassFile.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\cmCommand.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\cmCommand.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\cmDirectory.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\cmDirectory.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\cmDSPMakefile.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\cmDSPMakefile.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\cmDSWMakefile.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\cmDSWMakefile.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\cmExecutablesCommand.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\cmExecutablesCommand.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\cmFindIncludeCommand.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\cmFindIncludeCommand.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\cmFindLibraryCommand.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\cmFindLibraryCommand.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\cmFindProgramCommand.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\cmFindProgramCommand.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\cmIncludeDirectoryCommand.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\cmIncludeDirectoryCommand.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\cmLibraryCommand.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\cmLibraryCommand.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\cmLinkDirectoriesCommand.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\cmLinkDirectoriesCommand.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\cmLinkLibrariesCommand.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\cmLinkLibrariesCommand.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\cmMakeDepend.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\cmMakeDepend.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\cmMakefile.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\cmMakefile.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\cmMakefileGenerator.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\cmMakefileGenerator.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\cmMSProjectGenerator.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\cmMSProjectGenerator.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\cmProjectCommand.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\cmProjectCommand.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\cmRegularExpression.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\cmRegularExpression.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\cmSourceFilesCommand.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\cmSourceFilesCommand.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\cmSourceFilesRequireCommand.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\cmSourceFilesRequireCommand.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\cmStandardIncludes.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\cmStandardIncludes.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\cmSubdirCommand.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\cmSubdirCommand.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\cmSystemTools.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\cmSystemTools.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\cmTestsCommand.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\cmTestsCommand.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\cmUnixDefinesCommand.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\cmUnixDefinesCommand.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\cmUnixLibrariesCommand.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\cmUnixLibrariesCommand.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\cmUnixMakefileGenerator.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\cmUnixMakefileGenerator.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\cmWin32DefinesCommand.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\cmWin32DefinesCommand.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\cmWin32LibrariesCommand.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\cmWin32LibrariesCommand.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\cmWindowsConfigure.h
 # End Source File
+# Begin Source File
+
+SOURCE=.\cmWindowsConfigure.h
+# End Source File
 # End Group
 # End Target
 # End Project
diff --git a/Source/CMakeSetup.dsw b/Source/CMakeSetup.dsw
index 9dc92397a..5b3a458f5 100644
--- a/Source/CMakeSetup.dsw
+++ b/Source/CMakeSetup.dsw
@@ -26,6 +26,9 @@ Package=<4>
     Begin Project Dependency
     Project_Dep_Name CMakeSetupCMD
     End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name CMakeLib
+    End Project Dependency
 }}}
 
 ###############################################################################
@@ -38,6 +41,9 @@ Package=<5>
 
 Package=<4>
 {{{
+    Begin Project Dependency
+    Project_Dep_Name CMakeLib
+    End Project Dependency
 }}}
 
 ###############################################################################
diff --git a/Source/CMakeSetupCMD.dsp b/Source/CMakeSetupCMD.dsp
index 3078318f3..185f72696 100644
--- a/Source/CMakeSetupCMD.dsp
+++ b/Source/CMakeSetupCMD.dsp
@@ -42,7 +42,7 @@ RSC=rc.exe
 # PROP Intermediate_Dir "Release"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GR /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GR /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GR /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -68,7 +68,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /W3 /Gm /GR /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GR /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -78,7 +78,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 Debug/CMakeLib.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
 
 !ENDIF 
 
diff --git a/Source/MFCDialog/CMakeSetup.dsp b/Source/MFCDialog/CMakeSetup.dsp
index ec0423451..2b0d9e4fc 100644
--- a/Source/MFCDialog/CMakeSetup.dsp
+++ b/Source/MFCDialog/CMakeSetup.dsp
@@ -40,6 +40,7 @@ RSC=rc.exe
 # PROP Use_Debug_Libraries 0
 # PROP Output_Dir ".."
 # PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_AFXDLL" /Yu"stdafx.h" /FD /c
 # ADD CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_AFXDLL" /D "_MBCS" /FD /c
@@ -53,7 +54,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 /nologo /subsystem:windows /machine:I386
-# ADD LINK32 Release/CMakeLib.lib /nologo /subsystem:windows /machine:I386
+# ADD LINK32 ../Release/CMakeLib.lib /nologo /subsystem:windows /machine:I386
 
 !ELSEIF  "$(CFG)" == "CMakeSetup - Win32 Debug"
 
@@ -80,7 +81,8 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 Debug/CMakeLib.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 ../Debug/CMakeLib.lib /subsystem:windows /debug /machine:I386 /pdbtype:sept
+# SUBTRACT LINK32 /nologo
 
 !ENDIF