Imported Upstream version 3.9.4upstream/3.9.4

26 files changed, 245 insertions, 1039 deletions

diff --git a/Templates/AppleInfo.plist b/Templates/AppleInfo.plist
index 1f68ccf92..3445e5309 100644
--- a/Templates/AppleInfo.plist
+++ b/Templates/AppleInfo.plist
@@ -28,8 +28,6 @@
 	<string>${APPLE_GUI_BUNDLE_VERSION}</string>
 	<key>CSResourcesFileMapped</key>
 	<true/>
-	<key>LSRequiresCarbon</key>
-	<true/>
 	<key>NSHumanReadableCopyright</key>
 	<string>${APPLE_GUI_COPYRIGHT}</string>
 </dict>
diff --git a/Templates/CMakeVisualStudio6Configurations.cmake b/Templates/CMakeVisualStudio6Configurations.cmake
deleted file mode 100644
index 6355969ab..000000000
--- a/Templates/CMakeVisualStudio6Configurations.cmake
+++ /dev/null
@@ -1,3 +0,0 @@
-# When the dll templates are changed, this list should be
-# updated with the list of possible configurations.
-set(CMAKE_CONFIGURATION_TYPES Debug Release MinSizeRel RelWithDebInfo)
diff --git a/Templates/CPack.GenericDescription.txt b/Templates/CPack.GenericDescription.txt
index 9ca1802ad..712ee145f 100644
--- a/Templates/CPack.GenericDescription.txt
+++ b/Templates/CPack.GenericDescription.txt
@@ -1,5 +1,5 @@
 DESCRIPTION
 ===========
 
-This is an installer created using CPack (http://www.cmake.org). No additional installation instructions provided.
+This is an installer created using CPack (https://cmake.org). No additional installation instructions provided.
 
diff --git a/Templates/CPack.GenericLicense.txt b/Templates/CPack.GenericLicense.txt
index c211bb370..09c621841 100644
--- a/Templates/CPack.GenericLicense.txt
+++ b/Templates/CPack.GenericLicense.txt
@@ -1,5 +1,5 @@
 LICENSE
 =======
 
-This is an installer created using CPack (http://www.cmake.org). No license provided.
+This is an installer created using CPack (https://cmake.org). No license provided.
 
diff --git a/Templates/CPackConfig.cmake.in b/Templates/CPackConfig.cmake.in
index 79b8d93ae..c00ea2a05 100644
--- a/Templates/CPackConfig.cmake.in
+++ b/Templates/CPackConfig.cmake.in
@@ -10,3 +10,11 @@
 # usually begin with CPACK_<GENNAME>_xxxx.
 
 @_CPACK_OTHER_VARIABLES_@
+
+if(NOT CPACK_PROPERTIES_FILE)
+  set(CPACK_PROPERTIES_FILE "@CMAKE_BINARY_DIR@/CPackProperties.cmake")
+endif()
+
+if(EXISTS ${CPACK_PROPERTIES_FILE})
+  include(${CPACK_PROPERTIES_FILE})
+endif()
diff --git a/Templates/DLLFooter.dsptemplate b/Templates/DLLFooter.dsptemplate
deleted file mode 100644
index 0d0682a7b..000000000
--- a/Templates/DLLFooter.dsptemplate
+++ /dev/null
@@ -1,4 +0,0 @@
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"

-# End Group

-# End Target

-# End Project

diff --git a/Templates/DLLHeader.dsptemplate b/Templates/DLLHeader.dsptemplate
deleted file mode 100644
index d9bccaf56..000000000
--- a/Templates/DLLHeader.dsptemplate
+++ /dev/null
@@ -1,192 +0,0 @@
-# Microsoft Developer Studio Project File - Name="OUTPUT_LIBNAME" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102

-

-CFG=OUTPUT_LIBNAME - Win32 Debug

-!MESSAGE This is not a valid makefile. To build this project using NMAKE,

-!MESSAGE use the Export Makefile command and run

-!MESSAGE 

-!MESSAGE NMAKE /f "OUTPUT_LIBNAME.mak".

-!MESSAGE 

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "OUTPUT_LIBNAME.mak" CFG="OUTPUT_LIBNAME - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "OUTPUT_LIBNAME - Win32 MinSizeRel" (based on "Win32 (x86) Dynamic-Link Library")

-!MESSAGE "OUTPUT_LIBNAME - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")

-!MESSAGE "OUTPUT_LIBNAME - Win32 RelWithDebInfo" (based on "Win32 (x86) Dynamic-Link Library")

-!MESSAGE "OUTPUT_LIBNAME - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")

-!MESSAGE 

-

-# ITK DSP Header file

-# This file is read by the build system of itk, and is used as the top part of

-# a microsoft project dsp header file

-# IF this is in a dsp file, then it is not the header, but has

-# already been used, so do not edit here...

-

-# variables to REPLACE

-# 

-# BUILD_INCLUDES == include path

-# EXTRA_DEFINES == compiler defines

-# OUTPUT_DIRECTORY == override in output directory

-# OUTPUT_LIBNAME  == name of output library

-

-# Begin Project

-# PROP AllowPerConfigDependencies 0

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-MTL=midl.exe

-RSC=rc.exe

-        

-!IF  "$(CFG)" == "OUTPUT_LIBNAME - Win32 Release"

-

-# PROP BASE Use_MFC CMAKE_MFC_FLAG

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Release"

-# PROP BASE Intermediate_Dir "Release"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC CMAKE_MFC_FLAG

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "OUTPUT_DIRECTORY_RELEASE"

-# PROP Intermediate_Dir "Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /D "WIN32" /D "_WINDOWS" /D "_USRDLL" OUTPUT_LIBNAME_EXPORTS /FD /c

-# ADD CPP /nologo /D "WIN32" /D "_WINDOWS" /D "_USRDLL"  /FD /c

-# ADD CPP BUILD_INCLUDES_RELEASE EXTRA_DEFINES OUTPUT_LIBNAME_EXPORTS

-# ADD CPP CMAKE_CXX_FLAGS

-# ADD CPP CMAKE_CXX_FLAGS_RELEASE

-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32

-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC BUILD_INCLUDES_RELEASE /l 0x409 /d "NDEBUG"

-# ADD RSC COMPILE_DEFINITIONS

-# ADD RSC COMPILE_DEFINITIONS_RELEASE

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 /nologo /dll /machine:I386

-# ADD LINK32 /nologo /dll TARGET_VERSION_FLAG /machine:I386 /out:"OUTPUT_DIRECTORY_RELEASE/OUTPUT_NAME_RELEASE" TARGET_IMPLIB_FLAG_RELEASE

-CM_MULTILINE_OPTIONS_RELEASE

-

-CMAKE_CUSTOM_RULE_CODE_RELEASE

-

-!ELSEIF  "$(CFG)" == "OUTPUT_LIBNAME - Win32 Debug"

-

-# PROP BASE Use_MFC CMAKE_MFC_FLAG

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC CMAKE_MFC_FLAG

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "OUTPUT_DIRECTORY_DEBUG"

-# PROP Intermediate_Dir "Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" OUTPUT_LIBNAME_EXPORTS /FD /c

-# ADD CPP /nologo /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_USRDLL"  /FD /c

-# ADD CPP BUILD_INCLUDES_DEBUG EXTRA_DEFINES  OUTPUT_LIBNAME_EXPORTS

-# ADD CPP CMAKE_CXX_FLAGS

-# ADD CPP CMAKE_CXX_FLAGS_DEBUG

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC BUILD_INCLUDES_DEBUG /l 0x409 /d "_DEBUG"

-# ADD RSC COMPILE_DEFINITIONS

-# ADD RSC COMPILE_DEFINITIONS_DEBUG

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 /nologo /dll /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 /nologo /dll TARGET_VERSION_FLAG /debug /machine:I386 /out:"OUTPUT_DIRECTORY_DEBUG/OUTPUT_NAME_DEBUG" /pdbtype:sept TARGET_IMPLIB_FLAG_DEBUG

-CM_MULTILINE_OPTIONS_DEBUG

-

-CMAKE_CUSTOM_RULE_CODE_DEBUG

-

-!ELSEIF  "$(CFG)" == "OUTPUT_LIBNAME - Win32 MinSizeRel"

-

-# PROP BASE Use_MFC CMAKE_MFC_FLAG

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "MinSizeRel"

-# PROP BASE Intermediate_Dir "MinSizeRel"

-# PROP BASE Ignore_Export_Lib 0

-# PROP BASE Target_Dir ""

-# PROP Use_MFC CMAKE_MFC_FLAG

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "OUTPUT_DIRECTORY_MINSIZEREL"

-# PROP Intermediate_Dir "MinSizeRel"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /D "WIN32"  /D "_WINDOWS" /D "_USRDLL" /FD /c  OUTPUT_LIBNAME_EXPORTS

-# SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /D "WIN32" /D "_WINDOWS" /D "_USRDLL"  /FD /c

-# ADD CPP BUILD_INCLUDES_MINSIZEREL EXTRA_DEFINES OUTPUT_LIBNAME_EXPORTS

-# ADD CPP CMAKE_CXX_FLAGS

-# ADD CPP CMAKE_CXX_FLAGS_MINSIZEREL

-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32

-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC BUILD_INCLUDES_MINSIZEREL /l 0x409 /d "NDEBUG"

-# ADD RSC COMPILE_DEFINITIONS

-# ADD RSC COMPILE_DEFINITIONS_MINSIZEREL

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32  /nologo /dll /machine:I386 

-# ADD LINK32 /nologo /dll TARGET_VERSION_FLAG /machine:I386 /out:"OUTPUT_DIRECTORY_MINSIZEREL/OUTPUT_NAME_MINSIZEREL" TARGET_IMPLIB_FLAG_MINSIZEREL

-CM_MULTILINE_OPTIONS_MINSIZEREL

-

-CMAKE_CUSTOM_RULE_CODE_MINSIZEREL

-

-!ELSEIF  "$(CFG)" == "OUTPUT_LIBNAME - Win32 RelWithDebInfo"

-

-# PROP BASE Use_MFC CMAKE_MFC_FLAG

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "RelWithDebInfo"

-# PROP BASE Intermediate_Dir "RelWithDebInfo"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC CMAKE_MFC_FLAG         

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "OUTPUT_DIRECTORY_RELWITHDEBINFO"

-# PROP Intermediate_Dir "RelWithDebInfo"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /D "WIN32" /D "_WINDOWS" /D "_USRDLL" OUTPUT_LIBNAME_EXPORTS /FD /c

-# ADD CPP /nologo /D "WIN32" /D "_WINDOWS" /D "_USRDLL"  /FD /c

-# ADD CPP BUILD_INCLUDES_RELWITHDEBINFO EXTRA_DEFINES  OUTPUT_LIBNAME_EXPORTS

-# ADD CPP CMAKE_CXX_FLAGS

-# ADD CPP CMAKE_CXX_FLAGS_RELWITHDEBINFO

-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32

-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC BUILD_INCLUDES_RELWITHDEBINFO /l 0x409 /d "NDEBUG"

-# ADD RSC COMPILE_DEFINITIONS

-# ADD RSC COMPILE_DEFINITIONS_RELWITHDEBINFO

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 /nologo /dll /machine:I386 /pdbtype:sept

-# ADD LINK32 /nologo /dll TARGET_VERSION_FLAG /debug /machine:I386 /pdbtype:sept /out:"OUTPUT_DIRECTORY_RELWITHDEBINFO/OUTPUT_NAME_RELWITHDEBINFO" TARGET_IMPLIB_FLAG_RELWITHDEBINFO

-CM_MULTILINE_OPTIONS_RELWITHDEBINFO

-

-CMAKE_CUSTOM_RULE_CODE_RELWITHDEBINFO

-

-!ENDIF 

-

-# Begin Target

-

-# Name "OUTPUT_LIBNAME - Win32 Release"

-# Name "OUTPUT_LIBNAME - Win32 Debug"

-# Name "OUTPUT_LIBNAME - Win32 MinSizeRel"

-# Name "OUTPUT_LIBNAME - Win32 RelWithDebInfo"

diff --git a/Templates/EXEFooter.dsptemplate b/Templates/EXEFooter.dsptemplate
deleted file mode 100644
index 0d0682a7b..000000000
--- a/Templates/EXEFooter.dsptemplate
+++ /dev/null
@@ -1,4 +0,0 @@
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"

-# End Group

-# End Target

-# End Project

diff --git a/Templates/EXEHeader.dsptemplate b/Templates/EXEHeader.dsptemplate
deleted file mode 100644
index 3a6d2feb1..000000000
--- a/Templates/EXEHeader.dsptemplate
+++ /dev/null
@@ -1,183 +0,0 @@
-# Microsoft Developer Studio Project File - Name="pcbuilder" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

-# CM DSP Header file

-# This file is read by the build system of cm, and is used as the top part of

-# a microsoft project dsp header file

-# IF this is in a dsp file, then it is not the header, but has

-# already been used, so do not edit here...

-

-# variables to REPLACE

-# 

-# BUILD_INCLUDES == include path

-# OUTPUT_DIRECTORY == override in output directory

-# EXTRA_DEFINES == compiler defines

-# OUTPUT_LIBNAME  == name of output library

-# CM_LIBRARIES == libraries linked in 

-# TARGTYPE "Win32 (x86) Application" 0x0103

-

-CFG=OUTPUT_LIBNAME - Win32 Debug

-!MESSAGE This is not a valid makefile. To build this project using NMAKE,

-!MESSAGE use the Export Makefile command and run

-!MESSAGE 

-!MESSAGE NMAKE /f "OUTPUT_LIBNAME.mak".

-!MESSAGE 

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "OUTPUT_LIBNAME.mak" CFG="OUTPUT_LIBNAME - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "OUTPUT_LIBNAME - Win32 MinSizeRel" (based on "Win32 (x86) Application")

-!MESSAGE "OUTPUT_LIBNAME - Win32 Release" (based on "Win32 (x86) Application")

-!MESSAGE "OUTPUT_LIBNAME - Win32 RelWithDebInfo" (based on "Win32 (x86) Application")

-!MESSAGE "OUTPUT_LIBNAME - Win32 Debug" (based on "Win32 (x86) Application")

-!MESSAGE 

-

-# Begin Project

-# PROP AllowPerConfigDependencies 0

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-MTL=midl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "OUTPUT_LIBNAME - Win32 Release"

-

-# PROP BASE Use_MFC CMAKE_MFC_FLAG

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Release"

-# PROP BASE Intermediate_Dir "Release"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC CMAKE_MFC_FLAG

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "OUTPUT_DIRECTORY_RELEASE"

-# PROP Intermediate_Dir "Release"

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo  /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /FD /c

-# ADD CPP /nologo  /D "WIN32"  /D "NDEBUG" /D "_CONSOLE" /FD /c

-# ADD CPP BUILD_INCLUDES_RELEASE EXTRA_DEFINES OUTPUT_LIBNAME_EXPORTS

-# ADD CPP CMAKE_CXX_FLAGS

-# ADD CPP CMAKE_CXX_FLAGS_RELEASE

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC BUILD_INCLUDES_RELEASE /l 0x409 /d "NDEBUG"

-# ADD RSC COMPILE_DEFINITIONS

-# ADD RSC COMPILE_DEFINITIONS_RELEASE

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32  /nologo /subsystem:console /machine:I386 /IGNORE:4089

-# ADD LINK32  /nologo /subsystem:console /machine:I386 /IGNORE:4089 TARGET_VERSION_FLAG

-# ADD LINK32 /out:"OUTPUT_DIRECTORY_RELEASE\OUTPUT_NAME_RELEASE" TARGET_IMPLIB_FLAG_RELEASE

-CM_MULTILINE_OPTIONS_RELEASE

-

-CMAKE_CUSTOM_RULE_CODE_RELEASE

-

-!ELSEIF  "$(CFG)" == "OUTPUT_LIBNAME - Win32 Debug"

-

-# PROP BASE Use_MFC CMAKE_MFC_FLAG

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC CMAKE_MFC_FLAG

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "OUTPUT_DIRECTORY_DEBUG"

-# PROP Intermediate_Dir "Debug"

-# PROP Target_Dir ""

-# ADD BASE CPP   /D "WIN32" /D "_DEBUG" /D "_CONSOLE"  /FD /GZ /c

-# ADD CPP /nologo  /D "WIN32"  /D "_DEBUG" /D "_CONSOLE" /FD /GZ /c

-# ADD CPP BUILD_INCLUDES_DEBUG EXTRA_DEFINES OUTPUT_LIBNAME_EXPORTS

-# ADD CPP CMAKE_CXX_FLAGS

-# ADD CPP CMAKE_CXX_FLAGS_DEBUG

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC BUILD_INCLUDES_DEBUG /l 0x409 /d "_DEBUG"

-# ADD RSC COMPILE_DEFINITIONS

-# ADD RSC COMPILE_DEFINITIONS_DEBUG

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32  /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /IGNORE:4089

-# ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /IGNORE:4089 TARGET_VERSION_FLAG

-# ADD LINK32 /out:"OUTPUT_DIRECTORY_DEBUG\OUTPUT_NAME_DEBUG" TARGET_IMPLIB_FLAG_DEBUG

-CM_MULTILINE_OPTIONS_DEBUG

-

-CMAKE_CUSTOM_RULE_CODE_DEBUG

-

-!ELSEIF  "$(CFG)" == "OUTPUT_LIBNAME - Win32 MinSizeRel"

-# PROP BASE Use_MFC CMAKE_MFC_FLAG

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "MinSizeRel"

-# PROP BASE Intermediate_Dir "MinSizeRel"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC CMAKE_MFC_FLAG

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "OUTPUT_DIRECTORY_MINSIZEREL"

-# PROP Intermediate_Dir "MinSizeRel"

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo  /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /FD /c

-# ADD CPP /nologo  /D "WIN32" BUILD_INCLUDES_MINSIZEREL EXTRA_DEFINES /D "NDEBUG" /D "_CONSOLE"  /FD /c

-# ADD CPP BUILD_INCLUDES_MINSIZEREL EXTRA_DEFINES OUTPUT_LIBNAME_EXPORTS

-# ADD CPP CMAKE_CXX_FLAGS

-# ADD CPP CMAKE_CXX_FLAGS_MINSIZEREL

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC BUILD_INCLUDES_MINSIZEREL /l 0x409 /d "NDEBUG"

-# ADD RSC COMPILE_DEFINITIONS

-# ADD RSC COMPILE_DEFINITIONS_MINSIZEREL

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 /nologo /subsystem:console /machine:I386 /IGNORE:4089

-# ADD LINK32 /nologo /subsystem:console /machine:I386 /IGNORE:4089 TARGET_VERSION_FLAG

-# ADD LINK32 /out:"OUTPUT_DIRECTORY_MINSIZEREL\OUTPUT_NAME_MINSIZEREL" TARGET_IMPLIB_FLAG_MINSIZEREL

-CM_MULTILINE_OPTIONS_MINSIZEREL

-

-CMAKE_CUSTOM_RULE_CODE_MINSIZEREL

-

-!ELSEIF  "$(CFG)" == "OUTPUT_LIBNAME - Win32 RelWithDebInfo"

-

-# PROP BASE Use_MFC CMAKE_MFC_FLAG

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "RelWithDebInfo"

-# PROP BASE Intermediate_Dir "RelWithDebInfo"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC CMAKE_MFC_FLAG

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "OUTPUT_DIRECTORY_RELWITHDEBINFO"

-# PROP Intermediate_Dir "RelWithDebInfo"

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo  /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /FD /c

-# ADD CPP /nologo  /D "WIN32"  /D "NDEBUG" /D "_CONSOLE" /FD /c

-# ADD CPP BUILD_INCLUDES_RELWITHDEBINFO EXTRA_DEFINES OUTPUT_LIBNAME_EXPORTS

-# ADD CPP CMAKE_CXX_FLAGS

-# ADD CPP CMAKE_CXX_FLAGS_RELWITHDEBINFO

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC BUILD_INCLUDES_RELWITHDEBINFO /l 0x409 /d "NDEBUG"

-# ADD RSC COMPILE_DEFINITIONS

-# ADD RSC COMPILE_DEFINITIONS_RELWITHDEBINFO

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 /nologo /subsystem:console /debug /machine:I386 /IGNORE:4089

-# ADD LINK32  /nologo /subsystem:console /debug /machine:I386 /IGNORE:4089 TARGET_VERSION_FLAG

-# ADD LINK32 /out:"OUTPUT_DIRECTORY_RELWITHDEBINFO\OUTPUT_NAME_RELWITHDEBINFO" TARGET_IMPLIB_FLAG_RELWITHDEBINFO

-CM_MULTILINE_OPTIONS_RELWITHDEBINFO

-

-CMAKE_CUSTOM_RULE_CODE_RELWITHDEBINFO

-

-!ENDIF 

-

-# Begin Target

-

-# Name "OUTPUT_LIBNAME - Win32 Release"

-# Name "OUTPUT_LIBNAME - Win32 Debug"

-# Name "OUTPUT_LIBNAME - Win32 MinSizeRel"

-# Name "OUTPUT_LIBNAME - Win32 RelWithDebInfo"

diff --git a/Templates/EXEWinHeader.dsptemplate b/Templates/EXEWinHeader.dsptemplate
deleted file mode 100644
index 350e3ea00..000000000
--- a/Templates/EXEWinHeader.dsptemplate
+++ /dev/null
@@ -1,187 +0,0 @@
-# Microsoft Developer Studio Project File - Name="pcbuilder" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

-# CM DSP Header file

-# This file is read by the build system of cm, and is used as the top part of

-# a microsoft project dsp header file

-# IF this is in a dsp file, then it is not the header, but has

-# already been used, so do not edit here...

-

-# variables to REPLACE

-# 

-# BUILD_INCLUDES == include path

-# OUTPUT_DIRECTORY == override in output directory

-# EXTRA_DEFINES == compiler defines

-# OUTPUT_LIBNAME  == name of output library

-# CM_LIBRARIES == libraries linked in 

-# TARGTYPE "Win32 (x86) Application" 0x0101

-

-CFG=OUTPUT_LIBNAME - Win32 Debug

-!MESSAGE This is not a valid makefile. To build this project using NMAKE,

-!MESSAGE use the Export Makefile command and run

-!MESSAGE 

-!MESSAGE NMAKE /f "OUTPUT_LIBNAME.mak".

-!MESSAGE 

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "OUTPUT_LIBNAME.mak" CFG="OUTPUT_LIBNAME - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "OUTPUT_LIBNAME - Win32 MinSizeRel" (based on "Win32 (x86) Application")

-!MESSAGE "OUTPUT_LIBNAME - Win32 Release" (based on "Win32 (x86) Application")

-!MESSAGE "OUTPUT_LIBNAME - Win32 RelWithDebInfo" (based on "Win32 (x86) Application")

-!MESSAGE "OUTPUT_LIBNAME - Win32 Debug" (based on "Win32 (x86) Application")

-!MESSAGE 

-

-# Begin Project

-# PROP AllowPerConfigDependencies 0

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-MTL=midl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "OUTPUT_LIBNAME - Win32 Release"

-

-# PROP BASE Use_MFC CMAKE_MFC_FLAG

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Release"

-# PROP BASE Intermediate_Dir "Release"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC CMAKE_MFC_FLAG

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "OUTPUT_DIRECTORY_RELEASE"

-# PROP Intermediate_Dir "Release"

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c

-# ADD CPP /nologo /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c

-# ADD CPP BUILD_INCLUDES_RELEASE EXTRA_DEFINES OUTPUT_LIBNAME_EXPORTS

-# ADD CPP CMAKE_CXX_FLAGS

-# ADD CPP CMAKE_CXX_FLAGS_RELEASE

-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32

-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC BUILD_INCLUDES_RELEASE /l 0x409 /d "NDEBUG"

-# ADD RSC COMPILE_DEFINITIONS

-# ADD RSC COMPILE_DEFINITIONS_RELEASE

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 /nologo /subsystem:windows /machine:I386  /IGNORE:4089

-# ADD LINK32  /nologo /subsystem:windows /machine:I386  /IGNORE:4089 TARGET_VERSION_FLAG

-# ADD LINK32 /out:"OUTPUT_DIRECTORY_RELEASE\OUTPUT_NAME_RELEASE" TARGET_IMPLIB_FLAG_RELEASE

-CM_MULTILINE_OPTIONS_RELEASE

-

-CMAKE_CUSTOM_RULE_CODE_RELEASE

-

-!ELSEIF  "$(CFG)" == "OUTPUT_LIBNAME - Win32 Debug"

-

-# PROP BASE Use_MFC CMAKE_MFC_FLAG

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC CMAKE_MFC_FLAG

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "OUTPUT_DIRECTORY_DEBUG"

-# PROP Intermediate_Dir "Debug"

-# PROP Target_Dir ""

-# ADD BASE CPP  /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c

-# ADD CPP /nologo  /D "WIN32"  /D "_DEBUG" /D "_WINDOWS" /FD /GZ /c

-# ADD CPP BUILD_INCLUDES_DEBUG EXTRA_DEFINES OUTPUT_LIBNAME_EXPORTS

-# ADD CPP CMAKE_CXX_FLAGS

-# ADD CPP CMAKE_CXX_FLAGS_DEBUG

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC BUILD_INCLUDES_DEBUG /l 0x409 /d "_DEBUG"

-# ADD RSC COMPILE_DEFINITIONS

-# ADD RSC COMPILE_DEFINITIONS_DEBUG

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept /IGNORE:4089

-# ADD LINK32 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept /IGNORE:4089 TARGET_VERSION_FLAG

-# ADD LINK32 /out:"OUTPUT_DIRECTORY_DEBUG\OUTPUT_NAME_DEBUG" TARGET_IMPLIB_FLAG_DEBUG

-CM_MULTILINE_OPTIONS_DEBUG

-

-CMAKE_CUSTOM_RULE_CODE_DEBUG

-

-!ELSEIF  "$(CFG)" == "OUTPUT_LIBNAME - Win32 MinSizeRel"

-# PROP BASE Use_MFC CMAKE_MFC_FLAG

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "MinSizeRel"

-# PROP BASE Intermediate_Dir "MinSizeRel"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC CMAKE_MFC_FLAG

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "OUTPUT_DIRECTORY_MINSIZEREL"

-# PROP Intermediate_Dir "MinSizeRel"

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c

-# ADD CPP /nologo  /D "WIN32"  /D "NDEBUG" /D "_WINDOWS" /FD /c

-# ADD CPP BUILD_INCLUDES_MINSIZEREL EXTRA_DEFINES OUTPUT_LIBNAME_EXPORTS

-# ADD CPP CMAKE_CXX_FLAGS

-# ADD CPP CMAKE_CXX_FLAGS_MINSIZEREL

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC BUILD_INCLUDES_MINSIZEREL /l 0x409 /d "NDEBUG"

-# ADD RSC COMPILE_DEFINITIONS

-# ADD RSC COMPILE_DEFINITIONS_MINSIZEREL

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 /nologo /subsystem:windows /machine:I386 /pdbtype:sept /IGNORE:4089

-# ADD LINK32 /nologo /subsystem:windows  /machine:I386 /pdbtype:sept /IGNORE:4089 TARGET_VERSION_FLAG

-# ADD LINK32 /out:"OUTPUT_DIRECTORY_MINSIZEREL\OUTPUT_NAME_MINSIZEREL" TARGET_IMPLIB_FLAG_MINSIZEREL

-CM_MULTILINE_OPTIONS_MINSIZEREL

-

-CMAKE_CUSTOM_RULE_CODE_MINSIZEREL

-

-!ELSEIF  "$(CFG)" == "OUTPUT_LIBNAME - Win32 RelWithDebInfo"

-

-# PROP BASE Use_MFC CMAKE_MFC_FLAG

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "RelWithDebInfo"

-# PROP BASE Intermediate_Dir "RelWithDebInfo"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC CMAKE_MFC_FLAG

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "OUTPUT_DIRECTORY_RELWITHDEBINFO"

-# PROP Intermediate_Dir "RelWithDebInfo"

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c

-# ADD CPP /nologo /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c

-# ADD CPP BUILD_INCLUDES_RELWITHDEBINFO EXTRA_DEFINES OUTPUT_LIBNAME_EXPORTS

-# ADD CPP CMAKE_CXX_FLAGS

-# ADD CPP CMAKE_CXX_FLAGS_RELWITHDEBINFO

-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32

-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC BUILD_INCLUDES_RELWITHDEBINFO /l 0x409 /d "NDEBUG"

-# ADD RSC COMPILE_DEFINITIONS

-# ADD RSC COMPILE_DEFINITIONS_RELWITHDEBINFO

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 /nologo /subsystem:windows /machine:I386  /IGNORE:4089

-# ADD LINK32 /nologo /subsystem:windows /debug /machine:I386  /IGNORE:4089 TARGET_VERSION_FLAG

-# ADD LINK32 /out:"OUTPUT_DIRECTORY_RELWITHDEBINFO\OUTPUT_NAME_RELWITHDEBINFO" TARGET_IMPLIB_FLAG_RELWITHDEBINFO

-CM_MULTILINE_OPTIONS_RELWITHDEBINFO

-

-CMAKE_CUSTOM_RULE_CODE_RELWITHDEBINFO

-

-!ENDIF 

-

-# Begin Target

-

-# Name "OUTPUT_LIBNAME - Win32 Release"

-# Name "OUTPUT_LIBNAME - Win32 Debug"

-# Name "OUTPUT_LIBNAME - Win32 MinSizeRel"

-# Name "OUTPUT_LIBNAME - Win32 RelWithDebInfo"

diff --git a/Templates/MSBuild/nasm.props.in b/Templates/MSBuild/nasm.props.in
new file mode 100644
index 000000000..3443108d1
--- /dev/null
+++ b/Templates/MSBuild/nasm.props.in
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Condition="'$(NASMBeforeTargets)' == '' and '$(NASMAfterTargets)' == '' and '$(ConfigurationType)' != 'Makefile'">
+    <NASMBeforeTargets>Midl</NASMBeforeTargets>
+    <NASMAfterTargets>CustomBuild</NASMAfterTargets>
+  </PropertyGroup>
+  <ItemDefinitionGroup>
+    <NASM>
+      <OutputFormat>$(IntDir)%(FileName).obj</OutputFormat>
+      <Outputswitch>0</Outputswitch>
+      <CompilerNasm>@CMAKE_ASM_NASM_COMPILER@</CompilerNasm>
+      <PackAlignmentBoundary>0</PackAlignmentBoundary>
+      <CommandLineTemplate>"%(CompilerNasm)" [AllOptions] [AdditionalOptions] "%(FullPath)"</CommandLineTemplate>
+      <ExecutionDescription>Assembling %(Filename)%(Extension)</ExecutionDescription>
+    </NASM>
+  </ItemDefinitionGroup>
+</Project>
diff --git a/Templates/MSBuild/nasm.targets b/Templates/MSBuild/nasm.targets
new file mode 100644
index 000000000..eeeb613b6
--- /dev/null
+++ b/Templates/MSBuild/nasm.targets
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <PropertyPageSchema Include="$(MSBuildThisFileDirectory)$(MSBuildThisFileName).xml"/>
+    <AvailableItemName Include="NASM">
+      <Targets>_NASM</Targets>
+    </AvailableItemName>
+  </ItemGroup>
+  <PropertyGroup>
+    <ComputeLinkInputsTargets>
+      $(ComputeLinkInputsTargets);
+      ComputeNASMOutput;
+    </ComputeLinkInputsTargets>
+    <ComputeLibInputsTargets>
+      $(ComputeLibInputsTargets);
+      ComputeNASMOutput;
+    </ComputeLibInputsTargets>
+  </PropertyGroup>
+  <UsingTask TaskName="NASM" TaskFactory="XamlTaskFactory" AssemblyName="Microsoft.Build.Tasks.v4.0">
+    <Task>$(MSBuildThisFileDirectory)$(MSBuildThisFileName).xml</Task>
+  </UsingTask>
+  <Target Name="_NASM" BeforeTargets="$(NASMBeforeTargets)" AfterTargets="$(NASMAfterTargets)" Condition="'@(NASM)' != ''" Outputs="%(NASM.OutputFormat)" Inputs="%(NASM.Identity);%(NASM.AdditionalDependencies);$(MSBuildProjectFile)" DependsOnTargets="_SelectedFiles">
+    <ItemGroup Condition="'@(SelectedFiles)' != ''">
+      <NASM Remove="@(NASM)" Condition="'%(Identity)' != '@(SelectedFiles)'"/>
+    </ItemGroup>
+    <ItemGroup>
+      <NASM_tlog Include="%(NASM.OutputFormat)" Condition="'%(NASM.OutputFormat)' != '' and '%(NASM.ExcludedFromBuild)' != 'true'">
+        <Source>@(NASM, '|')</Source>
+      </NASM_tlog>
+    </ItemGroup>
+    <Message Importance="High" Text="%(NASM.ExecutionDescription)"/>
+    <WriteLinesToFile Condition="'@(NASM_tlog)' != '' and '%(NASM_tlog.ExcludedFromBuild)' != 'true'" File="$(IntDir)$(ProjectName).write.1.tlog" Lines="^%(NASM_tlog.Source);@(NASM_tlog-&gt;'%(Fullpath)')"/>
+    <NASM Condition="'@(NASM)' != '' and '%(NASM.ExcludedFromBuild)' != 'true'" Inputs="%(NASM.Inputs)" OutputFormat="%(NASM.OutputFormat)" Outputswitch="%(NASM.Outputswitch)" AssembledCodeListingFile="%(NASM.AssembledCodeListingFile)" GenerateDebugInformation="%(NASM.GenerateDebugInformation)" ErrorReporting="%(NASM.ErrorReporting)" IncludePaths="%(NASM.IncludePaths)" PreprocessorDefinitions="%(NASM.PreprocessorDefinitions)" UndefinePreprocessorDefinitions="%(NASM.UndefinePreprocessorDefinitions)" ErrorReportingFormat="%(NASM.ErrorReportingFormat)" TreatWarningsAsErrors="%(NASM.TreatWarningsAsErrors)" floatunderflow="%(NASM.floatunderflow)" macrodefaults="%(NASM.macrodefaults)" user="%(NASM.user)" floatoverflow="%(NASM.floatoverflow)" floatdenorm="%(NASM.floatdenorm)" numberoverflow="%(NASM.numberoverflow)" macroselfref="%(NASM.macroselfref)" floattoolong="%(NASM.floattoolong)" orphanlabels="%(NASM.orphanlabels)" CommandLineTemplate="%(NASM.CommandLineTemplate)" AdditionalOptions="%(NASM.AdditionalOptions)"/>
+  </Target>
+  <Target Name="ComputeNASMOutput" Condition="'@(NASM)' != ''">
+    <ItemGroup>
+      <Link Include="@(NASM-&gt;Metadata('OutputFormat')-&gt;Distinct()-&gt;ClearMetadata())" Condition="'%(NASM.ExcludedFromBuild)' != 'true'"/>
+      <Lib Include="@(NASM-&gt;Metadata('OutputFormat')-&gt;Distinct()-&gt;ClearMetadata())" Condition="'%(NASM.ExcludedFromBuild)' != 'true'"/>
+    </ItemGroup>
+  </Target>
+</Project>
diff --git a/Templates/MSBuild/nasm.xml b/Templates/MSBuild/nasm.xml
new file mode 100644
index 000000000..92f8548c3
--- /dev/null
+++ b/Templates/MSBuild/nasm.xml
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ProjectSchemaDefinitions xmlns="http://schemas.microsoft.com/build/2009/properties" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:sys="clr-namespace:System;assembly=mscorlib">
+  <Rule Name="NASM" PageTemplate="tool" DisplayName="Netwide Assembler" Order="200">
+    <Rule.DataSource>
+      <DataSource Persistence="ProjectFile" ItemType="NASM"/>
+    </Rule.DataSource>
+    <Rule.Categories>
+      <Category Name="General">
+        <Category.DisplayName>
+          <sys:String>General</sys:String>
+        </Category.DisplayName>
+      </Category>
+      <Category Name="Preprocessor">
+        <Category.DisplayName>
+          <sys:String>Preprocessing Options</sys:String>
+        </Category.DisplayName>
+      </Category>
+      <Category Name="Assembler Options">
+        <Category.DisplayName>
+          <sys:String>Assembler Options</sys:String>
+        </Category.DisplayName>
+      </Category>
+      <Category Name="Advanced">
+        <Category.DisplayName>
+          <sys:String>Advanced </sys:String>
+        </Category.DisplayName>
+      </Category>
+      <Category Name="Command Line" Subtype="CommandLine">
+        <Category.DisplayName>
+          <sys:String>Command Line</sys:String>
+        </Category.DisplayName>
+      </Category>
+    </Rule.Categories>
+    <StringProperty Name="Inputs" Category="Command Line" IsRequired="true">
+      <StringProperty.DataSource>
+        <DataSource Persistence="ProjectFile" ItemType="NASM" SourceType="Item"/>
+      </StringProperty.DataSource>
+    </StringProperty>
+    <StringProperty Name="OutputFormat" Category="Assembler Options" HelpUrl="http://www.nasm.us/doc/" DisplayName="Output File Name" Description="Specify Output Filename.-o [value]" Switch="-o [value]"/>
+    <BoolProperty Name="tasmmode" Category="Advanced" HelpUrl="http://www.nasm.us/doc/" DisplayName="SciTech TASM compatible mode" Description="assemble in SciTech TASM compatible mode" Switch="-t"/>
+    <EnumProperty Name="Outputswitch" Category="Assembler Options" HelpUrl="http://www.nasm.us/doc/" DisplayName="Output Switch" Description="Select the type of output format required. Linking Should be disabled for ELF and Binary ,else error will popup">
+      <EnumValue Name="0" DisplayName="Object File win32" Switch="-fwin32"/>
+      <EnumValue Name="1" DisplayName="Object File win64" Switch="-fwin64"/>
+      <EnumValue Name="2" DisplayName="ELF32 (i386) object files (e.g. Linux)" Switch="-felf32"/>
+      <EnumValue Name="3" DisplayName="ELF64 (x86_64) object files (e.g. Linux)" Switch="-felf64"/>
+    </EnumProperty>
+    <StringListProperty Name="AssembledCodeListingFile" Category="Assembler Options" DisplayName="Assembled Code Listing File" Description="Generates an assembled code listing file.     (-l [file])" HelpUrl="http://www.nasm.us/doc/" Switch="-l &quot;[value]&quot;"/>
+    <BoolProperty Name="GenerateDebugInformation" Category="Assembler Options" DisplayName="Generate Debug Information" Description="Generates Debug Information.     (-g)" HelpUrl="http://www.nasm.us/doc/" Switch="-g"/>
+    <StringListProperty Name="ErrorReporting" Category="Advanced" HelpUrl="http://www.nasm.us/doc/" DisplayName="Redirect Error Messages to File" Description="Drops the error Message on specified device" Switch="-Z &quot;[value]&quot;"/>
+    <StringListProperty Name="IncludePaths" Category="General" DisplayName="Include Paths" Description="Sets path for include file.     (-I[path])" HelpUrl="http://www.nasm.us/doc/" Switch="-I&quot;[value]&quot;"/>
+    <StringListProperty Name="PreprocessorDefinitions" Category="Preprocessor" HelpUrl="http://www.nasm.us/doc/" DisplayName="Preprocessor Definitions" Description="Defines a text macro with the given name.     (-D[symbol])" Switch="-D[value]"/>
+    <StringListProperty Name="UndefinePreprocessorDefinitions" Category="Preprocessor" HelpUrl="http://www.nasm.us/doc/" DisplayName="Undefine Preprocessor Definitions" Description="Undefines a text macro with the given name.     (-U[symbol])" Switch="-U[value]"/>
+    <EnumProperty Name="ErrorReportingFormat" Category="Advanced" HelpUrl="http://www.nasm.us/doc/" DisplayName="Error Reporting Format" Description="Select the error reporting format ie. GNU or VC">
+      <EnumValue Name="0" DisplayName="-Xgnu GNU format: Default format" Switch="-Xgnu"/>
+      <EnumValue Name="1" DisplayName="-Xvc Style used by Microsoft Visual C++" Switch="-Xvc"/>
+    </EnumProperty>
+    <BoolProperty Name="TreatWarningsAsErrors" Category="Assembler Options" DisplayName="Treat Warnings As Errors" Description="Returns an error code if warnings are generated.     (-Werror)" HelpUrl="http://www.nasm.us/doc/" Switch="-Werror"/>
+    <BoolProperty Name="floatunderflow" Category="Advanced" HelpUrl="http://www.nasm.us/doc/" DisplayName="float-underflow" Description="floating point underflow (default off)" Switch="-w+float-underflow"/>
+    <BoolProperty Name="macrodefaults" Category="Advanced" HelpUrl="http://www.nasm.us/doc/" DisplayName="Disable macro-defaults" Description="macros with more default than optional parameters (default on)" Switch="-w-macro-defaults"/>
+    <BoolProperty Name="user" Category="Advanced" HelpUrl="http://www.nasm.us/doc/" DisplayName="Disable user" Description="%warning directives (default on)" Switch="-w-user"/>
+    <BoolProperty Name="floatoverflow" Category="Advanced" HelpUrl="http://www.nasm.us/doc/" DisplayName="Disable float-overflow" Description="floating point overflow (default on)" Switch="-w-float-overflow"/>
+    <BoolProperty Name="floatdenorm" Category="Advanced" HelpUrl="http://www.nasm.us/doc/" DisplayName="float-denorm" Description="floating point denormal (default off)" Switch="-w+float-denorm"/>
+    <BoolProperty Name="numberoverflow" Category="Advanced" HelpUrl="http://www.nasm.us/doc/" DisplayName="Disable number-overflow" Description="numeric constant does not fit (default on)" Switch="-w-number-overflow"/>
+    <BoolProperty Name="macroselfref" Category="Advanced" HelpUrl="http://www.nasm.us/doc/" DisplayName="macro-selfref" Description="cyclic macro references (default off)" Switch="-w+macro-selfref"/>
+    <BoolProperty Name="floattoolong" Category="Advanced" HelpUrl="http://www.nasm.us/doc/" DisplayName="Disable float-toolong" Description=" too many digits in floating-point number (default on)" Switch="-w-float-toolong"/>
+    <BoolProperty Name="orphanlabels" Category="Advanced" HelpUrl="http://www.nasm.us/doc/" DisplayName="Disable orphan-labels" Description="labels alone on lines without trailing `:' (default on)" Switch="-w-orphan-labels"/>
+    <StringProperty Name="CommandLineTemplate" DisplayName="Command Line" Visible="False" IncludeInCommandLine="False"/>
+    <DynamicEnumProperty Name="NASMBeforeTargets" Category="General" EnumProvider="Targets" IncludeInCommandLine="False">
+      <DynamicEnumProperty.DisplayName>
+        <sys:String>Execute Before</sys:String>
+      </DynamicEnumProperty.DisplayName>
+      <DynamicEnumProperty.Description>
+        <sys:String>Specifies the targets for the build customization to run before.</sys:String>
+      </DynamicEnumProperty.Description>
+      <DynamicEnumProperty.ProviderSettings>
+        <NameValuePair Name="Exclude" Value="^NASMBeforeTargets|^Compute"/>
+      </DynamicEnumProperty.ProviderSettings>
+      <DynamicEnumProperty.DataSource>
+        <DataSource Persistence="ProjectFile" ItemType="" HasConfigurationCondition="true"/>
+      </DynamicEnumProperty.DataSource>
+    </DynamicEnumProperty>
+    <DynamicEnumProperty Name="NASMAfterTargets" Category="General" EnumProvider="Targets" IncludeInCommandLine="False">
+      <DynamicEnumProperty.DisplayName>
+        <sys:String>Execute After</sys:String>
+      </DynamicEnumProperty.DisplayName>
+      <DynamicEnumProperty.Description>
+        <sys:String>Specifies the targets for the build customization to run after.</sys:String>
+      </DynamicEnumProperty.Description>
+      <DynamicEnumProperty.ProviderSettings>
+        <NameValuePair Name="Exclude" Value="^NASMAfterTargets|^Compute"/>
+      </DynamicEnumProperty.ProviderSettings>
+      <DynamicEnumProperty.DataSource>
+        <DataSource Persistence="ProjectFile" ItemType="" HasConfigurationCondition="true"/>
+      </DynamicEnumProperty.DataSource>
+    </DynamicEnumProperty>
+    <StringProperty Name="ExecutionDescription" DisplayName="Execution Description" IncludeInCommandLine="False" Visible="False"/>
+    <StringListProperty Name="AdditionalDependencies" DisplayName="Additional Dependencies" IncludeInCommandLine="False" Visible="False"/>
+    <StringProperty Subtype="AdditionalOptions" Name="AdditionalOptions" Category="Command Line">
+      <StringProperty.DisplayName>
+        <sys:String>Additional Options</sys:String>
+      </StringProperty.DisplayName>
+      <StringProperty.Description>
+        <sys:String>Additional Options</sys:String>
+      </StringProperty.Description>
+    </StringProperty>
+  </Rule>
+  <ItemType Name="NASM" DisplayName="Netwide Assembler"/>
+  <FileExtension Name="*.asm" ContentType="NASM"/>
+  <ContentType Name="NASM" DisplayName="Netwide Assembler" ItemType="NASM"/>
+</ProjectSchemaDefinitions>
diff --git a/Templates/TestDriver.cxx.in b/Templates/TestDriver.cxx.in
index f4510bb55..bf61be4c9 100644
--- a/Templates/TestDriver.cxx.in
+++ b/Templates/TestDriver.cxx.in
@@ -1,154 +1,136 @@
-#include <ctype.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
+#include <ctype.h>  /* NOLINT */
+#include <stdio.h>  /* NOLINT */
+#include <stdlib.h> /* NOLINT */
+#include <string.h> /* NOLINT */
 
-@CMAKE_TESTDRIVER_EXTRA_INCLUDES@
+#if defined(_MSC_VER)
+#pragma warning(disable : 4996) /* deprecation */
+#endif
 
+@CMAKE_TESTDRIVER_EXTRA_INCLUDES@
 
 /* Forward declare test functions. */
 @CMAKE_FORWARD_DECLARE_TESTS@
 
+#ifdef __cplusplus
+#define CM_CAST(TYPE, EXPR) static_cast<TYPE>(EXPR)
+#else
+#define CM_CAST(TYPE, EXPR) (TYPE)(EXPR)
+#endif
+
 /* Create map.  */
 
-typedef int (*MainFuncPointer)(int , char*[]);
+typedef int (*MainFuncPointer)(int, char* []);
 typedef struct
 {
   const char* name;
   MainFuncPointer func;
 } functionMapEntry;
 
-functionMapEntry cmakeGeneratedFunctionMapEntries[] = {
+static functionMapEntry cmakeGeneratedFunctionMapEntries[] = {
   @CMAKE_FUNCTION_TABLE_ENTIRES@
-  {0,0}
+  { NULL, NULL } /* NOLINT */
 };
 
+static const int NumTests = CM_CAST(int,
+  sizeof(cmakeGeneratedFunctionMapEntries) / sizeof(functionMapEntry)) - 1;
+
 /* Allocate and create a lowercased copy of string
    (note that it has to be free'd manually) */
-
-char* lowercase(const char *string)
+static char* lowercase(const char* string)
 {
   char *new_string, *p;
-
-#ifdef __cplusplus
-  new_string = static_cast<char *>(malloc(sizeof(char) *
-    static_cast<size_t>(strlen(string) + 1)));
-#else
-  new_string = (char *)(malloc(sizeof(char) * (size_t)(strlen(string) + 1)));
-#endif
-
-  if (!new_string)
-    {
-    return 0;
-    }
-  strcpy(new_string, string);
-  p = new_string;
-  while (*p != 0)
-    {
-#ifdef __cplusplus
-    *p = static_cast<char>(tolower(*p));
-#else
-    *p = (char)(tolower(*p));
-#endif
-
-    ++p;
-    }
+  size_t stringSize;
+
+  stringSize = CM_CAST(size_t, strlen(string) + 1);
+  new_string = CM_CAST(char*, malloc(sizeof(char) * stringSize));
+
+  if (new_string == NULL) { /* NOLINT */
+    return NULL;            /* NOLINT */
+  }
+  strncpy(new_string, string, stringSize);
+  for (p = new_string; *p != 0; ++p) {
+    *p = CM_CAST(char, tolower(*p));
+  }
   return new_string;
 }
 
-int main(int ac, char *av[])
+int main(int ac, char* av[])
 {
-  int i, NumTests, testNum, partial_match;
+  int i, testNum = 0, partial_match;
   char *arg, *test_name;
-  int count;
   int testToRun = -1;
 
   @CMAKE_TESTDRIVER_ARGVC_FUNCTION@
 
-  for(count =0; cmakeGeneratedFunctionMapEntries[count].name != 0; count++)
-    {
-    }
-  NumTests = count;
   /* If no test name was given */
   /* process command line with user function.  */
-  if (ac < 2)
-    {
+  if (ac < 2) {
     /* Ask for a test.  */
     printf("Available tests:\n");
-    for (i =0; i < NumTests; ++i)
-      {
+    for (i = 0; i < NumTests; ++i) {
       printf("%3d. %s\n", i, cmakeGeneratedFunctionMapEntries[i].name);
-      }
+    }
     printf("To run a test, enter the test number: ");
     fflush(stdout);
-    testNum = 0;
-    if( scanf("%d", &testNum) != 1 )
-      {
+    if (scanf("%d", &testNum) != 1) {
       printf("Couldn't parse that input as a number\n");
       return -1;
-      }
-    if (testNum >= NumTests)
-      {
+    }
+    if (testNum >= NumTests) {
       printf("%3d is an invalid test number.\n", testNum);
       return -1;
-      }
+    }
     testToRun = testNum;
     ac--;
     av++;
-    }
+  }
   partial_match = 0;
-  arg = 0;
+  arg = NULL; /* NOLINT */
   /* If partial match is requested.  */
-  if(testToRun == -1 && ac > 1)
-    {
+  if (testToRun == -1 && ac > 1) {
     partial_match = (strcmp(av[1], "-R") == 0) ? 1 : 0;
-    }
-  if (partial_match && ac < 3)
-    {
+  }
+  if (partial_match != 0 && ac < 3) {
     printf("-R needs an additional parameter.\n");
     return -1;
-    }
-  if(testToRun == -1)
-    {
+  }
+  if (testToRun == -1) {
     arg = lowercase(av[1 + partial_match]);
-    }
-  for (i =0; i < NumTests && testToRun == -1; ++i)
-    {
+  }
+  for (i = 0; i < NumTests && testToRun == -1; ++i) {
     test_name = lowercase(cmakeGeneratedFunctionMapEntries[i].name);
-    if (partial_match && strstr(test_name, arg) != NULL)
-      {
+    if (partial_match != 0 && strstr(test_name, arg) != NULL) { /* NOLINT */
       testToRun = i;
-      ac -=2;
+      ac -= 2;
       av += 2;
-      }
-    else if (!partial_match && strcmp(test_name, arg) == 0)
-      {
+    } else if (partial_match == 0 && strcmp(test_name, arg) == 0) {
       testToRun = i;
       ac--;
       av++;
-      }
-    free(test_name);
-    }
-  if(arg)
-    {
-    free(arg);
     }
-  if(testToRun != -1)
-    {
+    free(test_name);
+  }
+  free(arg);
+  if (testToRun != -1) {
     int result;
 @CMAKE_TESTDRIVER_BEFORE_TESTMAIN@
+    if (testToRun < 0 || testToRun >= NumTests) {
+      printf("testToRun was modified by TestDriver code to an invalid value: "
+             "%3d.\n",
+             testNum);
+      return -1;
+    }
     result = (*cmakeGeneratedFunctionMapEntries[testToRun].func)(ac, av);
 @CMAKE_TESTDRIVER_AFTER_TESTMAIN@
     return result;
-    }
-
+  }
 
   /* Nothing was run, display the test names.  */
   printf("Available tests:\n");
-  for (i =0; i < NumTests; ++i)
-    {
+  for (i = 0; i < NumTests; ++i) {
     printf("%3d. %s\n", i, cmakeGeneratedFunctionMapEntries[i].name);
-    }
+  }
   printf("Failed: %s is an invalid test name.\n", av[1]);
 
   return -1;
diff --git a/Templates/UtilityFooter.dsptemplate b/Templates/UtilityFooter.dsptemplate
deleted file mode 100644
index 941fb446a..000000000
--- a/Templates/UtilityFooter.dsptemplate
+++ /dev/null
@@ -1,2 +0,0 @@
-# End Target

-# End Project

diff --git a/Templates/UtilityHeader.dsptemplate b/Templates/UtilityHeader.dsptemplate
deleted file mode 100644
index 509f597f1..000000000
--- a/Templates/UtilityHeader.dsptemplate
+++ /dev/null
@@ -1,95 +0,0 @@
-# Microsoft Developer Studio Project File - Name="OUTPUT_LIBNAME" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Generic Project" 0x010a

-

-CFG=OUTPUT_LIBNAME - Win32 Debug

-!MESSAGE This is not a valid makefile. To build this project using NMAKE,

-!MESSAGE use the Export Makefile command and run

-!MESSAGE 

-!MESSAGE NMAKE /f "OUTPUT_LIBNAME.mak".

-!MESSAGE 

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "OUTPUT_LIBNAME.mak" CFG="OUTPUT_LIBNAME - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "OUTPUT_LIBNAME - Win32 MinSizeRel" (based on "Win32 (x86) Generic Project")

-!MESSAGE "OUTPUT_LIBNAME - Win32 Release" (based on "Win32 (x86) Generic Project")

-!MESSAGE "OUTPUT_LIBNAME - Win32 RelWithDebInfo" (based on "Win32 (x86) Generic Project")

-!MESSAGE "OUTPUT_LIBNAME - Win32 Debug" (based on "Win32 (x86) Generic Project")

-!MESSAGE 

-

-# Begin Project

-# PROP AllowPerConfigDependencies 0

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-MTL=midl.exe

-

-!IF  "$(CFG)" == "OUTPUT_LIBNAME - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Release"

-# PROP BASE Intermediate_Dir "Release"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Intermediate_Dir "Release"

-# PROP Target_Dir ""

-

-CMAKE_CUSTOM_RULE_CODE_RELEASE

-

-!ELSEIF  "$(CFG)" == "OUTPUT_LIBNAME - Win32 Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Intermediate_Dir "Debug"

-# PROP Target_Dir ""

-

-CMAKE_CUSTOM_RULE_CODE_DEBUG

-

-!ELSEIF  "$(CFG)" == "OUTPUT_LIBNAME - Win32 MinSizeRel"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "MinSizeRel"

-# PROP BASE Intermediate_Dir "MinSizeRel"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Intermediate_Dir "MinSizeRel"

-# PROP Target_Dir ""

-

-CMAKE_CUSTOM_RULE_CODE_MINSIZEREL

-

-!ELSEIF  "$(CFG)" == "OUTPUT_LIBNAME - Win32 RelWithDebInfo"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "RelWithDebInfo"

-# PROP BASE Intermediate_Dir "RelWithDebInfo"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Intermediate_Dir "RelWithDebInfo"

-# PROP Target_Dir ""

-

-CMAKE_CUSTOM_RULE_CODE_RELWITHDEBINFO

-

-!ENDIF 

-

-# Begin Target

-

-# Name "OUTPUT_LIBNAME - Win32 Release"

-# Name "OUTPUT_LIBNAME - Win32 Debug"

-# Name "OUTPUT_LIBNAME - Win32 MinSizeRel"

-# Name "OUTPUT_LIBNAME - Win32 RelWithDebInfo"

diff --git a/Templates/Windows/ApplicationIcon.png b/Templates/Windows/ApplicationIcon.png
new file mode 100644
index 000000000..7d95d4e08
--- /dev/null
+++ b/Templates/Windows/ApplicationIcon.png
diff --git a/Templates/Windows/Logo.png b/Templates/Windows/Logo.png
new file mode 100644
index 000000000..e26771cb3
--- /dev/null
+++ b/Templates/Windows/Logo.png
diff --git a/Templates/Windows/SmallLogo.png b/Templates/Windows/SmallLogo.png
new file mode 100644
index 000000000..1eb0d9d52
--- /dev/null
+++ b/Templates/Windows/SmallLogo.png
diff --git a/Templates/Windows/SmallLogo44x44.png b/Templates/Windows/SmallLogo44x44.png
new file mode 100644
index 000000000..28810b7c0
--- /dev/null
+++ b/Templates/Windows/SmallLogo44x44.png
diff --git a/Templates/Windows/SplashScreen.png b/Templates/Windows/SplashScreen.png
new file mode 100644
index 000000000..c951e031b
--- /dev/null
+++ b/Templates/Windows/SplashScreen.png
diff --git a/Templates/Windows/StoreLogo.png b/Templates/Windows/StoreLogo.png
new file mode 100644
index 000000000..dcb672712
--- /dev/null
+++ b/Templates/Windows/StoreLogo.png
diff --git a/Templates/Windows/Windows_TemporaryKey.pfx b/Templates/Windows/Windows_TemporaryKey.pfx
new file mode 100644
index 000000000..1cad9993d
--- /dev/null
+++ b/Templates/Windows/Windows_TemporaryKey.pfx
diff --git a/Templates/cygwin-package.sh.in b/Templates/cygwin-package.sh.in
deleted file mode 100755
index 69b6c0f6f..000000000
--- a/Templates/cygwin-package.sh.in
+++ /dev/null
@@ -1,103 +0,0 @@
-#!/bin/sh
-
-# this is a sample shell script used for building a cmake
-# based project for a cygwin setup package.
-
-# get the current directory
-TOP_DIR=`cd \`echo "$0" | sed -n '/\//{s/\/[^\/]*$//;p;}'\`;pwd`
-
-# create build directory
-mkdirs()
-{
-  (
-  mkdir -p "$TOP_DIR/@CPACK_PACKAGE_FILE_NAME@/.build"
-  )
-}
-
-# cd into
-# untar source tree and apply patch
-prep()
-{
-  (
-  cd "$TOP_DIR" &&
-  tar xvfj @CPACK_PACKAGE_FILE_NAME@.tar.bz2
-  patch -p0 < "@CPACK_PACKAGE_FILE_NAME@-@CPACK_CYGWIN_PATCH_NUMBER@.patch" &&
-  mkdirs
-  )
-}
-
-# configure the build tree in .build directory
-# of the source tree
-conf()
-{
-  (
-  cd "$TOP_DIR/@CPACK_PACKAGE_FILE_NAME@/.build" &&
-  cmake ..
-  )
-}
-
-# build the package in the .build directory
-build()
-{
-  (
-  cd "$TOP_DIR/@CPACK_PACKAGE_FILE_NAME@/.build" &&
-  make &&
-  make test
-  )
-}
-
-# clean the build tree
-clean()
-{
-  (
-  cd "$TOP_DIR/@CPACK_PACKAGE_FILE_NAME@/.build" &&
-  make clean
-  )
-}
-
-# create the package
-pkg()
-{
-  (
-  cd "$TOP_DIR/@CPACK_PACKAGE_FILE_NAME@/.build" &&
-  cpack &&
-  mv @CPACK_PACKAGE_FILE_NAME@-@CPACK_CYGWIN_PATCH_NUMBER@.tar.bz2 "$TOP_DIR"
-  )
-}
-
-# create the source package
-spkg()
-{
- (
-  cd "$TOP_DIR/@CPACK_PACKAGE_FILE_NAME@/.build" &&
-  cpack --config  CPackSourceConfig.cmake &&
-  mv @CPACK_PACKAGE_FILE_NAME@-@CPACK_CYGWIN_PATCH_NUMBER@-src.tar.bz2 "$TOP_DIR"
-  )
-}
-
-# clean up
-finish()
-{
-  (
-  rm -rf "@CPACK_PACKAGE_FILE_NAME@"
-  )
-}
-
-case $1 in
-  prep)         prep    ; STATUS=$? ;;
-  mkdirs)       mkdirs  ; STATUS=$? ;;
-  conf)         conf    ; STATUS=$? ;;
-  build)        build   ; STATUS=$? ;;
-  clean)        clean   ; STATUS=$? ;;
-  package)      pkg     ; STATUS=$? ;;
-  pkg)          pkg     ; STATUS=$? ;;
-  src-package)  spkg    ; STATUS=$? ;;
-  spkg)         spkg    ; STATUS=$? ;;
-  finish)       finish  ; STATUS=$? ;;
-  all) (
-       prep && conf && build && pkg && spkg && finish ;
-       STATUS=$?
-       ) ;;
-  *) echo "Error: bad argument (all or one of these: prep mkdirs conf build clean package pkg src-package spkg finish)" ; exit 1 ;;
-esac
-exit ${STATUS}
diff --git a/Templates/staticLibFooter.dsptemplate b/Templates/staticLibFooter.dsptemplate
deleted file mode 100644
index 0d0682a7b..000000000
--- a/Templates/staticLibFooter.dsptemplate
+++ /dev/null
@@ -1,4 +0,0 @@
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"

