BUG: fix for rc and vs6

4 files changed, 32 insertions, 0 deletions

diff --git a/Templates/DLLHeader.dsptemplate b/Templates/DLLHeader.dsptemplate
index 20bc778111..eb703b29c5 100644
--- a/Templates/DLLHeader.dsptemplate
+++ b/Templates/DLLHeader.dsptemplate
@@ -66,6 +66,8 @@ RSC=rc.exe
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32

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

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

+# ADD RSC COMPILE_DEFINITIONS

+# ADD RSC COMPILE_DEFINITIONS_RELEASE

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

@@ -98,6 +100,8 @@ CMAKE_CUSTOM_RULE_CODE_RELEASE
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32

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

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

+# ADD RSC COMPILE_DEFINITIONS

+# ADD RSC COMPILE_DEFINITIONS_DEBUG

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

@@ -132,6 +136,8 @@ CMAKE_CUSTOM_RULE_CODE_DEBUG
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32

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

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

+# ADD RSC COMPILE_DEFINITIONS

+# ADD RSC COMPILE_DEFINITIONS_MINSIZEREL

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

@@ -164,6 +170,8 @@ CMAKE_CUSTOM_RULE_CODE_MINSIZEREL
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32

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

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

+# ADD RSC COMPILE_DEFINITIONS

+# ADD RSC COMPILE_DEFINITIONS_RELWITHDEBINFO

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

diff --git a/Templates/EXEHeader.dsptemplate b/Templates/EXEHeader.dsptemplate
index cf58f0642c..a4c03ddd86 100644
--- a/Templates/EXEHeader.dsptemplate
+++ b/Templates/EXEHeader.dsptemplate
@@ -63,6 +63,8 @@ RSC=rc.exe
 # ADD CPP CMAKE_CXX_FLAGS_RELEASE

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

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

+# ADD RSC COMPILE_DEFINITIONS

+# ADD RSC COMPILE_DEFINITIONS_RELEASE

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

@@ -95,6 +97,8 @@ CMAKE_CUSTOM_RULE_CODE_RELEASE
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32

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

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

+# ADD RSC COMPILE_DEFINITIONS

+# ADD RSC COMPILE_DEFINITIONS_DEBUG

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

@@ -124,6 +128,8 @@ CMAKE_CUSTOM_RULE_CODE_DEBUG
 # ADD CPP CMAKE_CXX_FLAGS_MINSIZEREL

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

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

+# ADD RSC COMPILE_DEFINITIONS

+# ADD RSC COMPILE_DEFINITIONS_MINSIZEREL

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

@@ -154,6 +160,8 @@ CMAKE_CUSTOM_RULE_CODE_MINSIZEREL
 # ADD CPP CMAKE_CXX_FLAGS_RELWITHDEBINFO

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

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

+# ADD RSC COMPILE_DEFINITIONS

+# ADD RSC COMPILE_DEFINITIONS_RELWITHDEBINFO

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

diff --git a/Templates/EXEWinHeader.dsptemplate b/Templates/EXEWinHeader.dsptemplate
index 0a68d7fb2f..d2f7e616c1 100644
--- a/Templates/EXEWinHeader.dsptemplate
+++ b/Templates/EXEWinHeader.dsptemplate
@@ -65,6 +65,8 @@ RSC=rc.exe
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32

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

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

+# ADD RSC COMPILE_DEFINITIONS

+# ADD RSC COMPILE_DEFINITIONS_RELEASE

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

@@ -97,6 +99,8 @@ CMAKE_CUSTOM_RULE_CODE_RELEASE
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32

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

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

+# ADD RSC COMPILE_DEFINITIONS

+# ADD RSC COMPILE_DEFINITIONS_DEBUG

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

@@ -126,6 +130,8 @@ CMAKE_CUSTOM_RULE_CODE_DEBUG
 # ADD CPP CMAKE_CXX_FLAGS_MINSIZEREL

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

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

+# ADD RSC COMPILE_DEFINITIONS

+# ADD RSC COMPILE_DEFINITIONS_MINSIZEREL

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

@@ -158,6 +164,8 @@ CMAKE_CUSTOM_RULE_CODE_MINSIZEREL
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32

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

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

+# ADD RSC COMPILE_DEFINITIONS

+# ADD RSC COMPILE_DEFINITIONS_RELWITHDEBINFO

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

diff --git a/Templates/staticLibHeader.dsptemplate b/Templates/staticLibHeader.dsptemplate
index 9ef1822d7b..57fad988df 100644
--- a/Templates/staticLibHeader.dsptemplate
+++ b/Templates/staticLibHeader.dsptemplate
@@ -60,6 +60,8 @@ RSC=rc.exe
 # ADD CPP CMAKE_CXX_FLAGS_RELEASE

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

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

+# ADD RSC COMPILE_DEFINITIONS

+# ADD RSC COMPILE_DEFINITIONS_RELEASE

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

@@ -88,6 +90,8 @@ CMAKE_CUSTOM_RULE_CODE_RELEASE
 # ADD CPP CMAKE_CXX_FLAGS_DEBUG

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

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

+# ADD RSC COMPILE_DEFINITIONS

+# ADD RSC COMPILE_DEFINITIONS_DEBUG

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

@@ -117,6 +121,8 @@ CMAKE_CUSTOM_RULE_CODE_DEBUG
 # ADD CPP CMAKE_CXX_FLAGS_MINSIZEREL

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

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

+# ADD RSC COMPILE_DEFINITIONS

+# ADD RSC COMPILE_DEFINITIONS_MINSIZEREL

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

@@ -145,6 +151,8 @@ CMAKE_CUSTOM_RULE_CODE_MINSIZEREL
 # ADD CPP CMAKE_CXX_FLAGS_RELWITHDEBINFO

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

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

+# ADD RSC COMPILE_DEFINITIONS

+# ADD RSC COMPILE_DEFINITIONS_RELWITHDEBINFO

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo