*** empty log message ***

48 files changed, 56 insertions, 56 deletions

diff --git a/tests/Atomic_Op_Test.dsp b/tests/Atomic_Op_Test.dsp
index e5023ce8f3e..93a60e21f85 100644
--- a/tests/Atomic_Op_Test.dsp
+++ b/tests/Atomic_Op_Test.dsp
@@ -260,7 +260,7 @@ LINK32=link.exe
 CPP=cl.exe

 # ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c

 # SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c

+# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

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

diff --git a/tests/Barrier_Test.dsp b/tests/Barrier_Test.dsp
index f5cba2f1add..58b3bc4ceb0 100644
--- a/tests/Barrier_Test.dsp
+++ b/tests/Barrier_Test.dsp
@@ -260,7 +260,7 @@ LINK32=link.exe
 CPP=cl.exe

 # ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c

 # SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c

+# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

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

diff --git a/tests/Buffer_Stream_Test.dsp b/tests/Buffer_Stream_Test.dsp
index 0829d447970..8db6c349246 100644
--- a/tests/Buffer_Stream_Test.dsp
+++ b/tests/Buffer_Stream_Test.dsp
@@ -260,7 +260,7 @@ LINK32=link.exe
 CPP=cl.exe

 # ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c

 # SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c

+# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

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

diff --git a/tests/Conn_Test.dsp b/tests/Conn_Test.dsp
index 484c03c4476..da7dc42fbba 100644
--- a/tests/Conn_Test.dsp
+++ b/tests/Conn_Test.dsp
@@ -258,7 +258,7 @@ LINK32=link.exe
 CPP=cl.exe

 # ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c

 # SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c

+# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

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

diff --git a/tests/Enum_Interfaces_Test.dsp b/tests/Enum_Interfaces_Test.dsp
index 8fa49c0dcf6..c25cd53c389 100644
--- a/tests/Enum_Interfaces_Test.dsp
+++ b/tests/Enum_Interfaces_Test.dsp
@@ -260,7 +260,7 @@ LINK32=link.exe
 CPP=cl.exe

 # ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c

 # SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c

+# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

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

diff --git a/tests/Future_Test.dsp b/tests/Future_Test.dsp
index cdf98209b0c..0bec6753880 100644
--- a/tests/Future_Test.dsp
+++ b/tests/Future_Test.dsp
@@ -260,7 +260,7 @@ LINK32=link.exe
 CPP=cl.exe

 # ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c

 # SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c

+# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

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

diff --git a/tests/Handle_Set_Test.dsp b/tests/Handle_Set_Test.dsp
index cab0e75b40e..c0432c4935d 100644
--- a/tests/Handle_Set_Test.dsp
+++ b/tests/Handle_Set_Test.dsp
@@ -260,7 +260,7 @@ LINK32=link.exe
 CPP=cl.exe

 # ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c

 # SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c

+# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

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

diff --git a/tests/Hash_Map_Manager_Test.dsp b/tests/Hash_Map_Manager_Test.dsp
index 6673feeb743..5707a7dd200 100644
--- a/tests/Hash_Map_Manager_Test.dsp
+++ b/tests/Hash_Map_Manager_Test.dsp
@@ -258,7 +258,7 @@ LINK32=link.exe
 # PROP Target_Dir ""

 CPP=cl.exe

 # ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /YX /FD /c

-# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /YX /FD /c

+# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /YX /FD /c

 RSC=rc.exe

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

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

diff --git a/tests/IOStream_Test.dsp b/tests/IOStream_Test.dsp
index 9a9f84b2e49..ecc8cb54510 100644
--- a/tests/IOStream_Test.dsp
+++ b/tests/IOStream_Test.dsp
@@ -260,7 +260,7 @@ LINK32=link.exe
 CPP=cl.exe

 # ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c

 # SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c

+# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

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

diff --git a/tests/MM_Shared_Memory_Test.dsp b/tests/MM_Shared_Memory_Test.dsp
index f6aad7f4a2d..c8dc96b7fb6 100644
--- a/tests/MM_Shared_Memory_Test.dsp
+++ b/tests/MM_Shared_Memory_Test.dsp
@@ -260,7 +260,7 @@ LINK32=link.exe
 CPP=cl.exe

 # ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c

 # SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c

+# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

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

diff --git a/tests/MT_SOCK_Test.dsp b/tests/MT_SOCK_Test.dsp
index 1bb283e9854..575ff0f8344 100644
--- a/tests/MT_SOCK_Test.dsp
+++ b/tests/MT_SOCK_Test.dsp
@@ -260,7 +260,7 @@ LINK32=link.exe
 CPP=cl.exe

 # ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /O2 /Ob2 /I ".." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c

 # SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I ".." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c

+# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I ".." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

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

diff --git a/tests/Map_Manager_Test.dsp b/tests/Map_Manager_Test.dsp
index 681d6e02972..03ac8eb7d61 100644
--- a/tests/Map_Manager_Test.dsp
+++ b/tests/Map_Manager_Test.dsp
@@ -262,7 +262,7 @@ LINK32=link.exe
 CPP=cl.exe

 # ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c

 # SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c

+# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

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

diff --git a/tests/Mem_Map_Test.dsp b/tests/Mem_Map_Test.dsp
index 0cfbb76c94f..9f452fae55b 100644
--- a/tests/Mem_Map_Test.dsp
+++ b/tests/Mem_Map_Test.dsp
@@ -260,7 +260,7 @@ LINK32=link.exe
 CPP=cl.exe

 # ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c

 # SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c

+# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

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

diff --git a/tests/Message_Block_Test.dsp b/tests/Message_Block_Test.dsp
index 75ec4c6bc87..18da84fd1ca 100644
--- a/tests/Message_Block_Test.dsp
+++ b/tests/Message_Block_Test.dsp
@@ -260,7 +260,7 @@ LINK32=link.exe
 CPP=cl.exe

 # ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c

 # SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c

+# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

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

diff --git a/tests/Message_Queue_Notifications_Test.dsp b/tests/Message_Queue_Notifications_Test.dsp
index de77ef890ff..6d2a595360e 100644
--- a/tests/Message_Queue_Notifications_Test.dsp
+++ b/tests/Message_Queue_Notifications_Test.dsp
@@ -262,7 +262,7 @@ LINK32=link.exe
 CPP=cl.exe

 # ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c

 # SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c

+# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

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

diff --git a/tests/Message_Queue_Test.dsp b/tests/Message_Queue_Test.dsp
index d8bc553f87b..cf7e8e22359 100644
--- a/tests/Message_Queue_Test.dsp
+++ b/tests/Message_Queue_Test.dsp
@@ -260,7 +260,7 @@ LINK32=link.exe
 CPP=cl.exe

 # ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c

 # SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c

+# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

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

diff --git a/tests/Naming_Test.dsp b/tests/Naming_Test.dsp
index bd93e4a948b..14cbc1a7eb5 100644
--- a/tests/Naming_Test.dsp
+++ b/tests/Naming_Test.dsp
@@ -260,7 +260,7 @@ LINK32=link.exe
 CPP=cl.exe

 # ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c

 # SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c

+# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

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

diff --git a/tests/Notify_Performance_Test.dsp b/tests/Notify_Performance_Test.dsp
index 4e31e8572ab..ec5fe817893 100644
--- a/tests/Notify_Performance_Test.dsp
+++ b/tests/Notify_Performance_Test.dsp
@@ -260,7 +260,7 @@ LINK32=link.exe
 CPP=cl.exe

 # ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /O2 /Ob2 /I ".." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c

 # SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I ".." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c

+# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I ".." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

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

diff --git a/tests/Pipe_Test.dsp b/tests/Pipe_Test.dsp
index cb9ad78cc96..8366d8bdba0 100644
--- a/tests/Pipe_Test.dsp
+++ b/tests/Pipe_Test.dsp
@@ -258,7 +258,7 @@ LINK32=link.exe
 CPP=cl.exe

 # ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c

 # SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c

+# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

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

diff --git a/tests/Priority_Buffer_Test.dsp b/tests/Priority_Buffer_Test.dsp
index cb55ffee538..e6daa2a95cf 100644
--- a/tests/Priority_Buffer_Test.dsp
+++ b/tests/Priority_Buffer_Test.dsp
@@ -262,7 +262,7 @@ LINK32=link.exe
 CPP=cl.exe

 # ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c

 # SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c

+# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

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

diff --git a/tests/Priority_Reactor_Test.dsp b/tests/Priority_Reactor_Test.dsp
index f9c6c2d10bf..7d727fcabca 100644
--- a/tests/Priority_Reactor_Test.dsp
+++ b/tests/Priority_Reactor_Test.dsp
@@ -260,7 +260,7 @@ LINK32=link.exe
 CPP=cl.exe

 # ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c

 # SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c

+# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

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

diff --git a/tests/Priority_Task_Test.dsp b/tests/Priority_Task_Test.dsp
index 2c1736f2432..79f1412a3ca 100644
--- a/tests/Priority_Task_Test.dsp
+++ b/tests/Priority_Task_Test.dsp
@@ -260,7 +260,7 @@ LINK32=link.exe
 CPP=cl.exe

 # ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c

 # SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c

+# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

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

diff --git a/tests/Process_Mutex_Test.dsp b/tests/Process_Mutex_Test.dsp
index e8701034b5e..329524855c0 100644
--- a/tests/Process_Mutex_Test.dsp
+++ b/tests/Process_Mutex_Test.dsp
@@ -260,7 +260,7 @@ LINK32=link.exe
 CPP=cl.exe

 # ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c

 # SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c

+# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

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

diff --git a/tests/Process_Strategy_Test.dsp b/tests/Process_Strategy_Test.dsp
index e36b54df0d6..079a3e726c5 100644
--- a/tests/Process_Strategy_Test.dsp
+++ b/tests/Process_Strategy_Test.dsp
@@ -260,7 +260,7 @@ LINK32=link.exe
 CPP=cl.exe

 # ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c

 # SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c

+# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

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

diff --git a/tests/Reactor_Exceptions_Test.dsp b/tests/Reactor_Exceptions_Test.dsp
index 78b4e563baa..5adc11b2fd4 100644
--- a/tests/Reactor_Exceptions_Test.dsp
+++ b/tests/Reactor_Exceptions_Test.dsp
@@ -260,7 +260,7 @@ LINK32=link.exe
 CPP=cl.exe

 # ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c

 # SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c

+# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

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

diff --git a/tests/Reactor_Notify_Test.dsp b/tests/Reactor_Notify_Test.dsp
index 02808e5d24e..98bd739f979 100644
--- a/tests/Reactor_Notify_Test.dsp
+++ b/tests/Reactor_Notify_Test.dsp
@@ -260,7 +260,7 @@ LINK32=link.exe
 CPP=cl.exe

 # ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c

 # SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c

+# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

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

diff --git a/tests/Reactor_Performance_Test.dsp b/tests/Reactor_Performance_Test.dsp
index d863976af6e..708881739bb 100644
--- a/tests/Reactor_Performance_Test.dsp
+++ b/tests/Reactor_Performance_Test.dsp
@@ -260,7 +260,7 @@ LINK32=link.exe
 CPP=cl.exe

 # ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /O2 /Ob2 /I ".." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c

 # SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I ".." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c

+# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I ".." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

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

diff --git a/tests/Reactor_Timer_Test.dsp b/tests/Reactor_Timer_Test.dsp
index 361f2683a2f..ac0f77b4681 100644
--- a/tests/Reactor_Timer_Test.dsp
+++ b/tests/Reactor_Timer_Test.dsp
@@ -260,7 +260,7 @@ LINK32=link.exe
 CPP=cl.exe

 # ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c

 # SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c

+# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

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

diff --git a/tests/Reactors_Test.dsp b/tests/Reactors_Test.dsp
index ede771f4646..f7979be2c77 100644
--- a/tests/Reactors_Test.dsp
+++ b/tests/Reactors_Test.dsp
@@ -260,7 +260,7 @@ LINK32=link.exe
 CPP=cl.exe

 # ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c

 # SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c

+# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

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

diff --git a/tests/Reader_Writer_Test.dsp b/tests/Reader_Writer_Test.dsp
index 2e4cd10024a..f903775db65 100644
--- a/tests/Reader_Writer_Test.dsp
+++ b/tests/Reader_Writer_Test.dsp
@@ -260,7 +260,7 @@ LINK32=link.exe
 CPP=cl.exe

 # ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c

 # SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c

+# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

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

diff --git a/tests/Recursive_Mutex_Test.dsp b/tests/Recursive_Mutex_Test.dsp
index 102fcd66e7f..f56adc730d6 100644
--- a/tests/Recursive_Mutex_Test.dsp
+++ b/tests/Recursive_Mutex_Test.dsp
@@ -260,7 +260,7 @@ LINK32=link.exe
 CPP=cl.exe

 # ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c

 # SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c

+# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

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

diff --git a/tests/SOCK_Test.dsp b/tests/SOCK_Test.dsp
index c2e02574624..394b963231d 100644
--- a/tests/SOCK_Test.dsp
+++ b/tests/SOCK_Test.dsp
@@ -258,7 +258,7 @@ LINK32=link.exe
 CPP=cl.exe

 # ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c

 # SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c

+# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

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

diff --git a/tests/SPIPE_Test.dsp b/tests/SPIPE_Test.dsp
index 94026fc91b1..e5de3452733 100644
--- a/tests/SPIPE_Test.dsp
+++ b/tests/SPIPE_Test.dsp
@@ -260,7 +260,7 @@ LINK32=link.exe
 CPP=cl.exe

 # ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c

 # SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c

+# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

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

diff --git a/tests/SString_Test.dsp b/tests/SString_Test.dsp
index b610e189d73..a603b072bbf 100644
--- a/tests/SString_Test.dsp
+++ b/tests/SString_Test.dsp
@@ -260,7 +260,7 @@ LINK32=link.exe
 CPP=cl.exe

 # ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c

 # SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c

+# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

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

diff --git a/tests/SV_Shared_Memory_Test.dsp b/tests/SV_Shared_Memory_Test.dsp
index 85ec3e3896c..fc8223686da 100644
--- a/tests/SV_Shared_Memory_Test.dsp
+++ b/tests/SV_Shared_Memory_Test.dsp
@@ -260,7 +260,7 @@ LINK32=link.exe
 CPP=cl.exe

 # ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c

 # SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c

+# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

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

diff --git a/tests/Semaphore_Test.dsp b/tests/Semaphore_Test.dsp
index 262bc61a294..6587dc02dca 100644
--- a/tests/Semaphore_Test.dsp
+++ b/tests/Semaphore_Test.dsp
@@ -260,7 +260,7 @@ LINK32=link.exe
 CPP=cl.exe

 # ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c

 # SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c

+# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

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

diff --git a/tests/Service_Config_Test.dsp b/tests/Service_Config_Test.dsp
index aad8a6738d0..d758cdb37e6 100644
--- a/tests/Service_Config_Test.dsp
+++ b/tests/Service_Config_Test.dsp
@@ -260,7 +260,7 @@ LINK32=link.exe
 CPP=cl.exe

 # ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c

 # SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c

+# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

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

diff --git a/tests/Sigset_Ops_Test.dsp b/tests/Sigset_Ops_Test.dsp
index a128b2b8e24..de5c8877e5e 100644
--- a/tests/Sigset_Ops_Test.dsp
+++ b/tests/Sigset_Ops_Test.dsp
@@ -260,7 +260,7 @@ LINK32=link.exe
 CPP=cl.exe

 # ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c

 # SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c

+# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

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

diff --git a/tests/Simple_Message_Block_Test.dsp b/tests/Simple_Message_Block_Test.dsp
index bd7e326478f..1353a075f4f 100644
--- a/tests/Simple_Message_Block_Test.dsp
+++ b/tests/Simple_Message_Block_Test.dsp
@@ -260,7 +260,7 @@ LINK32=link.exe
 CPP=cl.exe

 # ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c

 # SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c

+# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

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

diff --git a/tests/TSS_Test.dsp b/tests/TSS_Test.dsp
index 521b84af617..0582cb17d75 100644
--- a/tests/TSS_Test.dsp
+++ b/tests/TSS_Test.dsp
@@ -258,7 +258,7 @@ LINK32=link.exe
 CPP=cl.exe

 # ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c

 # SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c

+# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

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

diff --git a/tests/Task_Test.dsp b/tests/Task_Test.dsp
index 835e99970a4..fadefd87d5b 100644
--- a/tests/Task_Test.dsp
+++ b/tests/Task_Test.dsp
@@ -258,7 +258,7 @@ LINK32=link.exe
 CPP=cl.exe

 # ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c

 # SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c

+# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

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