-# End Group

-# End Target

-# End Project

diff --git a/Templates/staticLibHeader.dsptemplate b/Templates/staticLibHeader.dsptemplate
deleted file mode 100644
index a8892e124..000000000
--- a/Templates/staticLibHeader.dsptemplate
+++ /dev/null
@@ -1,173 +0,0 @@
-# Microsoft Developer Studio Project File - Name="OUTPUT_LIBNAME" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

-# CMAKE DSP Header file

-# This file is read by the CMAKE, and is used as the top part of

-# a microsoft project dsp header file

-# IF this is in a dsp file, then it is not the header, but has

-# already been used, so do not edit in that case.

-

-# variables to REPLACE

-# 

-# BUILD_INCLUDES == include path

-# EXTRA_DEFINES == compiler defines

-# OUTPUT_DIRECTORY == override in output directory

-# OUTPUT_LIBNAME  == name of output library

-

-# TARGTYPE "Win32 (x86) Static Library" 0x0104

-

-CFG=OUTPUT_LIBNAME - Win32 Debug

-!MESSAGE This is not a valid makefile. To build this project using NMAKE,

-!MESSAGE use the Export Makefile command and run

-!MESSAGE 

-!MESSAGE NMAKE /f "OUTPUT_LIBNAME.mak".

-!MESSAGE 

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "OUTPUT_LIBNAME.mak" CFG="OUTPUT_LIBNAME - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "OUTPUT_LIBNAME - Win32 MinSizeRel" (based on "Win32 (x86) Static Library")

