slight change in the order of the options (right-most takes precedence)

4 files changed, 12 insertions, 12 deletions

diff --git a/Templates/DLLHeader.dsptemplate b/Templates/DLLHeader.dsptemplate
index 555fd13..f27e71b 100644
--- a/Templates/DLLHeader.dsptemplate
+++ b/Templates/DLLHeader.dsptemplate
@@ -59,8 +59,8 @@ RSC=rc.exe
 # ADD BASE CPP /nologo /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "OUTPUT_LIBNAME_EXPORTS" /FD /c

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

 # ADD CPP BUILD_INCLUDES EXTRA_DEFINES /D "OUTPUT_LIBNAME_EXPORTS"

-# ADD CPP CMAKE_CXX_FLAGS_RELEASE

 # 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"

@@ -88,8 +88,8 @@ LINK32=link.exe
 # ADD BASE CPP /nologo /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "OUTPUT_LIBNAME_EXPORTS" /FD /c

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

 # ADD CPP BUILD_INCLUDES EXTRA_DEFINES /D "OUTPUT_LIBNAME_EXPORTS"

-# ADD CPP CMAKE_CXX_FLAGS_DEBUG

 # 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"

@@ -119,8 +119,8 @@ LINK32=link.exe
 # SUBTRACT BASE CPP /YX

 # ADD CPP /nologo /D "VTKDLL" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL"  /FD /c

 # ADD CPP BUILD_INCLUDES EXTRA_DEFINES /D "OUTPUT_LIBNAME_EXPORTS"

-# ADD CPP CMAKE_CXX_FLAGS_MINSIZEREL

 # 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"

diff --git a/Templates/EXEHeader.dsptemplate b/Templates/EXEHeader.dsptemplate
index b9f5699..faccf3b 100644
--- a/Templates/EXEHeader.dsptemplate
+++ b/Templates/EXEHeader.dsptemplate
@@ -58,8 +58,8 @@ RSC=rc.exe
 # ADD BASE CPP /nologo  /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS"  /FD /c

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

 # ADD CPP BUILD_INCLUDES EXTRA_DEFINES /D "OUTPUT_LIBNAME_EXPORTS"

-# ADD CPP CMAKE_CXX_FLAGS_RELEASE

 # ADD CPP CMAKE_CXX_FLAGS

+# ADD CPP CMAKE_CXX_FLAGS_RELEASE

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

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

 BSC32=bscmake.exe

@@ -86,8 +86,8 @@ CM_MULTILINE_LIBRARIES
 # ADD BASE CPP   /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS"  /FD /GZ /c

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

 # ADD CPP BUILD_INCLUDES EXTRA_DEFINES /D "OUTPUT_LIBNAME_EXPORTS"

-# ADD CPP CMAKE_CXX_FLAGS_DEBUG

 # 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"

@@ -115,8 +115,8 @@ CM_MULTILINE_LIBRARIES
 # ADD BASE CPP /nologo  /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS"  /FD /c

 # ADD CPP /nologo  /D "WIN32" BUILD_INCLUDES EXTRA_DEFINES /D "NDEBUG" /D "_CONSOLE" /D "_MBCS"  /FD /c

 # ADD CPP BUILD_INCLUDES EXTRA_DEFINES /D "OUTPUT_LIBNAME_EXPORTS"

-# ADD CPP CMAKE_CXX_FLAGS_MINSIZEREL

 # ADD CPP CMAKE_CXX_FLAGS

+# ADD CPP CMAKE_CXX_FLAGS_MINSIZEREL

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

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

 BSC32=bscmake.exe

diff --git a/Templates/EXEWinHeader.dsptemplate b/Templates/EXEWinHeader.dsptemplate
index 560c6b4..9590cb7 100644
--- a/Templates/EXEWinHeader.dsptemplate
+++ b/Templates/EXEWinHeader.dsptemplate
@@ -58,8 +58,8 @@ RSC=rc.exe
 # ADD BASE CPP /nologo /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS"  /FD /c

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

 # ADD CPP BUILD_INCLUDES EXTRA_DEFINES /D "OUTPUT_LIBNAME_EXPORTS"

-# ADD CPP CMAKE_CXX_FLAGS_RELEASE

 # 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"

@@ -88,8 +88,8 @@ CM_MULTILINE_LIBRARIES
 # ADD BASE CPP  /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS"  /FD /c

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

 # ADD CPP BUILD_INCLUDES EXTRA_DEFINES /D "OUTPUT_LIBNAME_EXPORTS"

-# ADD CPP CMAKE_CXX_FLAGS_DEBUG

 # 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"

@@ -118,8 +118,8 @@ CM_MULTILINE_LIBRARIES
 # ADD BASE CPP /nologo /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS"  /FD /c

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

 # ADD CPP BUILD_INCLUDES EXTRA_DEFINES /D "OUTPUT_LIBNAME_EXPORTS"

-# ADD CPP CMAKE_CXX_FLAGS_MINSIZEREL

 # ADD CPP CMAKE_CXX_FLAGS

+# ADD CPP CMAKE_CXX_FLAGS_MINSIZEREL

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

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

 BSC32=bscmake.exe

diff --git a/Templates/staticLibHeader.dsptemplate b/Templates/staticLibHeader.dsptemplate
index 31640ef..3866279 100644
--- a/Templates/staticLibHeader.dsptemplate
+++ b/Templates/staticLibHeader.dsptemplate
@@ -55,8 +55,8 @@ RSC=rc.exe
 # ADD BASE CPP /nologo /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB"  /FD /c

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

 # ADD CPP BUILD_INCLUDES EXTRA_DEFINES /D "OUTPUT_LIBNAME_EXPORTS"

-# ADD CPP CMAKE_CXX_FLAGS_RELEASE

 # ADD CPP CMAKE_CXX_FLAGS

+# ADD CPP CMAKE_CXX_FLAGS_RELEASE

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

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

 BSC32=bscmake.exe

@@ -81,8 +81,8 @@ LIB32=link.exe -lib
 # ADD BASE CPP /nologo /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB"  /FD /c

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

 # ADD CPP BUILD_INCLUDES EXTRA_DEFINES /D "OUTPUT_LIBNAME_EXPORTS"

-# ADD CPP CMAKE_CXX_FLAGS_DEBUG

 # ADD CPP CMAKE_CXX_FLAGS

+# ADD CPP CMAKE_CXX_FLAGS_DEBUG

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

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

 BSC32=bscmake.exe

@@ -106,8 +106,8 @@ LIB32=link.exe -lib
 # ADD BASE CPP /nologo /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_ATL_DLL" /FD /c

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

 # ADD CPP BUILD_INCLUDES EXTRA_DEFINES /D "OUTPUT_LIBNAME_EXPORTS"

-# ADD CPP CMAKE_CXX_FLAGS_MINSIZEREL

 # ADD CPP CMAKE_CXX_FLAGS

+# ADD CPP CMAKE_CXX_FLAGS_MINSIZEREL

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

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

 BSC32=bscmake.exe