diff --git a/tests/Thread_Manager_Test.dsp b/tests/Thread_Manager_Test.dsp
index c1694c029b5..e077805f024 100644
--- a/tests/Thread_Manager_Test.dsp
+++ b/tests/Thread_Manager_Test.dsp
@@ -231,7 +231,7 @@ LINK32=link.exe
 CPP=cl.exe

 # ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c

 # SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c

+# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

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

diff --git a/tests/Thread_Pool_Test.dsp b/tests/Thread_Pool_Test.dsp
index 053026e32ea..5a365c6f778 100644
--- a/tests/Thread_Pool_Test.dsp
+++ b/tests/Thread_Pool_Test.dsp
@@ -260,7 +260,7 @@ LINK32=link.exe
 CPP=cl.exe

 # ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c

 # SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c

+# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

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

diff --git a/tests/Time_Service_Test.dsp b/tests/Time_Service_Test.dsp
index 4c31fab692e..ead8d8e7d49 100644
--- a/tests/Time_Service_Test.dsp
+++ b/tests/Time_Service_Test.dsp
@@ -260,7 +260,7 @@ LINK32=link.exe
 CPP=cl.exe

 # ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c

 # SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c

+# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

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

diff --git a/tests/Time_Value_Test.dsp b/tests/Time_Value_Test.dsp
index 8c6a098185d..a526e5910b1 100644
--- a/tests/Time_Value_Test.dsp
+++ b/tests/Time_Value_Test.dsp
@@ -260,7 +260,7 @@ LINK32=link.exe
 CPP=cl.exe

 # ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c

 # SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c

+# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

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

diff --git a/tests/Timer_Queue_Test.dsp b/tests/Timer_Queue_Test.dsp
index 58b9d9d4d67..ca981b70d48 100644
--- a/tests/Timer_Queue_Test.dsp
+++ b/tests/Timer_Queue_Test.dsp
@@ -193,14 +193,14 @@ LINK32=link.exe
 # PROP BASE Target_Dir "Timer_Queue_Test"

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

-# PROP Output_Dir "Timer_Queue_Test\Alpha Release"

-# PROP Intermediate_Dir "Timer_Queue_Test\Alpha Release"

+# PROP Output_Dir "DLL/Release"

+# PROP Intermediate_Dir "DLL/Release"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir "Timer_Queue_Test"

 CPP=cl.exe

 # ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "NDEBUG" /FD /c

 # SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "NDEBUG" /FD /c

+# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "NDEBUG" /FD /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

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

@@ -224,14 +224,14 @@ LINK32=link.exe
 # PROP BASE Target_Dir "Timer_Queue_Test"

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

-# PROP Output_Dir "Timer_Queue_Test\Alpha Unicode Debug"

-# PROP Intermediate_Dir "Timer_Queue_Test\Alpha Unicode Debug"

+# PROP Output_Dir "DLL/Unicode_Debug"

+# PROP Intermediate_Dir "DLL/Unicode_Debug"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir "Timer_Queue_Test"

 CPP=cl.exe

 # ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c

 # SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c

+# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

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

@@ -253,14 +253,14 @@ LINK32=link.exe
 # PROP BASE Target_Dir "Timer_Queue_Test"

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

-# PROP Output_Dir "Timer_Queue_Test\Alpha Unicode Release"

-# PROP Intermediate_Dir "Timer_Queue_Test\Alpha Unicode Release"

+# PROP Output_Dir "DLL/Unicode_Release"

+# PROP Intermediate_Dir "DLL/Unicode_Release"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir "Timer_Queue_Test"

 CPP=cl.exe

 # ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c

 # SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c

+# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

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

diff --git a/tests/Tokens_Test.dsp b/tests/Tokens_Test.dsp
index 74def03103e..20f3a617c88 100644
--- a/tests/Tokens_Test.dsp
+++ b/tests/Tokens_Test.dsp
@@ -260,7 +260,7 @@ LINK32=link.exe
 CPP=cl.exe

 # ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c

 # SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c

+# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

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

diff --git a/tests/UPIPE_SAP_Test.dsp b/tests/UPIPE_SAP_Test.dsp
index 4c43766fab1..3ab5f089035 100644
--- a/tests/UPIPE_SAP_Test.dsp
+++ b/tests/UPIPE_SAP_Test.dsp
@@ -260,7 +260,7 @@ LINK32=link.exe
 CPP=cl.exe

 # ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c

 # SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c

+# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

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