-!MESSAGE "OUTPUT_LIBNAME - Win32 Release" (based on "Win32 (x86) Static Library")

-!MESSAGE "OUTPUT_LIBNAME - Win32 RelWithDebInfo" (based on "Win32 (x86) Static Library")

-!MESSAGE "OUTPUT_LIBNAME - Win32 Debug" (based on "Win32 (x86) Static Library")

-# Begin Project

-# PROP AllowPerConfigDependencies 0

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "OUTPUT_LIBNAME - Win32 Release"

-

-# PROP BASE Use_MFC CMAKE_MFC_FLAG

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Release"

-# PROP BASE Intermediate_Dir "Release"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC CMAKE_MFC_FLAG

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "OUTPUT_DIRECTORY_RELEASE"

-# PROP Intermediate_Dir "Release"

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /D "WIN32" /D "NDEBUG" /D "_LIB"  /FD /c

-# ADD CPP /nologo /D "NDEBUG" /D "WIN32" /D "_LIB"  /FD /c

-# ADD CPP BUILD_INCLUDES_RELEASE EXTRA_DEFINES

-# ADD CPP CMAKE_CXX_FLAGS

-# ADD CPP CMAKE_CXX_FLAGS_RELEASE

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC BUILD_INCLUDES_RELEASE /l 0x409 /d "NDEBUG"

-# ADD RSC COMPILE_DEFINITIONS

-# ADD RSC COMPILE_DEFINITIONS_RELEASE

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LIB32=link.exe -lib

-# ADD BASE LIB32 /nologo

-# ADD LIB32 /nologo /out:"OUTPUT_DIRECTORY_RELEASE/OUTPUT_NAME_RELEASE" CM_STATIC_LIB_ARGS_RELEASE

-

-CMAKE_CUSTOM_RULE_CODE_RELEASE

-

-!ELSEIF  "$(CFG)" == "OUTPUT_LIBNAME - Win32 Debug"

-

-# PROP BASE Use_MFC CMAKE_MFC_FLAG

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC CMAKE_MFC_FLAG

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "OUTPUT_DIRECTORY_DEBUG"

-# PROP Intermediate_Dir "Debug"

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /D "WIN32" /D "_DEBUG" /D "_LIB"  /FD /c

-# ADD CPP /nologo /D "_DEBUG" /D "WIN32" /D "_LIB"  /FD /GZ /c

-# ADD CPP BUILD_INCLUDES_DEBUG EXTRA_DEFINES

-# ADD CPP CMAKE_CXX_FLAGS

-# ADD CPP CMAKE_CXX_FLAGS_DEBUG

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC BUILD_INCLUDES_DEBUG /l 0x409 /d "_DEBUG"

-# ADD RSC COMPILE_DEFINITIONS

-# ADD RSC COMPILE_DEFINITIONS_DEBUG

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LIB32=link.exe -lib

-# ADD BASE LIB32 /nologo

-# ADD LIB32 /nologo /out:"OUTPUT_DIRECTORY_DEBUG/OUTPUT_NAME_DEBUG" CM_STATIC_LIB_ARGS_DEBUG

-

-CMAKE_CUSTOM_RULE_CODE_DEBUG

-

-!ELSEIF  "$(CFG)" == "OUTPUT_LIBNAME - Win32 MinSizeRel"

-

-# PROP BASE Use_MFC CMAKE_MFC_FLAG

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "MinSizeRel"

-# PROP BASE Intermediate_Dir "MinSizeRel"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC CMAKE_MFC_FLAG

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "OUTPUT_DIRECTORY_MINSIZEREL"

-# PROP Intermediate_Dir "MinSizeRel"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" /D "_ATL_DLL" /FD /c

-# ADD CPP /nologo /D "NDEBUG" /D "_ATL_DLL"  /D "WIN32" /D "_WINDOWS" /D "_USRDLL" /FD /c

-# ADD CPP BUILD_INCLUDES_MINSIZEREL EXTRA_DEFINES

-# ADD CPP CMAKE_CXX_FLAGS

-# ADD CPP CMAKE_CXX_FLAGS_MINSIZEREL

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC BUILD_INCLUDES_MINSIZEREL /l 0x409 /d "NDEBUG"

-# ADD RSC COMPILE_DEFINITIONS

-# ADD RSC COMPILE_DEFINITIONS_MINSIZEREL

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LIB32=link.exe -lib

-# ADD BASE LIB32 /nologo

-# ADD LIB32 /nologo /out:"OUTPUT_DIRECTORY_MINSIZEREL/OUTPUT_NAME_MINSIZEREL" CM_STATIC_LIB_ARGS_MINSIZEREL

-

-CMAKE_CUSTOM_RULE_CODE_MINSIZEREL

-

-!ELSEIF  "$(CFG)" == "OUTPUT_LIBNAME - Win32 RelWithDebInfo"

-

-# PROP BASE Use_MFC CMAKE_MFC_FLAG

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "RelWithDebInfo"

-# PROP BASE Intermediate_Dir "RelWithDebInfo"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC CMAKE_MFC_FLAG

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "OUTPUT_DIRECTORY_RELWITHDEBINFO"

-# PROP Intermediate_Dir "RelWithDebInfo"

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /D "WIN32" /D "NDEBUG" /D "_LIB"  /FD /c

-# ADD CPP /nologo /D "NDEBUG" /D "WIN32" /D "_LIB"  /FD /c

-# ADD CPP BUILD_INCLUDES_RELWITHDEBINFO EXTRA_DEFINES

-# ADD CPP CMAKE_CXX_FLAGS

-# ADD CPP CMAKE_CXX_FLAGS_RELWITHDEBINFO

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC BUILD_INCLUDES_RELWITHDEBINFO /l 0x409 /d "NDEBUG"

-# ADD RSC COMPILE_DEFINITIONS

-# ADD RSC COMPILE_DEFINITIONS_RELWITHDEBINFO

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LIB32=link.exe -lib

-# ADD BASE LIB32 /nologo

-# ADD LIB32 /nologo /out:"OUTPUT_DIRECTORY_RELWITHDEBINFO/OUTPUT_NAME_RELWITHDEBINFO" CM_STATIC_LIB_ARGS_RELWITHDEBINFO

-

-CMAKE_CUSTOM_RULE_CODE_RELWITHDEBINFO

-

-!ENDIF 

-

-# Begin Target

-

-# Name "OUTPUT_LIBNAME - Win32 Release"

-# Name "OUTPUT_LIBNAME - Win32 Debug"

-# Name "OUTPUT_LIBNAME - Win32 MinSizeRel"

-# Name "OUTPUT_LIBNAME - Win32 RelWithDebInfo"

-