http://bugzilla.zeroc.com/bugzilla/show_bug.cgi?id=592

138 files changed, 250 insertions, 243 deletions

diff --git a/cpp/demo/Freeze/bench/bench.dsp b/cpp/demo/Freeze/bench/bench.dsp
index 2ee6e4589a2..445eb27c7f5 100644
--- a/cpp/demo/Freeze/bench/bench.dsp
+++ b/cpp/demo/Freeze/bench/bench.dsp
@@ -51,8 +51,8 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 Freeze.lib Ice.lib IceUtil.lib /nologo /subsystem:console /incremental:yes /machine:I386 /out:"client.exe" /libpath:"../../../lib" /FIXED:no

-# SUBTRACT LINK32 /debug /nodefaultlib

+# ADD LINK32 Freeze.lib Ice.lib IceUtil.lib /nologo /subsystem:console /incremental:yes /debug /machine:I386 /out:"client.exe" /libpath:"../../../lib" /FIXED:no

+# SUBTRACT LINK32 /pdb:none

 

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

 

diff --git a/cpp/demo/Freeze/library/libraryC.dsp b/cpp/demo/Freeze/library/libraryC.dsp
index 88b68371c9c..9a385d27c7e 100644
--- a/cpp/demo/Freeze/library/libraryC.dsp
+++ b/cpp/demo/Freeze/library/libraryC.dsp
@@ -51,8 +51,8 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 IceXML.lib Freeze.lib Ice.lib IceUtil.lib /nologo /subsystem:console /incremental:yes /machine:I386 /out:"client.exe" /libpath:"../../../lib" /FIXED:no

-# SUBTRACT LINK32 /debug /nodefaultlib

+# ADD LINK32 IceXML.lib Freeze.lib Ice.lib IceUtil.lib /nologo /subsystem:console /incremental:yes /debug /machine:I386 /out:"client.exe" /libpath:"../../../lib" /FIXED:no

+# SUBTRACT LINK32 /nodefaultlib

 

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

 

diff --git a/cpp/demo/Freeze/library/libraryCOL.dsp b/cpp/demo/Freeze/library/libraryCOL.dsp
index 263e4fcacdb..ae7a097a1db 100644
--- a/cpp/demo/Freeze/library/libraryCOL.dsp
+++ b/cpp/demo/Freeze/library/libraryCOL.dsp
@@ -51,8 +51,8 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 IceXML.lib Freeze.lib Ice.lib IceUtil.lib /nologo /subsystem:console /incremental:yes /machine:I386 /out:"collocated.exe" /libpath:"../../../lib" /FIXED:no

-# SUBTRACT LINK32 /debug /nodefaultlib

+# ADD LINK32 IceXML.lib Freeze.lib Ice.lib IceUtil.lib /nologo /subsystem:console /incremental:yes /debug /machine:I386 /out:"collocated.exe" /libpath:"../../../lib" /FIXED:no

+# SUBTRACT LINK32 /nodefaultlib

 

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

 

diff --git a/cpp/demo/Freeze/library/libraryS.dsp b/cpp/demo/Freeze/library/libraryS.dsp
index a271068e89b..8af761b7669 100644
--- a/cpp/demo/Freeze/library/libraryS.dsp
+++ b/cpp/demo/Freeze/library/libraryS.dsp
@@ -51,8 +51,8 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 IceXML.lib Freeze.lib Ice.lib IceUtil.lib /nologo /subsystem:console /incremental:yes /machine:I386 /out:"server.exe" /libpath:"../../../lib" /FIXED:no

-# SUBTRACT LINK32 /debug /nodefaultlib

+# ADD LINK32 IceXML.lib Freeze.lib Ice.lib IceUtil.lib /nologo /subsystem:console /incremental:yes /debug /machine:I386 /out:"server.exe" /libpath:"../../../lib" /FIXED:no

+# SUBTRACT LINK32 /nodefaultlib

 

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

 

diff --git a/cpp/demo/Freeze/phonebook/phonebookC.dsp b/cpp/demo/Freeze/phonebook/phonebookC.dsp
index 817556a2e79..334cde3c2b7 100644
--- a/cpp/demo/Freeze/phonebook/phonebookC.dsp
+++ b/cpp/demo/Freeze/phonebook/phonebookC.dsp
@@ -51,7 +51,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 Freeze.lib Ice.lib IceUtil.lib /nologo /subsystem:console /incremental:yes /machine:I386 /out:"client.exe" /libpath:"../../../lib" /FIXED:no

+# ADD LINK32 Freeze.lib Ice.lib IceUtil.lib /nologo /subsystem:console /incremental:yes /debug /machine:I386 /out:"client.exe" /libpath:"../../../lib" /FIXED:no

 # SUBTRACT LINK32 /pdb:none

 

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

diff --git a/cpp/demo/Freeze/phonebook/phonebookCOL.dsp b/cpp/demo/Freeze/phonebook/phonebookCOL.dsp
index 9fb13cd3372..b7fa5233255 100644
--- a/cpp/demo/Freeze/phonebook/phonebookCOL.dsp
+++ b/cpp/demo/Freeze/phonebook/phonebookCOL.dsp
@@ -51,7 +51,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 Freeze.lib Ice.lib IceUtil.lib /nologo /subsystem:console /incremental:yes /machine:I386 /out:"collocated.exe" /libpath:"../../../lib" /FIXED:no

+# ADD LINK32 Freeze.lib Ice.lib IceUtil.lib /nologo /subsystem:console /incremental:yes /debug /machine:I386 /out:"collocated.exe" /libpath:"../../../lib" /FIXED:no

 # SUBTRACT LINK32 /pdb:none

 

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

diff --git a/cpp/demo/Freeze/phonebook/phonebookS.dsp b/cpp/demo/Freeze/phonebook/phonebookS.dsp
index e3cf0c0517f..36038842903 100644
--- a/cpp/demo/Freeze/phonebook/phonebookS.dsp
+++ b/cpp/demo/Freeze/phonebook/phonebookS.dsp
@@ -51,7 +51,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 Freeze.lib Ice.lib IceUtil.lib /nologo /subsystem:console /incremental:yes /machine:I386 /out:"server.exe" /libpath:"../../../lib" /FIXED:no

+# ADD LINK32 Freeze.lib Ice.lib IceUtil.lib /nologo /subsystem:console /incremental:yes /debug /machine:I386 /out:"server.exe" /libpath:"../../../lib" /FIXED:no

 # SUBTRACT LINK32 /pdb:none

 

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

diff --git a/cpp/demo/Glacier2/callback/glacier2callbackC.dsp b/cpp/demo/Glacier2/callback/glacier2callbackC.dsp
index 0fe95fcc627..97793901288 100644
--- a/cpp/demo/Glacier2/callback/glacier2callbackC.dsp
+++ b/cpp/demo/Glacier2/callback/glacier2callbackC.dsp
@@ -51,8 +51,8 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 Glacier2.lib Ice.lib IceUtil.lib /nologo /subsystem:console /incremental:yes /machine:I386 /out:"client.exe" /libpath:"../../../lib" /FIXED:no

-# SUBTRACT LINK32 /debug /nodefaultlib

+# ADD LINK32 Glacier2.lib Ice.lib IceUtil.lib /nologo /subsystem:console /incremental:yes /debug /machine:I386 /out:"client.exe" /libpath:"../../../lib" /FIXED:no

+# SUBTRACT LINK32 /nodefaultlib

 

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

 

diff --git a/cpp/demo/Glacier2/callback/glacier2callbackS.dsp b/cpp/demo/Glacier2/callback/glacier2callbackS.dsp
index 50d8a94d8db..0d49dbbdf87 100644
--- a/cpp/demo/Glacier2/callback/glacier2callbackS.dsp
+++ b/cpp/demo/Glacier2/callback/glacier2callbackS.dsp
@@ -51,8 +51,8 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 Glacier2.lib Ice.lib IceUtil.lib /nologo /subsystem:console /incremental:yes /machine:I386 /out:"server.exe" /libpath:"../../../lib" /FIXED:no

-# SUBTRACT LINK32 /debug /nodefaultlib

+# ADD LINK32 Glacier2.lib Ice.lib IceUtil.lib /nologo /subsystem:console /incremental:yes /debug /machine:I386 /out:"server.exe" /libpath:"../../../lib" /FIXED:no

+# SUBTRACT LINK32 /nodefaultlib

 

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

 

diff --git a/cpp/demo/Glacier2/callback/glacier2callbackSS.dsp b/cpp/demo/Glacier2/callback/glacier2callbackSS.dsp
index 8f75a494f43..43896e95831 100755
--- a/cpp/demo/Glacier2/callback/glacier2callbackSS.dsp
+++ b/cpp/demo/Glacier2/callback/glacier2callbackSS.dsp
@@ -51,8 +51,8 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 Glacier2.lib Ice.lib IceUtil.lib /nologo /subsystem:console /incremental:yes /machine:I386 /out:"sessionserver.exe" /libpath:"../../../lib" /FIXED:no

-# SUBTRACT LINK32 /debug /nodefaultlib

+# ADD LINK32 Glacier2.lib Ice.lib IceUtil.lib /nologo /subsystem:console /incremental:yes /debug /machine:I386 /out:"sessionserver.exe" /libpath:"../../../lib" /FIXED:no

+# SUBTRACT LINK32 /nodefaultlib

 

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

 

diff --git a/cpp/demo/Glacier2/chat/chatC.dsp b/cpp/demo/Glacier2/chat/chatC.dsp
index 5c35ef72d7d..c223e52e73e 100755
--- a/cpp/demo/Glacier2/chat/chatC.dsp
+++ b/cpp/demo/Glacier2/chat/chatC.dsp
@@ -51,8 +51,8 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 Ice.lib IceUtil.lib Glacier2.lib /nologo /subsystem:console /incremental:yes /machine:I386 /out:"client.exe" /libpath:"../../../lib" /FIXED:no

-# SUBTRACT LINK32 /debug /nodefaultlib

+# ADD LINK32 Ice.lib IceUtil.lib Glacier2.lib /nologo /subsystem:console /incremental:yes /debug /machine:I386 /out:"client.exe" /libpath:"../../../lib" /FIXED:no

+# SUBTRACT LINK32 /pdb:none

 

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

 

diff --git a/cpp/demo/Glacier2/chat/chatS.dsp b/cpp/demo/Glacier2/chat/chatS.dsp
index 8e9182ac588..9b943e34fbe 100755
--- a/cpp/demo/Glacier2/chat/chatS.dsp
+++ b/cpp/demo/Glacier2/chat/chatS.dsp
@@ -51,8 +51,8 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 Ice.lib IceUtil.lib Glacier2.lib /nologo /subsystem:console /incremental:yes /machine:I386 /out:"server.exe" /libpath:"../../../lib" /FIXED:no

-# SUBTRACT LINK32 /debug /nodefaultlib

+# ADD LINK32 Ice.lib IceUtil.lib Glacier2.lib /nologo /subsystem:console /incremental:yes /debug /machine:I386 /out:"server.exe" /libpath:"../../../lib" /FIXED:no

+# SUBTRACT LINK32 /pdb:none

 

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

 

diff --git a/cpp/demo/Ice/MFC/client/mfchelloC.dsp b/cpp/demo/Ice/MFC/client/mfchelloC.dsp
index 65f4e0ab82e..d1248dbdd36 100644
--- a/cpp/demo/Ice/MFC/client/mfchelloC.dsp
+++ b/cpp/demo/Ice/MFC/client/mfchelloC.dsp
@@ -53,7 +53,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 /nologo /subsystem:windows /machine:I386

-# ADD LINK32 Ice.lib IceUtil.lib /nologo /subsystem:windows /incremental:yes /machine:I386 /out:"client.exe" /libpath:"../../../../lib" /FIXED:no

+# ADD LINK32 Ice.lib IceUtil.lib /nologo /subsystem:windows /incremental:yes /debug /machine:I386 /out:"client.exe" /libpath:"../../../../lib" /FIXED:no

 

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

 

diff --git a/cpp/demo/Ice/MFC/server/mfchelloS.dsp b/cpp/demo/Ice/MFC/server/mfchelloS.dsp
index d584b2232c8..6009e143238 100644
--- a/cpp/demo/Ice/MFC/server/mfchelloS.dsp
+++ b/cpp/demo/Ice/MFC/server/mfchelloS.dsp
@@ -53,7 +53,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 /nologo /subsystem:windows /machine:I386

-# ADD LINK32 ice.lib iceutil.lib /nologo /subsystem:windows /incremental:yes /machine:I386 /out:"server.exe" /libpath:"../../../../lib" /FIXED:no

+# ADD LINK32 ice.lib iceutil.lib /nologo /subsystem:windows /incremental:yes /debug /machine:I386 /out:"server.exe" /libpath:"../../../../lib" /FIXED:no

 

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

 

diff --git a/cpp/demo/Ice/bidir/bidirC.dsp b/cpp/demo/Ice/bidir/bidirC.dsp
index 6095064b238..bdee18793a4 100755
--- a/cpp/demo/Ice/bidir/bidirC.dsp
+++ b/cpp/demo/Ice/bidir/bidirC.dsp
@@ -51,8 +51,8 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 Ice.lib IceUtil.lib /nologo /subsystem:console /incremental:yes /machine:I386 /out:"client.exe" /libpath:"../../../lib" /FIXED:no

-# SUBTRACT LINK32 /debug /nodefaultlib

+# ADD LINK32 Ice.lib IceUtil.lib /nologo /subsystem:console /incremental:yes /debug /machine:I386 /out:"client.exe" /libpath:"../../../lib" /FIXED:no

+# SUBTRACT LINK32 /pdb:none

 

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

 

diff --git a/cpp/demo/Ice/bidir/bidirS.dsp b/cpp/demo/Ice/bidir/bidirS.dsp
index e1d25ab94a1..45eeafa385f 100755
--- a/cpp/demo/Ice/bidir/bidirS.dsp
+++ b/cpp/demo/Ice/bidir/bidirS.dsp
@@ -51,8 +51,8 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 Ice.lib IceUtil.lib /nologo /subsystem:console /incremental:yes /machine:I386 /out:"server.exe" /libpath:"../../../lib" /FIXED:no

-# SUBTRACT LINK32 /debug /nodefaultlib

+# ADD LINK32 Ice.lib IceUtil.lib /nologo /subsystem:console /incremental:yes /debug /machine:I386 /out:"server.exe" /libpath:"../../../lib" /FIXED:no

+# SUBTRACT LINK32 /pdb:none

 

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

 

diff --git a/cpp/demo/Ice/callback/callbackC.dsp b/cpp/demo/Ice/callback/callbackC.dsp
index 56ef98fbb8d..49aa48a0ce6 100644
--- a/cpp/demo/Ice/callback/callbackC.dsp
+++ b/cpp/demo/Ice/callback/callbackC.dsp
@@ -51,8 +51,8 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 Ice.lib IceUtil.lib /nologo /subsystem:console /incremental:yes /machine:I386 /out:"client.exe" /libpath:"../../../lib" /FIXED:no

-# SUBTRACT LINK32 /debug /nodefaultlib

+# ADD LINK32 Ice.lib IceUtil.lib /nologo /subsystem:console /incremental:yes /debug /machine:I386 /out:"client.exe" /libpath:"../../../lib" /FIXED:no

+# SUBTRACT LINK32 /pdb:none

 

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

 

diff --git a/cpp/demo/Ice/callback/callbackS.dsp b/cpp/demo/Ice/callback/callbackS.dsp
index 96b66184ca1..e5ff3b5ec28 100644
--- a/cpp/demo/Ice/callback/callbackS.dsp
+++ b/cpp/demo/Ice/callback/callbackS.dsp
@@ -51,8 +51,8 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 Ice.lib IceUtil.lib /nologo /subsystem:console /incremental:yes /machine:I386 /out:"server.exe" /libpath:"../../../lib" /FIXED:no

-# SUBTRACT LINK32 /debug /nodefaultlib

+# ADD LINK32 Ice.lib IceUtil.lib /nologo /subsystem:console /incremental:yes /debug /machine:I386 /out:"server.exe" /libpath:"../../../lib" /FIXED:no

+# SUBTRACT LINK32 /pdb:none

 

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

 

diff --git a/cpp/demo/Ice/hello/helloC.dsp b/cpp/demo/Ice/hello/helloC.dsp
index 0622e541ec4..1e8dc7dd4fd 100644
--- a/cpp/demo/Ice/hello/helloC.dsp
+++ b/cpp/demo/Ice/hello/helloC.dsp
@@ -51,8 +51,8 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 Ice.lib IceUtil.lib /nologo /subsystem:console /incremental:yes /machine:I386 /out:"client.exe" /libpath:"../../../lib" /FIXED:no

-# SUBTRACT LINK32 /debug /nodefaultlib

+# ADD LINK32 Ice.lib IceUtil.lib /nologo /subsystem:console /incremental:yes /debug /machine:I386 /out:"client.exe" /libpath:"../../../lib" /FIXED:no

+# SUBTRACT LINK32 /nodefaultlib

 

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

 

diff --git a/cpp/demo/Ice/hello/helloS.dsp b/cpp/demo/Ice/hello/helloS.dsp
index b9b232921dc..17d337d25d1 100644
--- a/cpp/demo/Ice/hello/helloS.dsp
+++ b/cpp/demo/Ice/hello/helloS.dsp
@@ -51,8 +51,8 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 Ice.lib IceUtil.lib /nologo /subsystem:console /incremental:yes /machine:I386 /out:"server.exe" /libpath:"../../../lib" /FIXED:no

-# SUBTRACT LINK32 /debug /nodefaultlib

+# ADD LINK32 Ice.lib IceUtil.lib /nologo /subsystem:console /incremental:yes /debug /machine:I386 /out:"server.exe" /libpath:"../../../lib" /FIXED:no

+# SUBTRACT LINK32 /nodefaultlib

 

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

 

diff --git a/cpp/demo/Ice/invoke/invokeC.dsp b/cpp/demo/Ice/invoke/invokeC.dsp
index 73eb1b75176..350161317b0 100644
--- a/cpp/demo/Ice/invoke/invokeC.dsp
+++ b/cpp/demo/Ice/invoke/invokeC.dsp
@@ -51,8 +51,8 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 Ice.lib IceUtil.lib /nologo /subsystem:console /incremental:yes /machine:I386 /out:"client.exe" /libpath:"../../../lib" /FIXED:no

-# SUBTRACT LINK32 /debug /nodefaultlib

+# ADD LINK32 Ice.lib IceUtil.lib /nologo /subsystem:console /incremental:yes /debug /machine:I386 /out:"client.exe" /libpath:"../../../lib" /FIXED:no

+# SUBTRACT LINK32 /nodefaultlib

 

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

 

diff --git a/cpp/demo/Ice/invoke/invokeS.dsp b/cpp/demo/Ice/invoke/invokeS.dsp
index 0f01fc1070f..79119e2f634 100644
--- a/cpp/demo/Ice/invoke/invokeS.dsp
+++ b/cpp/demo/Ice/invoke/invokeS.dsp
@@ -51,8 +51,8 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 Ice.lib IceUtil.lib /nologo /subsystem:console /incremental:yes /machine:I386 /out:"server.exe" /libpath:"../../../lib" /FIXED:no

-# SUBTRACT LINK32 /debug /nodefaultlib

+# ADD LINK32 Ice.lib IceUtil.lib /nologo /subsystem:console /incremental:yes /debug /machine:I386 /out:"server.exe" /libpath:"../../../lib" /FIXED:no

+# SUBTRACT LINK32 /nodefaultlib

 

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

 

diff --git a/cpp/demo/Ice/latency/latencyC.dsp b/cpp/demo/Ice/latency/latencyC.dsp
index 34009b69154..835c483441b 100644
--- a/cpp/demo/Ice/latency/latencyC.dsp
+++ b/cpp/demo/Ice/latency/latencyC.dsp
@@ -51,8 +51,8 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 Ice.lib IceUtil.lib /nologo /subsystem:console /incremental:yes /machine:I386 /out:"client.exe" /libpath:"../../../lib" /FIXED:no

-# SUBTRACT LINK32 /debug /nodefaultlib

+# ADD LINK32 Ice.lib IceUtil.lib /nologo /subsystem:console /incremental:yes /debug /machine:I386 /out:"client.exe" /libpath:"../../../lib" /FIXED:no

+# SUBTRACT LINK32 /nodefaultlib

 

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

 

diff --git a/cpp/demo/Ice/latency/latencyS.dsp b/cpp/demo/Ice/latency/latencyS.dsp
index cf207f71916..6f3eed9a6c3 100644
--- a/cpp/demo/Ice/latency/latencyS.dsp
+++ b/cpp/demo/Ice/latency/latencyS.dsp
@@ -51,8 +51,8 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 Ice.lib IceUtil.lib /nologo /subsystem:console /incremental:yes /machine:I386 /out:"server.exe" /libpath:"../../../lib" /FIXED:no

-# SUBTRACT LINK32 /debug /nodefaultlib

+# ADD LINK32 Ice.lib IceUtil.lib /nologo /subsystem:console /incremental:yes /debug /machine:I386 /out:"server.exe" /libpath:"../../../lib" /FIXED:no

+# SUBTRACT LINK32 /nodefaultlib

 

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

 

diff --git a/cpp/demo/Ice/minimal/minimalC.dsp b/cpp/demo/Ice/minimal/minimalC.dsp
index 6b7dbcfe35b..a27c06b4a22 100644
--- a/cpp/demo/Ice/minimal/minimalC.dsp
+++ b/cpp/demo/Ice/minimal/minimalC.dsp
@@ -51,8 +51,8 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 Ice.lib IceUtil.lib /nologo /subsystem:console /incremental:yes /machine:I386 /out:"client.exe" /libpath:"../../../lib" /FIXED:no

-# SUBTRACT LINK32 /debug /nodefaultlib

+# ADD LINK32 Ice.lib IceUtil.lib /nologo /subsystem:console /incremental:yes /debug /machine:I386 /out:"client.exe" /libpath:"../../../lib" /FIXED:no

+# SUBTRACT LINK32 /nodefaultlib

 

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

 

diff --git a/cpp/demo/Ice/minimal/minimalS.dsp b/cpp/demo/Ice/minimal/minimalS.dsp
index 23179643f87..e2c0225fc70 100644
--- a/cpp/demo/Ice/minimal/minimalS.dsp
+++ b/cpp/demo/Ice/minimal/minimalS.dsp
@@ -51,8 +51,8 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 Ice.lib IceUtil.lib /nologo /subsystem:console /incremental:yes /machine:I386 /out:"server.exe" /libpath:"../../../lib" /FIXED:no

-# SUBTRACT LINK32 /debug /nodefaultlib

+# ADD LINK32 Ice.lib IceUtil.lib /nologo /subsystem:console /incremental:yes /debug /machine:I386 /out:"server.exe" /libpath:"../../../lib" /FIXED:no

+# SUBTRACT LINK32 /nodefaultlib

 

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

 

diff --git a/cpp/demo/Ice/nested/nestedC.dsp b/cpp/demo/Ice/nested/nestedC.dsp
index 72ded43ed60..0dc3972ae82 100644
--- a/cpp/demo/Ice/nested/nestedC.dsp
+++ b/cpp/demo/Ice/nested/nestedC.dsp
@@ -51,8 +51,8 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 Ice.lib IceUtil.lib /nologo /subsystem:console /incremental:yes /machine:I386 /out:"client.exe" /libpath:"../../../lib" /FIXED:no

-# SUBTRACT LINK32 /debug /nodefaultlib

+# ADD LINK32 Ice.lib IceUtil.lib /nologo /subsystem:console /incremental:yes /debug /machine:I386 /out:"client.exe" /libpath:"../../../lib" /FIXED:no

+# SUBTRACT LINK32 /nodefaultlib

 

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

 

diff --git a/cpp/demo/Ice/nested/nestedS.dsp b/cpp/demo/Ice/nested/nestedS.dsp
index 4b64e363233..a1c8a20af5b 100644
--- a/cpp/demo/Ice/nested/nestedS.dsp
+++ b/cpp/demo/Ice/nested/nestedS.dsp
@@ -51,8 +51,8 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 Ice.lib IceUtil.lib /nologo /subsystem:console /incremental:yes /machine:I386 /out:"server.exe" /libpath:"../../../lib" /FIXED:no

-# SUBTRACT LINK32 /debug /nodefaultlib

+# ADD LINK32 Ice.lib IceUtil.lib /nologo /subsystem:console /incremental:yes /debug /machine:I386 /out:"server.exe" /libpath:"../../../lib" /FIXED:no

+# SUBTRACT LINK32 /nodefaultlib

 

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

 

diff --git a/cpp/demo/Ice/session/sessionC.dsp b/cpp/demo/Ice/session/sessionC.dsp
index b29f86264f8..52e28e086f1 100755
--- a/cpp/demo/Ice/session/sessionC.dsp
+++ b/cpp/demo/Ice/session/sessionC.dsp
@@ -51,8 +51,8 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 Ice.lib IceUtil.lib /nologo /subsystem:console /incremental:yes /machine:I386 /out:"client.exe" /libpath:"../../../lib" /FIXED:no

-# SUBTRACT LINK32 /debug /nodefaultlib

+# ADD LINK32 Ice.lib IceUtil.lib /nologo /subsystem:console /incremental:yes /debug /machine:I386 /out:"client.exe" /libpath:"../../../lib" /FIXED:no

+# SUBTRACT LINK32 /nodefaultlib

 

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

 

diff --git a/cpp/demo/Ice/session/sessionS.dsp b/cpp/demo/Ice/session/sessionS.dsp
index f73a8a28acd..218415609fc 100644
--- a/cpp/demo/Ice/session/sessionS.dsp
+++ b/cpp/demo/Ice/session/sessionS.dsp
@@ -51,8 +51,8 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 Ice.lib IceUtil.lib /nologo /subsystem:console /incremental:yes /machine:I386 /out:"server.exe" /libpath:"../../../lib" /FIXED:no

-# SUBTRACT LINK32 /debug /nodefaultlib

+# ADD LINK32 Ice.lib IceUtil.lib /nologo /subsystem:console /incremental:yes /debug /machine:I386 /out:"server.exe" /libpath:"../../../lib" /FIXED:no

+# SUBTRACT LINK32 /nodefaultlib

 

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

 

diff --git a/cpp/demo/Ice/throughput/throughputC.dsp b/cpp/demo/Ice/throughput/throughputC.dsp
index 64d3bdaa660..e17dd37bb43 100644
--- a/cpp/demo/Ice/throughput/throughputC.dsp
+++ b/cpp/demo/Ice/throughput/throughputC.dsp
@@ -51,8 +51,8 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 ice.lib iceutil.lib /nologo /subsystem:console /incremental:yes /machine:I386 /out:"client.exe" /libpath:"../../../lib" /FIXED:no

-# SUBTRACT LINK32 /debug /nodefaultlib

+# ADD LINK32 ice.lib iceutil.lib /nologo /subsystem:console /incremental:yes /debug /machine:I386 /out:"client.exe" /libpath:"../../../lib" /FIXED:no

+# SUBTRACT LINK32 /nodefaultlib

 

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

 

diff --git a/cpp/demo/Ice/throughput/throughputS.dsp b/cpp/demo/Ice/throughput/throughputS.dsp
index ad9cbe84872..059a2204a60 100644
--- a/cpp/demo/Ice/throughput/throughputS.dsp
+++ b/cpp/demo/Ice/throughput/throughputS.dsp
@@ -51,8 +51,8 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 ice.lib iceutil.lib /nologo /subsystem:console /incremental:yes /machine:I386 /out:"server.exe" /libpath:"../../../lib" /FIXED:no

-# SUBTRACT LINK32 /debug /nodefaultlib

+# ADD LINK32 ice.lib iceutil.lib /nologo /subsystem:console /incremental:yes /debug /machine:I386 /out:"server.exe" /libpath:"../../../lib" /FIXED:no

+# SUBTRACT LINK32 /nodefaultlib

 

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

 

diff --git a/cpp/demo/Ice/value/valueC.dsp b/cpp/demo/Ice/value/valueC.dsp
index 10b8cad1875..544b183114e 100644
--- a/cpp/demo/Ice/value/valueC.dsp
+++ b/cpp/demo/Ice/value/valueC.dsp
@@ -51,8 +51,8 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 Ice.lib IceUtil.lib /nologo /subsystem:console /incremental:yes /machine:I386 /out:"client.exe" /libpath:"../../../lib" /FIXED:no

-# SUBTRACT LINK32 /debug /nodefaultlib

+# ADD LINK32 Ice.lib IceUtil.lib /nologo /subsystem:console /incremental:yes /debug /machine:I386 /out:"client.exe" /libpath:"../../../lib" /FIXED:no

+# SUBTRACT LINK32 /nodefaultlib

 

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

 

diff --git a/cpp/demo/Ice/value/valueS.dsp b/cpp/demo/Ice/value/valueS.dsp
index bab808314f7..073e3a2eeaa 100644
--- a/cpp/demo/Ice/value/valueS.dsp
+++ b/cpp/demo/Ice/value/valueS.dsp
@@ -51,8 +51,8 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 Ice.lib IceUtil.lib /nologo /subsystem:console /incremental:yes /machine:I386 /out:"server.exe" /libpath:"../../../lib" /FIXED:no

-# SUBTRACT LINK32 /debug /nodefaultlib

+# ADD LINK32 Ice.lib IceUtil.lib /nologo /subsystem:console /incremental:yes /debug /machine:I386 /out:"server.exe" /libpath:"../../../lib" /FIXED:no

+# SUBTRACT LINK32 /nodefaultlib

 

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

 

diff --git a/cpp/demo/IceBox/hello/helloiceboxC.dsp b/cpp/demo/IceBox/hello/helloiceboxC.dsp
index a4ae02b332f..88eb9a10bad 100644
--- a/cpp/demo/IceBox/hello/helloiceboxC.dsp
+++ b/cpp/demo/IceBox/hello/helloiceboxC.dsp
@@ -51,8 +51,8 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 Ice.lib IceUtil.lib /nologo /subsystem:console /incremental:yes /machine:I386 /out:"client.exe" /libpath:"../../../lib" /FIXED:no

-# SUBTRACT LINK32 /debug /nodefaultlib

+# ADD LINK32 Ice.lib IceUtil.lib /nologo /subsystem:console /incremental:yes /debug /machine:I386 /out:"client.exe" /libpath:"../../../lib" /FIXED:no

+# SUBTRACT LINK32 /nodefaultlib

 

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

 

diff --git a/cpp/demo/IceBox/hello/helloiceboxS.dsp b/cpp/demo/IceBox/hello/helloiceboxS.dsp
index 1e7d4952697..a09ff21f499 100644
--- a/cpp/demo/IceBox/hello/helloiceboxS.dsp
+++ b/cpp/demo/IceBox/hello/helloiceboxS.dsp
@@ -54,8 +54,8 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386

-# ADD LINK32 IceBox.lib Ice.lib IceUtil.lib /nologo /dll /incremental:yes /machine:I386 /out:"Release/helloservice.dll" /libpath:"../../../lib" /FIXED:no

-# SUBTRACT LINK32 /pdb:none /debug /nodefaultlib

+# ADD LINK32 IceBox.lib Ice.lib IceUtil.lib /nologo /dll /incremental:yes /debug /machine:I386 /out:"Release/helloservice.dll" /libpath:"../../../lib" /FIXED:no

+# SUBTRACT LINK32 /pdb:none /nodefaultlib

 # Begin Special Build Tool

 OutDir=.\Release

 SOURCE="$(InputPath)"

diff --git a/cpp/demo/IceGrid/simple/simpleC.dsp b/cpp/demo/IceGrid/simple/simpleC.dsp
index 1a3d742de82..865fc1371f8 100755
--- a/cpp/demo/IceGrid/simple/simpleC.dsp
+++ b/cpp/demo/IceGrid/simple/simpleC.dsp
@@ -51,8 +51,8 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 Ice.lib IceUtil.lib IceGrid.lib /nologo /subsystem:console /incremental:yes /machine:I386 /out:"client.exe" /libpath:"../../../lib" /FIXED:no

-# SUBTRACT LINK32 /debug /nodefaultlib

+# ADD LINK32 Ice.lib IceUtil.lib IceGrid.lib /nologo /subsystem:console /incremental:yes /debug /machine:I386 /out:"client.exe" /libpath:"../../../lib" /FIXED:no

+# SUBTRACT LINK32 /nodefaultlib

 

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

 

diff --git a/cpp/demo/IceGrid/simple/simpleS.dsp b/cpp/demo/IceGrid/simple/simpleS.dsp
index 418b9889d14..d7c2b5ee0a0 100755
--- a/cpp/demo/IceGrid/simple/simpleS.dsp
+++ b/cpp/demo/IceGrid/simple/simpleS.dsp
@@ -51,8 +51,8 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 Ice.lib IceUtil.lib /nologo /subsystem:console /incremental:yes /machine:I386 /out:"server.exe" /libpath:"../../../lib" /FIXED:no

-# SUBTRACT LINK32 /debug /nodefaultlib

+# ADD LINK32 Ice.lib IceUtil.lib /nologo /subsystem:console /incremental:yes /debug /machine:I386 /out:"server.exe" /libpath:"../../../lib" /FIXED:no

+# SUBTRACT LINK32 /nodefaultlib

 

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

 

diff --git a/cpp/demo/IcePatch2/MFC/mfcpatchC.dsp b/cpp/demo/IcePatch2/MFC/mfcpatchC.dsp
index 6cafce2c9cd..bcb94aa27e9 100755
--- a/cpp/demo/IcePatch2/MFC/mfcpatchC.dsp
+++ b/cpp/demo/IcePatch2/MFC/mfcpatchC.dsp
@@ -53,7 +53,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 /nologo /subsystem:windows /machine:I386

-# ADD LINK32 Ice.lib IceUtil.lib IcePatch2.lib /nologo /subsystem:windows /incremental:yes /machine:I386 /out:"patch.exe" /libpath:"../../../lib" /FIXED:no

+# ADD LINK32 Ice.lib IceUtil.lib IcePatch2.lib /nologo /subsystem:windows /incremental:yes /debug /machine:I386 /out:"patch.exe" /libpath:"../../../lib" /FIXED:no

 

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

 

diff --git a/cpp/demo/IceStorm/clock/clockC.dsp b/cpp/demo/IceStorm/clock/clockC.dsp
index aeea2b6f541..0d5558454e5 100644
--- a/cpp/demo/IceStorm/clock/clockC.dsp
+++ b/cpp/demo/IceStorm/clock/clockC.dsp
@@ -51,8 +51,8 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 IceStorm.lib Ice.lib IceUtil.lib /nologo /subsystem:console /incremental:yes /machine:I386 /out:"publisher.exe" /libpath:"../../../lib" /FIXED:no

-# SUBTRACT LINK32 /debug /nodefaultlib

+# ADD LINK32 IceStorm.lib Ice.lib IceUtil.lib /nologo /subsystem:console /incremental:yes /debug /machine:I386 /out:"publisher.exe" /libpath:"../../../lib" /FIXED:no

+# SUBTRACT LINK32 /pdb:none

 

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

 

diff --git a/cpp/demo/IceStorm/clock/clockS.dsp b/cpp/demo/IceStorm/clock/clockS.dsp
index 848d354e772..aae04fa8b95 100644
--- a/cpp/demo/IceStorm/clock/clockS.dsp
+++ b/cpp/demo/IceStorm/clock/clockS.dsp
@@ -51,8 +51,8 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 IceStorm.lib Ice.lib IceUtil.lib /nologo /subsystem:console /incremental:yes /machine:I386 /out:"subscriber.exe" /libpath:"../../../lib" /FIXED:no

-# SUBTRACT LINK32 /debug /nodefaultlib

+# ADD LINK32 IceStorm.lib Ice.lib IceUtil.lib /nologo /subsystem:console /incremental:yes /debug /machine:I386 /out:"subscriber.exe" /libpath:"../../../lib" /FIXED:no

+# SUBTRACT LINK32 /pdb:none

 

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

 

diff --git a/cpp/demo/IceUtil/workqueue/workqueue.dsp b/cpp/demo/IceUtil/workqueue/workqueue.dsp
index 6181c122b11..65cbe925a65 100644
--- a/cpp/demo/IceUtil/workqueue/workqueue.dsp
+++ b/cpp/demo/IceUtil/workqueue/workqueue.dsp
@@ -51,7 +51,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 IceUtil.lib /nologo /subsystem:console /incremental:yes /machine:I386 /out:"workqueue.exe" /libpath:"../../../lib" /FIXED:no

+# ADD LINK32 IceUtil.lib /nologo /subsystem:console /incremental:yes /debug /machine:I386 /out:"workqueue.exe" /libpath:"../../../lib" /FIXED:no

 

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

 

diff --git a/cpp/demo/book/printer/printerC.dsp b/cpp/demo/book/printer/printerC.dsp
index c91fa7e37b1..e8cb1a5765f 100755
--- a/cpp/demo/book/printer/printerC.dsp
+++ b/cpp/demo/book/printer/printerC.dsp
@@ -51,7 +51,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 Ice.lib IceUtil.lib /nologo /subsystem:console /incremental:yes /machine:I386 /out:"Release/client.exe" /libpath:"../../../lib" /FIXED:no

+# ADD LINK32 Ice.lib IceUtil.lib /nologo /subsystem:console /incremental:yes /debug /machine:I386 /out:"Release/client.exe" /libpath:"../../../lib" /FIXED:no

 

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

 

diff --git a/cpp/demo/book/printer/printerS.dsp b/cpp/demo/book/printer/printerS.dsp
index 18357900d5a..95e252e3ad5 100755
--- a/cpp/demo/book/printer/printerS.dsp
+++ b/cpp/demo/book/printer/printerS.dsp
@@ -50,7 +50,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 Ice.lib IceUtil.lib /nologo /subsystem:console /incremental:yes /machine:I386 /out:"Release/server.exe" /libpath:"../../../lib" /FIXED:no

+# ADD LINK32 Ice.lib IceUtil.lib /nologo /subsystem:console /incremental:yes /debug /machine:I386 /out:"Release/server.exe" /libpath:"../../../lib" /FIXED:no

 

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

 

diff --git a/cpp/demo/book/simple_filesystem/simplefsC.dsp b/cpp/demo/book/simple_filesystem/simplefsC.dsp
index c19c4b176c6..d820bf53c79 100755
--- a/cpp/demo/book/simple_filesystem/simplefsC.dsp
+++ b/cpp/demo/book/simple_filesystem/simplefsC.dsp
@@ -50,7 +50,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 Ice.lib IceUtil.lib /nologo /subsystem:console /incremental:yes /machine:I386 /out:"client.exe" /libpath:"../../../lib" /FIXED:no

+# ADD LINK32 Ice.lib IceUtil.lib /nologo /subsystem:console /incremental:yes /debug /machine:I386 /out:"client.exe" /libpath:"../../../lib" /FIXED:no

 

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

 

diff --git a/cpp/demo/book/simple_filesystem/simplefsS.dsp b/cpp/demo/book/simple_filesystem/simplefsS.dsp
index 05fd50d4dd2..69b8702109a 100755
--- a/cpp/demo/book/simple_filesystem/simplefsS.dsp
+++ b/cpp/demo/book/simple_filesystem/simplefsS.dsp
@@ -50,7 +50,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 Ice.lib IceUtil.lib /nologo /subsystem:console /incremental:yes /machine:I386 /out:"server.exe" /libpath:"../../../lib" /FIXED:no

+# ADD LINK32 Ice.lib IceUtil.lib /nologo /subsystem:console /incremental:yes /debug /machine:I386 /out:"server.exe" /libpath:"../../../lib" /FIXED:no

 

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

 

diff --git a/cpp/src/FreezeScript/dumpdb.dsp b/cpp/src/FreezeScript/dumpdb.dsp
index 9edd690e4f7..a84a6f787f3 100644
--- a/cpp/src/FreezeScript/dumpdb.dsp
+++ b/cpp/src/FreezeScript/dumpdb.dsp
@@ -51,8 +51,8 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 libdb43.lib setargv.obj /nologo /subsystem:console /incremental:yes /machine:I386 /FIXED:no

-# SUBTRACT LINK32 /debug /nodefaultlib

+# ADD LINK32 libdb43.lib setargv.obj /nologo /subsystem:console /incremental:yes /debug /machine:I386 /FIXED:no

+# SUBTRACT LINK32 /pdb:none

 # Begin Special Build Tool

 OutDir=.\Release

 TargetName=dumpdb

diff --git a/cpp/src/FreezeScript/transformdb.dsp b/cpp/src/FreezeScript/transformdb.dsp
index edd6f24ac4d..bf5eccea9b5 100644
--- a/cpp/src/FreezeScript/transformdb.dsp
+++ b/cpp/src/FreezeScript/transformdb.dsp
@@ -51,8 +51,8 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 libdb43.lib setargv.obj /nologo /subsystem:console /incremental:yes /machine:I386 /FIXED:no

-# SUBTRACT LINK32 /debug /nodefaultlib

+# ADD LINK32 libdb43.lib setargv.obj /nologo /subsystem:console /incremental:yes /debug /machine:I386 /FIXED:no

+# SUBTRACT LINK32 /nodefaultlib

 # Begin Special Build Tool

 OutDir=.\Release

 TargetName=transformdb

diff --git a/cpp/src/Glacier2/glacier2router.dsp b/cpp/src/Glacier2/glacier2router.dsp
index 78f03812b17..60a524dd206 100755
--- a/cpp/src/Glacier2/glacier2router.dsp
+++ b/cpp/src/Glacier2/glacier2router.dsp
@@ -51,7 +51,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 libeay32.lib /nologo /subsystem:console /incremental:yes /machine:I386 /FIXED:no

+# ADD LINK32 libeay32.lib /nologo /subsystem:console /incremental:yes /debug /machine:I386 /FIXED:no

 # SUBTRACT LINK32 /nodefaultlib

 # Begin Special Build Tool

 OutDir=.\Release

diff --git a/cpp/src/IceBox/iceboxC.dsp b/cpp/src/IceBox/iceboxC.dsp
index 9ae0cfea1bd..025cd0960fb 100644
--- a/cpp/src/IceBox/iceboxC.dsp
+++ b/cpp/src/IceBox/iceboxC.dsp
@@ -51,8 +51,8 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 setargv.obj /nologo /subsystem:console /incremental:yes /machine:I386 /out:"Release/iceboxadmin.exe" /FIXED:no

-# SUBTRACT LINK32 /debug /nodefaultlib

+# ADD LINK32 setargv.obj /nologo /subsystem:console /incremental:yes /debug /machine:I386 /out:"Release/iceboxadmin.exe" /FIXED:no

+# SUBTRACT LINK32 /nodefaultlib

 # Begin Special Build Tool

 OutDir=.\Release

 TargetName=iceboxadmin

diff --git a/cpp/src/IceBox/iceboxS.dsp b/cpp/src/IceBox/iceboxS.dsp
index 8fdc4c833e5..ac84e33167c 100644
--- a/cpp/src/IceBox/iceboxS.dsp
+++ b/cpp/src/IceBox/iceboxS.dsp
@@ -51,8 +51,8 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 setargv.obj /nologo /subsystem:console /incremental:yes /machine:I386 /out:"Release/icebox.exe" /FIXED:no

-# SUBTRACT LINK32 /debug /nodefaultlib

+# ADD LINK32 setargv.obj /nologo /subsystem:console /incremental:yes /debug /machine:I386 /out:"Release/icebox.exe" /FIXED:no

+# SUBTRACT LINK32 /nodefaultlib

 # Begin Special Build Tool

 OutDir=.\Release

 TargetName=icebox

diff --git a/cpp/src/IceGrid/icegridadmin.dsp b/cpp/src/IceGrid/icegridadmin.dsp
index 6983a942c6a..7172a6a4ef3 100755
--- a/cpp/src/IceGrid/icegridadmin.dsp
+++ b/cpp/src/IceGrid/icegridadmin.dsp
@@ -51,8 +51,8 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 setargv.obj /nologo /subsystem:console /incremental:yes /machine:I386 /libpath:"../../../lib" /FIXED:no

-# SUBTRACT LINK32 /debug /nodefaultlib

+# ADD LINK32 setargv.obj /nologo /subsystem:console /incremental:yes /debug /machine:I386 /libpath:"../../../lib" /FIXED:no

+# SUBTRACT LINK32 /nodefaultlib

 # Begin Special Build Tool

 OutDir=.\Release

 TargetName=icegridadmin

diff --git a/cpp/src/IceGrid/icegridnode.dsp b/cpp/src/IceGrid/icegridnode.dsp
index a8d2afd747b..441403a09cd 100755
--- a/cpp/src/IceGrid/icegridnode.dsp
+++ b/cpp/src/IceGrid/icegridnode.dsp
@@ -51,8 +51,8 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 advapi32.lib pdh.lib setargv.obj /nologo /subsystem:console /incremental:yes /machine:I386 /libpath:"../../../lib" /FIXED:no

-# SUBTRACT LINK32 /debug /nodefaultlib

+# ADD LINK32 advapi32.lib pdh.lib setargv.obj /nologo /subsystem:console /incremental:yes /debug /machine:I386 /libpath:"../../../lib" /FIXED:no

+# SUBTRACT LINK32 /nodefaultlib

 # Begin Special Build Tool

 OutDir=.\Release

 TargetName=icegridnode

diff --git a/cpp/src/IceGrid/icegridregistry.dsp b/cpp/src/IceGrid/icegridregistry.dsp
index 075abab81cb..d540f7367c7 100755
--- a/cpp/src/IceGrid/icegridregistry.dsp
+++ b/cpp/src/IceGrid/icegridregistry.dsp
@@ -51,8 +51,8 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 setargv.obj /nologo /subsystem:console /incremental:yes /machine:I386 /libpath:"../../../lib" /FIXED:no

-# SUBTRACT LINK32 /debug /nodefaultlib

+# ADD LINK32 setargv.obj /nologo /subsystem:console /incremental:yes /debug /machine:I386 /libpath:"../../../lib" /FIXED:no

+# SUBTRACT LINK32 /nodefaultlib

 # Begin Special Build Tool

 OutDir=.\Release

 TargetName=icegridregistry

diff --git a/cpp/src/IcePatch2/icepatch2C.dsp b/cpp/src/IcePatch2/icepatch2C.dsp
index 047accc7e27..d1d8f4fb3f6 100644
--- a/cpp/src/IcePatch2/icepatch2C.dsp
+++ b/cpp/src/IcePatch2/icepatch2C.dsp
@@ -51,8 +51,8 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 setargv.obj /nologo /subsystem:console /incremental:yes /machine:I386 /out:"Release/icepatch2client.exe" /FIXED:no

-# SUBTRACT LINK32 /debug /nodefaultlib

+# ADD LINK32 setargv.obj /nologo /subsystem:console /incremental:yes /debug /machine:I386 /out:"Release/icepatch2client.exe" /FIXED:no

+# SUBTRACT LINK32 /nodefaultlib

 # Begin Special Build Tool

 OutDir=.\Release

 TargetName=icepatch2client

diff --git a/cpp/src/IcePatch2/icepatch2S.dsp b/cpp/src/IcePatch2/icepatch2S.dsp
index 9b5b4550780..edb64ce69d5 100755
--- a/cpp/src/IcePatch2/icepatch2S.dsp
+++ b/cpp/src/IcePatch2/icepatch2S.dsp
@@ -51,8 +51,8 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 setargv.obj /nologo /subsystem:console /incremental:yes /machine:I386 /out:"Release/icepatch2server.exe" /FIXED:no

-# SUBTRACT LINK32 /debug /nodefaultlib

+# ADD LINK32 setargv.obj /nologo /subsystem:console /incremental:yes /debug /machine:I386 /out:"Release/icepatch2server.exe" /FIXED:no

+# SUBTRACT LINK32 /nodefaultlib

 # Begin Special Build Tool

 OutDir=.\Release

 TargetName=icepatch2server

diff --git a/cpp/src/IcePatch2/icepatch2calc.dsp b/cpp/src/IcePatch2/icepatch2calc.dsp
index e73bf86ec84..927792826f3 100644
--- a/cpp/src/IcePatch2/icepatch2calc.dsp
+++ b/cpp/src/IcePatch2/icepatch2calc.dsp
@@ -51,8 +51,8 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 setargv.obj /nologo /subsystem:console /incremental:yes /machine:I386 /FIXED:no

-# SUBTRACT LINK32 /debug /nodefaultlib

+# ADD LINK32 setargv.obj /nologo /subsystem:console /incremental:yes /debug /machine:I386 /FIXED:no

+# SUBTRACT LINK32 /nodefaultlib

 # Begin Special Build Tool

 OutDir=.\Release

 TargetName=icepatch2calc

diff --git a/cpp/src/IceStorm/icestormC.dsp b/cpp/src/IceStorm/icestormC.dsp
index 08996bdd249..607c8628b03 100644
--- a/cpp/src/IceStorm/icestormC.dsp
+++ b/cpp/src/IceStorm/icestormC.dsp
@@ -51,8 +51,8 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 setargv.obj /nologo /subsystem:console /incremental:yes /machine:I386 /out:"Release/icestormadmin.exe" /FIXED:no

-# SUBTRACT LINK32 /debug /nodefaultlib

+# ADD LINK32 setargv.obj /nologo /subsystem:console /incremental:yes /debug /machine:I386 /out:"Release/icestormadmin.exe" /FIXED:no

+# SUBTRACT LINK32 /nodefaultlib

 # Begin Special Build Tool

 OutDir=.\Release

 TargetName=icestormadmin

diff --git a/cpp/src/icecpp/icecpp.dsp b/cpp/src/icecpp/icecpp.dsp
index aa019d3427b..1ef8c0caa98 100644
--- a/cpp/src/icecpp/icecpp.dsp
+++ b/cpp/src/icecpp/icecpp.dsp
@@ -51,8 +51,8 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 setargv.obj advapi32.lib /nologo /subsystem:console /incremental:yes /machine:I386 /FIXED:no

-# SUBTRACT LINK32 /debug /nodefaultlib

+# ADD LINK32 setargv.obj advapi32.lib /nologo /subsystem:console /incremental:yes /debug /machine:I386 /FIXED:no

+# SUBTRACT LINK32 /nodefaultlib

 # Begin Special Build Tool

 OutDir=.\Release

 TargetName=icecpp

diff --git a/cpp/src/slice2cpp/slice2cpp.dsp b/cpp/src/slice2cpp/slice2cpp.dsp
index 076fa7f337a..e00cb1ce73f 100644
--- a/cpp/src/slice2cpp/slice2cpp.dsp
+++ b/cpp/src/slice2cpp/slice2cpp.dsp
@@ -51,7 +51,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 setargv.obj /nologo /subsystem:console /incremental:yes /machine:I386 /FIXED:no /FIXED:no

+# ADD LINK32 setargv.obj /nologo /subsystem:console /incremental:yes /debug /machine:I386 /FIXED:no /FIXED:no

 # SUBTRACT LINK32 /pdb:none

 # Begin Special Build Tool

 OutDir=.\Release

diff --git a/cpp/src/slice2cs/slice2cs.dsp b/cpp/src/slice2cs/slice2cs.dsp
index dd753455d78..6c515a0e84f 100644
--- a/cpp/src/slice2cs/slice2cs.dsp
+++ b/cpp/src/slice2cs/slice2cs.dsp
@@ -51,7 +51,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 setargv.obj /nologo /subsystem:console /incremental:yes /machine:I386 /FIXED:no

+# ADD LINK32 setargv.obj /nologo /subsystem:console /incremental:yes /debug /machine:I386 /FIXED:no

 # SUBTRACT LINK32 /nodefaultlib

 # Begin Special Build Tool

 OutDir=.\Release

diff --git a/cpp/src/slice2docbook/slice2docbook.dsp b/cpp/src/slice2docbook/slice2docbook.dsp
index e949e471a57..7f707e658b3 100644
--- a/cpp/src/slice2docbook/slice2docbook.dsp
+++ b/cpp/src/slice2docbook/slice2docbook.dsp
@@ -51,8 +51,8 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 setargv.obj /nologo /subsystem:console /incremental:yes /machine:I386 /FIXED:no

-# SUBTRACT LINK32 /debug /nodefaultlib

+# ADD LINK32 setargv.obj /nologo /subsystem:console /incremental:yes /debug /machine:I386 /FIXED:no

+# SUBTRACT LINK32 /nodefaultlib

 # Begin Special Build Tool

 OutDir=.\Release

 TargetName=slice2docbook

diff --git a/cpp/src/slice2freeze/slice2freeze.dsp b/cpp/src/slice2freeze/slice2freeze.dsp
index ac2aacc3868..e3d2d7a1a15 100644
--- a/cpp/src/slice2freeze/slice2freeze.dsp
+++ b/cpp/src/slice2freeze/slice2freeze.dsp
@@ -51,8 +51,8 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 setargv.obj /nologo /subsystem:console /incremental:yes /machine:I386 /FIXED:no

-# SUBTRACT LINK32 /debug /nodefaultlib

+# ADD LINK32 setargv.obj /nologo /subsystem:console /incremental:yes /debug /machine:I386 /FIXED:no

+# SUBTRACT LINK32 /nodefaultlib

 # Begin Special Build Tool

 OutDir=.\Release

 TargetName=slice2freeze

diff --git a/cpp/src/slice2freezej/slice2freezej.dsp b/cpp/src/slice2freezej/slice2freezej.dsp
index b1323faefb6..86fe439b934 100644
--- a/cpp/src/slice2freezej/slice2freezej.dsp
+++ b/cpp/src/slice2freezej/slice2freezej.dsp
@@ -51,8 +51,8 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 setargv.obj /nologo /subsystem:console /incremental:yes /machine:I386 /FIXED:no

-# SUBTRACT LINK32 /debug /nodefaultlib

+# ADD LINK32 setargv.obj /nologo /subsystem:console /incremental:yes /debug /machine:I386 /FIXED:no

+# SUBTRACT LINK32 /nodefaultlib

 # Begin Special Build Tool

 OutDir=.\Release

 TargetName=slice2freezej

diff --git a/cpp/src/slice2java/slice2java.dsp b/cpp/src/slice2java/slice2java.dsp
index 6ddeefd32fb..654aa418095 100644
--- a/cpp/src/slice2java/slice2java.dsp
+++ b/cpp/src/slice2java/slice2java.dsp
@@ -51,7 +51,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 setargv.obj /nologo /subsystem:console /incremental:yes /machine:I386 /FIXED:no

+# ADD LINK32 setargv.obj /nologo /subsystem:console /incremental:yes /debug /machine:I386 /FIXED:no

 # SUBTRACT LINK32 /nodefaultlib

 # Begin Special Build Tool

 OutDir=.\Release

diff --git a/cpp/src/slice2py/slice2py.dsp b/cpp/src/slice2py/slice2py.dsp
index 4c498e30650..1de3ebd5284 100755
--- a/cpp/src/slice2py/slice2py.dsp
+++ b/cpp/src/slice2py/slice2py.dsp
@@ -51,8 +51,8 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 setargv.obj /nologo /subsystem:console /incremental:yes /machine:I386 /FIXED:no

-# SUBTRACT LINK32 /debug /nodefaultlib

+# ADD LINK32 setargv.obj /nologo /subsystem:console /incremental:yes /debug /machine:I386 /FIXED:no

+# SUBTRACT LINK32 /nodefaultlib

 # Begin Special Build Tool

 OutDir=.\Release

 TargetName=slice2py

diff --git a/cpp/src/slice2vb/slice2vb.dsp b/cpp/src/slice2vb/slice2vb.dsp
index 45199d54a01..85c40ac71a0 100755
--- a/cpp/src/slice2vb/slice2vb.dsp
+++ b/cpp/src/slice2vb/slice2vb.dsp
@@ -51,7 +51,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 setargv.obj /nologo /subsystem:console /incremental:yes /machine:I386 /FIXED:no

+# ADD LINK32 setargv.obj /nologo /subsystem:console /incremental:yes /debug /machine:I386 /FIXED:no

 # Begin Special Build Tool

 OutDir=.\Release

 TargetName=slice2vb

diff --git a/cpp/test/Freeze/complex/complex.dsp b/cpp/test/Freeze/complex/complex.dsp
index 21bde29fe16..48d9b4b2a05 100644
--- a/cpp/test/Freeze/complex/complex.dsp
+++ b/cpp/test/Freeze/complex/complex.dsp
@@ -51,8 +51,8 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 /nologo /subsystem:console /incremental:yes /machine:I386 /out:"client.exe" /libpath:"../../../lib" /FIXED:no

-# SUBTRACT LINK32 /debug /nodefaultlib

+# ADD LINK32 /nologo /subsystem:console /incremental:yes /debug /machine:I386 /out:"client.exe" /libpath:"../../../lib" /FIXED:no

+# SUBTRACT LINK32 /pdb:none

 

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

 

diff --git a/cpp/test/Freeze/dbmap/dbmap.dsp b/cpp/test/Freeze/dbmap/dbmap.dsp
index d822f898d33..5e8bfa064fe 100644
--- a/cpp/test/Freeze/dbmap/dbmap.dsp
+++ b/cpp/test/Freeze/dbmap/dbmap.dsp
@@ -51,8 +51,8 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 /nologo /subsystem:console /incremental:yes /machine:I386 /out:"client.exe" /libpath:"../../../lib" /FIXED:no

-# SUBTRACT LINK32 /debug /nodefaultlib

+# ADD LINK32 /nologo /subsystem:console /incremental:yes /debug /machine:I386 /out:"client.exe" /libpath:"../../../lib" /FIXED:no

+# SUBTRACT LINK32 /pdb:none

 

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

 

diff --git a/cpp/test/Freeze/evictor/evictorC.dsp b/cpp/test/Freeze/evictor/evictorC.dsp
index 7b9661e5747..1c4c653e8ef 100644
--- a/cpp/test/Freeze/evictor/evictorC.dsp
+++ b/cpp/test/Freeze/evictor/evictorC.dsp
@@ -51,8 +51,8 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 /nologo /subsystem:console /incremental:yes /machine:I386 /out:"client.exe" /libpath:"../../../lib" /FIXED:no

-# SUBTRACT LINK32 /debug /nodefaultlib

+# ADD LINK32 /nologo /subsystem:console /incremental:yes /debug /machine:I386 /out:"client.exe" /libpath:"../../../lib" /FIXED:no

+# SUBTRACT LINK32 /nodefaultlib

 

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

 

diff --git a/cpp/test/Freeze/evictor/evictorS.dsp b/cpp/test/Freeze/evictor/evictorS.dsp
index 75f3ac8a2b8..2409b3a2826 100644
--- a/cpp/test/Freeze/evictor/evictorS.dsp
+++ b/cpp/test/Freeze/evictor/evictorS.dsp
@@ -51,8 +51,8 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 /nologo /subsystem:console /incremental:yes /machine:I386 /out:"server.exe" /libpath:"../../../lib" /FIXED:no

-# SUBTRACT LINK32 /debug /nodefaultlib

+# ADD LINK32 /nologo /subsystem:console /incremental:yes /debug /machine:I386 /out:"server.exe" /libpath:"../../../lib" /FIXED:no

+# SUBTRACT LINK32 /nodefaultlib

 

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

 

diff --git a/cpp/test/FreezeScript/dbmap/freezescriptdbmap.dsp b/cpp/test/FreezeScript/dbmap/freezescriptdbmap.dsp
index bd2b243bdfb..931498bd702 100644
--- a/cpp/test/FreezeScript/dbmap/freezescriptdbmap.dsp
+++ b/cpp/test/FreezeScript/dbmap/freezescriptdbmap.dsp
@@ -51,8 +51,8 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 /nologo /subsystem:console /incremental:yes /machine:I386 /out:"makedb.exe" /libpath:"../../../lib" /FIXED:no

-# SUBTRACT LINK32 /debug /nodefaultlib

+# ADD LINK32 /nologo /subsystem:console /incremental:yes /debug /machine:I386 /out:"makedb.exe" /libpath:"../../../lib" /FIXED:no

+# SUBTRACT LINK32 /nodefaultlib

 

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

 

diff --git a/cpp/test/FreezeScript/evictor/freezescriptevictor.dsp b/cpp/test/FreezeScript/evictor/freezescriptevictor.dsp
index bc1482fa5ca..c70ebf6ad65 100644
--- a/cpp/test/FreezeScript/evictor/freezescriptevictor.dsp
+++ b/cpp/test/FreezeScript/evictor/freezescriptevictor.dsp
@@ -51,8 +51,8 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 /nologo /subsystem:console /incremental:yes /machine:I386 /out:"makedb.exe" /libpath:"../../../lib" /FIXED:no

-# SUBTRACT LINK32 /debug /nodefaultlib

+# ADD LINK32 /nologo /subsystem:console /incremental:yes /debug /machine:I386 /out:"makedb.exe" /libpath:"../../../lib" /FIXED:no

+# SUBTRACT LINK32 /nodefaultlib

 

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

 

diff --git a/cpp/test/Glacier2/router/routerC.dsp b/cpp/test/Glacier2/router/routerC.dsp
index f2a28c05c0c..bfa96dc7c74 100644
--- a/cpp/test/Glacier2/router/routerC.dsp
+++ b/cpp/test/Glacier2/router/routerC.dsp
@@ -51,8 +51,8 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 /nologo /subsystem:console /incremental:yes /machine:I386 /out:"client.exe" /FIXED:no

-# SUBTRACT LINK32 /debug /nodefaultlib

+# ADD LINK32 /nologo /subsystem:console /incremental:yes /debug /machine:I386 /out:"client.exe" /FIXED:no

+# SUBTRACT LINK32 /nodefaultlib

 

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

 

diff --git a/cpp/test/Glacier2/router/routerS.dsp b/cpp/test/Glacier2/router/routerS.dsp
index 9940c5263d7..f51fddccf62 100644
--- a/cpp/test/Glacier2/router/routerS.dsp
+++ b/cpp/test/Glacier2/router/routerS.dsp
@@ -51,8 +51,8 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 /nologo /subsystem:console /incremental:yes /machine:I386 /out:"server.exe" /FIXED:no

-# SUBTRACT LINK32 /debug /nodefaultlib

+# ADD LINK32 /nologo /subsystem:console /incremental:yes /debug /machine:I386 /out:"server.exe" /FIXED:no

+# SUBTRACT LINK32 /nodefaultlib

 

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

 

diff --git a/cpp/test/Ice/adapterDeactivation/adapterdeactivationC.dsp b/cpp/test/Ice/adapterDeactivation/adapterdeactivationC.dsp
index 713515549d5..bf14c41068e 100644
--- a/cpp/test/Ice/adapterDeactivation/adapterdeactivationC.dsp
+++ b/cpp/test/Ice/adapterDeactivation/adapterdeactivationC.dsp
@@ -51,8 +51,8 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 /nologo /subsystem:console /incremental:yes /machine:I386 /out:"client.exe" /libpath:"../../../lib"

-# SUBTRACT LINK32 /debug /nodefaultlib

+# ADD LINK32 /nologo /subsystem:console /incremental:yes /debug /machine:I386 /out:"client.exe" /libpath:"../../../lib"

+# SUBTRACT LINK32 /pdb:none

 

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

 

diff --git a/cpp/test/Ice/adapterDeactivation/adapterdeactivationCOL.dsp b/cpp/test/Ice/adapterDeactivation/adapterdeactivationCOL.dsp
index cbd55007ff7..77cd8332b63 100644
--- a/cpp/test/Ice/adapterDeactivation/adapterdeactivationCOL.dsp
+++ b/cpp/test/Ice/adapterDeactivation/adapterdeactivationCOL.dsp
@@ -51,8 +51,8 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 /nologo /subsystem:console /incremental:yes /machine:I386 /out:"collocated.exe" /libpath:"../../../lib" /FIXED:no

-# SUBTRACT LINK32 /debug /nodefaultlib

+# ADD LINK32 /nologo /subsystem:console /incremental:yes /debug /machine:I386 /out:"collocated.exe" /libpath:"../../../lib" /FIXED:no

+# SUBTRACT LINK32 /pdb:none

 

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

 

diff --git a/cpp/test/Ice/adapterDeactivation/adapterdeactivationS.dsp b/cpp/test/Ice/adapterDeactivation/adapterdeactivationS.dsp
index 5ce39275751..1a64d89104f 100644
--- a/cpp/test/Ice/adapterDeactivation/adapterdeactivationS.dsp
+++ b/cpp/test/Ice/adapterDeactivation/adapterdeactivationS.dsp
@@ -51,8 +51,8 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 /nologo /subsystem:console /incremental:yes /machine:I386 /out:"server.exe" /libpath:"../../../lib" /FIXED:no

-# SUBTRACT LINK32 /debug /nodefaultlib

+# ADD LINK32 /nologo /subsystem:console /incremental:yes /debug /machine:I386 /out:"server.exe" /libpath:"../../../lib" /FIXED:no

+# SUBTRACT LINK32 /pdb:none

 

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

 

diff --git a/cpp/test/Ice/checksum/client/checksumC.dsp b/cpp/test/Ice/checksum/client/checksumC.dsp
index 6c2a1e81683..617d4c3a711 100644
--- a/cpp/test/Ice/checksum/client/checksumC.dsp
+++ b/cpp/test/Ice/checksum/client/checksumC.dsp
@@ -51,7 +51,8 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 /nologo /subsystem:console /incremental:yes /machine:I386 /out:"client.exe" /libpath:"../../../../lib" /FIXED:no

+# ADD LINK32 /nologo /subsystem:console /incremental:yes /debug /machine:I386 /out:"client.exe" /libpath:"../../../../lib" /FIXED:no

+# SUBTRACT LINK32 /pdb:none

 

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

 

diff --git a/cpp/test/Ice/checksum/server/checksumS.dsp b/cpp/test/Ice/checksum/server/checksumS.dsp
index 1ff64d2ef16..7d2ad503c76 100644
--- a/cpp/test/Ice/checksum/server/checksumS.dsp
+++ b/cpp/test/Ice/checksum/server/checksumS.dsp
@@ -51,7 +51,8 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 /nologo /subsystem:console /incremental:yes /machine:I386 /out:"server.exe" /libpath:"../../../../lib" /FIXED:no

+# ADD LINK32 /nologo /subsystem:console /incremental:yes /debug /machine:I386 /out:"server.exe" /libpath:"../../../../lib" /FIXED:no

+# SUBTRACT LINK32 /pdb:none

 

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

 

diff --git a/cpp/test/Ice/exceptions/exceptionsAMDS.dsp b/cpp/test/Ice/exceptions/exceptionsAMDS.dsp
index dc4b8fdac98..46657bdfe92 100644
--- a/cpp/test/Ice/exceptions/exceptionsAMDS.dsp
+++ b/cpp/test/Ice/exceptions/exceptionsAMDS.dsp
@@ -51,8 +51,8 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 /nologo /subsystem:console /incremental:yes /machine:I386 /out:"serveramd.exe" /libpath:"../../../lib" /FIXED:no

-# SUBTRACT LINK32 /debug /nodefaultlib

+# ADD LINK32 /nologo /subsystem:console /incremental:yes /debug /machine:I386 /out:"serveramd.exe" /libpath:"../../../lib" /FIXED:no

+# SUBTRACT LINK32 /nodefaultlib

 

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

 

diff --git a/cpp/test/Ice/exceptions/exceptionsC.dsp b/cpp/test/Ice/exceptions/exceptionsC.dsp
index 0aa1973b1cf..16603413e12 100644
--- a/cpp/test/Ice/exceptions/exceptionsC.dsp
+++ b/cpp/test/Ice/exceptions/exceptionsC.dsp
@@ -51,8 +51,8 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 /nologo /subsystem:console /incremental:yes /machine:I386 /out:"client.exe" /libpath:"../../../lib" /FIXED:no

-# SUBTRACT LINK32 /debug /nodefaultlib

+# ADD LINK32 /nologo /subsystem:console /incremental:yes /debug /machine:I386 /out:"client.exe" /libpath:"../../../lib" /FIXED:no

+# SUBTRACT LINK32 /nodefaultlib

 

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

 

diff --git a/cpp/test/Ice/exceptions/exceptionsCOL.dsp b/cpp/test/Ice/exceptions/exceptionsCOL.dsp
index e8b50423607..746677fb1ba 100644
--- a/cpp/test/Ice/exceptions/exceptionsCOL.dsp
+++ b/cpp/test/Ice/exceptions/exceptionsCOL.dsp
@@ -51,8 +51,8 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 /nologo /subsystem:console /incremental:yes /machine:I386 /out:"collocated.exe" /libpath:"../../../lib" /FIXED:no

-# SUBTRACT LINK32 /debug /nodefaultlib

+# ADD LINK32 /nologo /subsystem:console /incremental:yes /debug /machine:I386 /out:"collocated.exe" /libpath:"../../../lib" /FIXED:no

+# SUBTRACT LINK32 /nodefaultlib

 

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

 

diff --git a/cpp/test/Ice/exceptions/exceptionsS.dsp b/cpp/test/Ice/exceptions/exceptionsS.dsp
index 8e566bf6c3d..729b4d5dde5 100644
--- a/cpp/test/Ice/exceptions/exceptionsS.dsp
+++ b/cpp/test/Ice/exceptions/exceptionsS.dsp
@@ -51,8 +51,8 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 /nologo /subsystem:console /incremental:yes /machine:I386 /out:"server.exe" /libpath:"../../../lib" /FIXED:no

-# SUBTRACT LINK32 /debug /nodefaultlib

+# ADD LINK32 /nologo /subsystem:console /incremental:yes /debug /machine:I386 /out:"server.exe" /libpath:"../../../lib" /FIXED:no

+# SUBTRACT LINK32 /nodefaultlib

 

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

 

diff --git a/cpp/test/Ice/facets/facetsC.dsp b/cpp/test/Ice/facets/facetsC.dsp
index bf708da0664..6fb44a70d71 100644
--- a/cpp/test/Ice/facets/facetsC.dsp
+++ b/cpp/test/Ice/facets/facetsC.dsp
@@ -51,8 +51,8 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 /nologo /subsystem:console /incremental:yes /machine:I386 /out:"client.exe" /libpath:"../../../lib" /FIXED:no

-# SUBTRACT LINK32 /debug /nodefaultlib

+# ADD LINK32 /nologo /subsystem:console /incremental:yes /debug /machine:I386 /out:"client.exe" /libpath:"../../../lib" /FIXED:no

+# SUBTRACT LINK32 /nodefaultlib

 

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

 

diff --git a/cpp/test/Ice/facets/facetsCOL.dsp b/cpp/test/Ice/facets/facetsCOL.dsp
index 1f1008c4f9a..210f8116c6d 100644
--- a/cpp/test/Ice/facets/facetsCOL.dsp
+++ b/cpp/test/Ice/facets/facetsCOL.dsp
@@ -51,8 +51,8 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 /nologo /subsystem:console /incremental:yes /machine:I386 /out:"collocated.exe" /libpath:"../../../lib" /FIXED:no

-# SUBTRACT LINK32 /debug /nodefaultlib

+# ADD LINK32 /nologo /subsystem:console /incremental:yes /debug /machine:I386 /out:"collocated.exe" /libpath:"../../../lib" /FIXED:no

+# SUBTRACT LINK32 /nodefaultlib

 

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

 

diff --git a/cpp/test/Ice/facets/facetsS.dsp b/cpp/test/Ice/facets/facetsS.dsp
index 5759ecd18b5..0a67c32a7c9 100644
--- a/cpp/test/Ice/facets/facetsS.dsp
+++ b/cpp/test/Ice/facets/facetsS.dsp
@@ -51,8 +51,8 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 /nologo /subsystem:console /incremental:yes /machine:I386 /out:"server.exe" /libpath:"../../../lib" /FIXED:no

-# SUBTRACT LINK32 /debug /nodefaultlib

+# ADD LINK32 /nologo /subsystem:console /incremental:yes /debug /machine:I386 /out:"server.exe" /libpath:"../../../lib" /FIXED:no

+# SUBTRACT LINK32 /nodefaultlib

 

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

 

diff --git a/cpp/test/Ice/faultTolerance/faulttoleranceC.dsp b/cpp/test/Ice/faultTolerance/faulttoleranceC.dsp
index 12b6b3da190..da009da5c31 100644
--- a/cpp/test/Ice/faultTolerance/faulttoleranceC.dsp
+++ b/cpp/test/Ice/faultTolerance/faulttoleranceC.dsp
@@ -51,8 +51,8 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 /nologo /subsystem:console /incremental:yes /machine:I386 /out:"client.exe" /libpath:"../../../lib" /FIXED:no

-# SUBTRACT LINK32 /debug /nodefaultlib

+# ADD LINK32 /nologo /subsystem:console /incremental:yes /debug /machine:I386 /out:"client.exe" /libpath:"../../../lib" /FIXED:no

+# SUBTRACT LINK32 /nodefaultlib

 

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

 

diff --git a/cpp/test/Ice/faultTolerance/faulttoleranceS.dsp b/cpp/test/Ice/faultTolerance/faulttoleranceS.dsp
index b32c3483b13..d4bb79bdf4f 100644
--- a/cpp/test/Ice/faultTolerance/faulttoleranceS.dsp
+++ b/cpp/test/Ice/faultTolerance/faulttoleranceS.dsp
@@ -51,8 +51,8 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 /nologo /subsystem:console /incremental:yes /machine:I386 /out:"server.exe" /libpath:"../../../lib" /FIXED:no

-# SUBTRACT LINK32 /debug /nodefaultlib

+# ADD LINK32 /nologo /subsystem:console /incremental:yes /debug /machine:I386 /out:"server.exe" /libpath:"../../../lib" /FIXED:no

+# SUBTRACT LINK32 /nodefaultlib

 

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

 

diff --git a/cpp/test/Ice/gc/gcC.dsp b/cpp/test/Ice/gc/gcC.dsp
index 4ffcd10f205..a2217fab945 100644
--- a/cpp/test/Ice/gc/gcC.dsp
+++ b/cpp/test/Ice/gc/gcC.dsp
@@ -51,8 +51,8 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 /nologo /subsystem:console /incremental:yes /machine:I386 /out:"client.exe" /libpath:"../../../lib" /FIXED:no

-# SUBTRACT LINK32 /debug /nodefaultlib

+# ADD LINK32 /nologo /subsystem:console /incremental:yes /debug /machine:I386 /out:"client.exe" /libpath:"../../../lib" /FIXED:no

+# SUBTRACT LINK32 /nodefaultlib

 

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

 

diff --git a/cpp/test/Ice/hold/holdC.dsp b/cpp/test/Ice/hold/holdC.dsp
index 22f6d102dd7..3111ae6d708 100644
--- a/cpp/test/Ice/hold/holdC.dsp
+++ b/cpp/test/Ice/hold/holdC.dsp
@@ -51,8 +51,8 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 /nologo /subsystem:console /incremental:yes /machine:I386 /out:"client.exe" /libpath:"../../../lib" /FIXED:no

-# SUBTRACT LINK32 /debug /nodefaultlib

+# ADD LINK32 /nologo /subsystem:console /incremental:yes /debug /machine:I386 /out:"client.exe" /libpath:"../../../lib" /FIXED:no

+# SUBTRACT LINK32 /nodefaultlib

 

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

 

diff --git a/cpp/test/Ice/hold/holdS.dsp b/cpp/test/Ice/hold/holdS.dsp
index e25f15ca92f..bb4cfc54b08 100644
--- a/cpp/test/Ice/hold/holdS.dsp
+++ b/cpp/test/Ice/hold/holdS.dsp
@@ -51,8 +51,8 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 /nologo /subsystem:console /incremental:yes /machine:I386 /out:"server.exe" /libpath:"../../../lib" /FIXED:no

-# SUBTRACT LINK32 /debug /nodefaultlib

+# ADD LINK32 /nologo /subsystem:console /incremental:yes /debug /machine:I386 /out:"server.exe" /libpath:"../../../lib" /FIXED:no

+# SUBTRACT LINK32 /nodefaultlib

 

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

 

diff --git a/cpp/test/Ice/inheritance/inheritanceC.dsp b/cpp/test/Ice/inheritance/inheritanceC.dsp
index 83e644fb149..a6e57615309 100644
--- a/cpp/test/Ice/inheritance/inheritanceC.dsp
+++ b/cpp/test/Ice/inheritance/inheritanceC.dsp
@@ -51,8 +51,8 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 /nologo /subsystem:console /incremental:yes /machine:I386 /out:"client.exe" /libpath:"../../../lib" /FIXED:no

-# SUBTRACT LINK32 /debug /nodefaultlib

+# ADD LINK32 /nologo /subsystem:console /incremental:yes /debug /machine:I386 /out:"client.exe" /libpath:"../../../lib" /FIXED:no

+# SUBTRACT LINK32 /nodefaultlib

 

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

 

diff --git a/cpp/test/Ice/inheritance/inheritanceCOL.dsp b/cpp/test/Ice/inheritance/inheritanceCOL.dsp
index a66d6cb091b..5c0e0e016c0 100644
--- a/cpp/test/Ice/inheritance/inheritanceCOL.dsp
+++ b/cpp/test/Ice/inheritance/inheritanceCOL.dsp
@@ -51,8 +51,8 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 /nologo /subsystem:console /incremental:yes /machine:I386 /out:"collocated.exe" /libpath:"../../../lib" /FIXED:no

-# SUBTRACT LINK32 /debug /nodefaultlib

+# ADD LINK32 /nologo /subsystem:console /incremental:yes /debug /machine:I386 /out:"collocated.exe" /libpath:"../../../lib" /FIXED:no

+# SUBTRACT LINK32 /nodefaultlib

 

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

 

diff --git a/cpp/test/Ice/inheritance/inheritanceS.dsp b/cpp/test/Ice/inheritance/inheritanceS.dsp
index 872f684f74f..0790b7a9207 100644
--- a/cpp/test/Ice/inheritance/inheritanceS.dsp
+++ b/cpp/test/Ice/inheritance/inheritanceS.dsp
@@ -51,8 +51,8 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 /nologo /subsystem:console /incremental:yes /machine:I386 /out:"server.exe" /libpath:"../../../lib" /FIXED:no

-# SUBTRACT LINK32 /debug /nodefaultlib

+# ADD LINK32 /nologo /subsystem:console /incremental:yes /debug /machine:I386 /out:"server.exe" /libpath:"../../../lib" /FIXED:no

+# SUBTRACT LINK32 /nodefaultlib

 

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

 

diff --git a/cpp/test/Ice/location/locationC.dsp b/cpp/test/Ice/location/locationC.dsp
index 5e7fd64253d..1990484e452 100644
--- a/cpp/test/Ice/location/locationC.dsp
+++ b/cpp/test/Ice/location/locationC.dsp
@@ -51,8 +51,8 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 /nologo /subsystem:console /incremental:yes /machine:I386 /out:"client.exe" /libpath:"../../../lib" /FIXED:no

-# SUBTRACT LINK32 /debug /nodefaultlib

+# ADD LINK32 /nologo /subsystem:console /incremental:yes /debug /machine:I386 /out:"client.exe" /libpath:"../../../lib" /FIXED:no

+# SUBTRACT LINK32 /nodefaultlib

 

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

 

diff --git a/cpp/test/Ice/location/locationS.dsp b/cpp/test/Ice/location/locationS.dsp
index 369f562366c..91d3eb945bb 100644
--- a/cpp/test/Ice/location/locationS.dsp
+++ b/cpp/test/Ice/location/locationS.dsp
@@ -51,8 +51,8 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 /nologo /subsystem:console /incremental:yes /machine:I386 /out:"server.exe" /libpath:"../../../lib" /FIXED:no

-# SUBTRACT LINK32 /debug /nodefaultlib

+# ADD LINK32 /nologo /subsystem:console /incremental:yes /debug /machine:I386 /out:"server.exe" /libpath:"../../../lib" /FIXED:no

+# SUBTRACT LINK32 /nodefaultlib

 

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

 

diff --git a/cpp/test/Ice/objects/objectsC.dsp b/cpp/test/Ice/objects/objectsC.dsp
index 85625a20386..ac548e581d1 100644
--- a/cpp/test/Ice/objects/objectsC.dsp
+++ b/cpp/test/Ice/objects/objectsC.dsp
@@ -51,8 +51,8 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 /nologo /subsystem:console /incremental:yes /machine:I386 /out:"client.exe" /libpath:"../../../lib" /FIXED:no

-# SUBTRACT LINK32 /debug /nodefaultlib

+# ADD LINK32 /nologo /subsystem:console /incremental:yes /debug /machine:I386 /out:"client.exe" /libpath:"../../../lib" /FIXED:no

+# SUBTRACT LINK32 /nodefaultlib

 

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

 

diff --git a/cpp/test/Ice/objects/objectsCOL.dsp b/cpp/test/Ice/objects/objectsCOL.dsp
index 2b8557916bc..0c0ad5e9121 100644
--- a/cpp/test/Ice/objects/objectsCOL.dsp
+++ b/cpp/test/Ice/objects/objectsCOL.dsp
@@ -51,8 +51,8 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 /nologo /subsystem:console /incremental:yes /machine:I386 /out:"collocated.exe" /libpath:"../../../lib" /FIXED:no

-# SUBTRACT LINK32 /debug /nodefaultlib

+# ADD LINK32 /nologo /subsystem:console /incremental:yes /debug /machine:I386 /out:"collocated.exe" /libpath:"../../../lib" /FIXED:no

+# SUBTRACT LINK32 /nodefaultlib

 

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

 

diff --git a/cpp/test/Ice/objects/objectsS.dsp b/cpp/test/Ice/objects/objectsS.dsp
index 782eee9769f..1eeb639a711 100644
--- a/cpp/test/Ice/objects/objectsS.dsp
+++ b/cpp/test/Ice/objects/objectsS.dsp
@@ -51,8 +51,8 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 /nologo /subsystem:console /incremental:yes /machine:I386 /out:"server.exe" /libpath:"../../../lib" /FIXED:no

-# SUBTRACT LINK32 /debug /nodefaultlib

+# ADD LINK32 /nologo /subsystem:console /incremental:yes /debug /machine:I386 /out:"server.exe" /libpath:"../../../lib" /FIXED:no

+# SUBTRACT LINK32 /nodefaultlib

 

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

 

diff --git a/cpp/test/Ice/operations/operationsAMDS.dsp b/cpp/test/Ice/operations/operationsAMDS.dsp
index dabc1a10bc8..7819d3d537e 100644
--- a/cpp/test/Ice/operations/operationsAMDS.dsp
+++ b/cpp/test/Ice/operations/operationsAMDS.dsp
@@ -51,8 +51,8 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 /nologo /subsystem:console /incremental:yes /machine:I386 /out:"serveramd.exe" /libpath:"../../../lib" /FIXED:no

-# SUBTRACT LINK32 /debug /nodefaultlib

+# ADD LINK32 /nologo /subsystem:console /incremental:yes /debug /machine:I386 /out:"serveramd.exe" /libpath:"../../../lib" /FIXED:no

+# SUBTRACT LINK32 /nodefaultlib

 

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

 

diff --git a/cpp/test/Ice/operations/operationsC.dsp b/cpp/test/Ice/operations/operationsC.dsp
index 7ab86768b98..8e07e49ec48 100644
--- a/cpp/test/Ice/operations/operationsC.dsp
+++ b/cpp/test/Ice/operations/operationsC.dsp
@@ -51,8 +51,8 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 /nologo /subsystem:console /incremental:yes /machine:I386 /out:"client.exe" /libpath:"../../../lib" /FIXED:no

-# SUBTRACT LINK32 /debug /nodefaultlib

+# ADD LINK32 /nologo /subsystem:console /incremental:yes /debug /machine:I386 /out:"client.exe" /libpath:"../../../lib" /FIXED:no

+# SUBTRACT LINK32 /nodefaultlib

 

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

 

diff --git a/cpp/test/Ice/operations/operationsCOL.dsp b/cpp/test/Ice/operations/operationsCOL.dsp
index 5c421f99d09..c0809699e05 100644
--- a/cpp/test/Ice/operations/operationsCOL.dsp
+++ b/cpp/test/Ice/operations/operationsCOL.dsp
@@ -51,8 +51,8 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 /nologo /subsystem:console /incremental:yes /machine:I386 /out:"collocated.exe" /libpath:"../../../lib" /FIXED:no

-# SUBTRACT LINK32 /debug /nodefaultlib

+# ADD LINK32 /nologo /subsystem:console /incremental:yes /debug /machine:I386 /out:"collocated.exe" /libpath:"../../../lib" /FIXED:no

+# SUBTRACT LINK32 /nodefaultlib

 

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

 

diff --git a/cpp/test/Ice/operations/operationsS.dsp b/cpp/test/Ice/operations/operationsS.dsp
index 1a3e4e681d4..eb7be98a0e2 100644
--- a/cpp/test/Ice/operations/operationsS.dsp
+++ b/cpp/test/Ice/operations/operationsS.dsp
@@ -51,8 +51,8 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 /nologo /subsystem:console /incremental:yes /machine:I386 /out:"server.exe" /libpath:"../../../lib" /FIXED:no

-# SUBTRACT LINK32 /debug /nodefaultlib

+# ADD LINK32 /nologo /subsystem:console /incremental:yes /debug /machine:I386 /out:"server.exe" /libpath:"../../../lib" /FIXED:no

+# SUBTRACT LINK32 /nodefaultlib

 

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

 

diff --git a/cpp/test/Ice/slicing/exceptions/sliceexAMDS.dsp b/cpp/test/Ice/slicing/exceptions/sliceexAMDS.dsp
index d35243218dd..11227c873c1 100755
--- a/cpp/test/Ice/slicing/exceptions/sliceexAMDS.dsp
+++ b/cpp/test/Ice/slicing/exceptions/sliceexAMDS.dsp
@@ -51,7 +51,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 /nologo /subsystem:console /incremental:yes /machine:I386 /out:"serveramd.exe" /libpath:"../../../../lib" /FIXED:no

+# ADD LINK32 /nologo /subsystem:console /incremental:yes /debug /machine:I386 /out:"serveramd.exe" /libpath:"../../../../lib" /FIXED:no

 

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

 

diff --git a/cpp/test/Ice/slicing/exceptions/sliceexC.dsp b/cpp/test/Ice/slicing/exceptions/sliceexC.dsp
index 778895c73a8..0444b1a6a48 100644
--- a/cpp/test/Ice/slicing/exceptions/sliceexC.dsp
+++ b/cpp/test/Ice/slicing/exceptions/sliceexC.dsp
@@ -51,7 +51,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 /nologo /subsystem:console /incremental:yes /machine:I386 /out:"client.exe" /libpath:"../../../../lib" /FIXED:no

+# ADD LINK32 /nologo /subsystem:console /incremental:yes /debug /machine:I386 /out:"client.exe" /libpath:"../../../../lib" /FIXED:no

 

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

 

diff --git a/cpp/test/Ice/slicing/exceptions/sliceexS.dsp b/cpp/test/Ice/slicing/exceptions/sliceexS.dsp
index bb3f32ff414..6d44cccf815 100644
--- a/cpp/test/Ice/slicing/exceptions/sliceexS.dsp
+++ b/cpp/test/Ice/slicing/exceptions/sliceexS.dsp
@@ -51,7 +51,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 /nologo /subsystem:console /incremental:yes /machine:I386 /out:"server.exe" /libpath:"../../../../lib" /FIXED:no

+# ADD LINK32 /nologo /subsystem:console /incremental:yes /debug /machine:I386 /out:"server.exe" /libpath:"../../../../lib" /FIXED:no

 

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

 

diff --git a/cpp/test/Ice/slicing/objects/sliceobAMDS.dsp b/cpp/test/Ice/slicing/objects/sliceobAMDS.dsp
index 69ffe94d586..24d24c65b00 100644
--- a/cpp/test/Ice/slicing/objects/sliceobAMDS.dsp
+++ b/cpp/test/Ice/slicing/objects/sliceobAMDS.dsp
@@ -51,7 +51,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 /nologo /subsystem:console /incremental:yes /machine:I386 /out:"serveramd.exe" /libpath:"../../../../lib" /FIXED:no

+# ADD LINK32 /nologo /subsystem:console /incremental:yes /debug /machine:I386 /out:"serveramd.exe" /libpath:"../../../../lib" /FIXED:no

 

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

 

diff --git a/cpp/test/Ice/slicing/objects/sliceobC.dsp b/cpp/test/Ice/slicing/objects/sliceobC.dsp
index 11ac4fbfe8d..1f980d86587 100644
--- a/cpp/test/Ice/slicing/objects/sliceobC.dsp
+++ b/cpp/test/Ice/slicing/objects/sliceobC.dsp
@@ -51,7 +51,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 /nologo /subsystem:console /incremental:yes /machine:I386 /out:"client.exe" /libpath:"../../../../lib" /FIXED:no

+# ADD LINK32 /nologo /subsystem:console /incremental:yes /debug /machine:I386 /out:"client.exe" /libpath:"../../../../lib" /FIXED:no

 

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

 

diff --git a/cpp/test/Ice/slicing/objects/sliceobS.dsp b/cpp/test/Ice/slicing/objects/sliceobS.dsp
index cadd81dc92f..ea9ba9dc0e1 100644
--- a/cpp/test/Ice/slicing/objects/sliceobS.dsp
+++ b/cpp/test/Ice/slicing/objects/sliceobS.dsp
@@ -51,7 +51,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 /nologo /subsystem:console /incremental:yes /machine:I386 /out:"server.exe" /libpath:"../../../../lib" /FIXED:no

+# ADD LINK32 /nologo /subsystem:console /incremental:yes /debug /machine:I386 /out:"server.exe" /libpath:"../../../../lib" /FIXED:no

 

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

 

diff --git a/cpp/test/Ice/stream/streamC.dsp b/cpp/test/Ice/stream/streamC.dsp
index e52f60d04bb..2e8f494c8d0 100644
--- a/cpp/test/Ice/stream/streamC.dsp
+++ b/cpp/test/Ice/stream/streamC.dsp
@@ -51,8 +51,8 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 /nologo /subsystem:console /incremental:yes /machine:I386 /out:"client.exe" /libpath:"../../../lib" /FIXED:no

-# SUBTRACT LINK32 /debug /nodefaultlib

+# ADD LINK32 /nologo /subsystem:console /incremental:yes /debug /machine:I386 /out:"client.exe" /libpath:"../../../lib" /FIXED:no

+# SUBTRACT LINK32 /nodefaultlib

 

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

 

diff --git a/cpp/test/IceGrid/deployer/icegriddeployerC.dsp b/cpp/test/IceGrid/deployer/icegriddeployerC.dsp
index 7d83468c017..7c19c0fd3af 100644
--- a/cpp/test/IceGrid/deployer/icegriddeployerC.dsp
+++ b/cpp/test/IceGrid/deployer/icegriddeployerC.dsp
@@ -51,8 +51,8 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 /nologo /subsystem:console /incremental:yes /machine:I386 /out:"client.exe" /libpath:"../../../lib" /FIXED:no

-# SUBTRACT LINK32 /debug /nodefaultlib

+# ADD LINK32 /nologo /subsystem:console /incremental:yes /debug /machine:I386 /out:"client.exe" /libpath:"../../../lib" /FIXED:no

+# SUBTRACT LINK32 /nodefaultlib

 

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

 

diff --git a/cpp/test/IceGrid/deployer/icegriddeployerS.dsp b/cpp/test/IceGrid/deployer/icegriddeployerS.dsp
index c70d4f14978..0265c8851d4 100644
--- a/cpp/test/IceGrid/deployer/icegriddeployerS.dsp
+++ b/cpp/test/IceGrid/deployer/icegriddeployerS.dsp
@@ -51,8 +51,8 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 /nologo /subsystem:console /incremental:yes /machine:I386 /out:"server.exe" /libpath:"../../../lib" /FIXED:no

-# SUBTRACT LINK32 /debug /nodefaultlib

+# ADD LINK32 /nologo /subsystem:console /incremental:yes /debug /machine:I386 /out:"server.exe" /libpath:"../../../lib" /FIXED:no

+# SUBTRACT LINK32 /nodefaultlib

 

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

 

diff --git a/cpp/test/IceGrid/deployer/icegriddeployerSvc.dsp b/cpp/test/IceGrid/deployer/icegriddeployerSvc.dsp
index f847315c2c9..04befd2cbdf 100644
--- a/cpp/test/IceGrid/deployer/icegriddeployerSvc.dsp
+++ b/cpp/test/IceGrid/deployer/icegriddeployerSvc.dsp
@@ -54,8 +54,8 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386

-# ADD LINK32 /nologo /dll /incremental:yes /machine:I386 /out:"Release/testservice.dll"

-# SUBTRACT LINK32 /pdb:none /debug /nodefaultlib

+# ADD LINK32 /nologo /dll /incremental:yes /debug /machine:I386 /out:"Release/testservice.dll"

+# SUBTRACT LINK32 /pdb:none /nodefaultlib

 # Begin Special Build Tool

 OutDir=.\Release

 SOURCE="$(InputPath)"

diff --git a/cpp/test/IceGrid/replication/icegridreplicationC.dsp b/cpp/test/IceGrid/replication/icegridreplicationC.dsp
index d2c7780cf65..49e5a940f92 100644
--- a/cpp/test/IceGrid/replication/icegridreplicationC.dsp
+++ b/cpp/test/IceGrid/replication/icegridreplicationC.dsp
@@ -51,8 +51,8 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 /nologo /subsystem:console /incremental:yes /machine:I386 /out:"client.exe" /libpath:"../../../lib" /FIXED:no

-# SUBTRACT LINK32 /debug /nodefaultlib

+# ADD LINK32 /nologo /subsystem:console /incremental:yes /debug /machine:I386 /out:"client.exe" /libpath:"../../../lib" /FIXED:no

+# SUBTRACT LINK32 /nodefaultlib

 

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

 

diff --git a/cpp/test/IceGrid/replication/icegridreplicationS.dsp b/cpp/test/IceGrid/replication/icegridreplicationS.dsp
index a8ba494688e..632c7a95dd0 100644
--- a/cpp/test/IceGrid/replication/icegridreplicationS.dsp
+++ b/cpp/test/IceGrid/replication/icegridreplicationS.dsp
@@ -51,8 +51,8 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 /nologo /subsystem:console /incremental:yes /machine:I386 /out:"server.exe" /libpath:"../../../lib" /FIXED:no

-# SUBTRACT LINK32 /debug /nodefaultlib

+# ADD LINK32 /nologo /subsystem:console /incremental:yes /debug /machine:I386 /out:"server.exe" /libpath:"../../../lib" /FIXED:no

+# SUBTRACT LINK32 /nodefaultlib

 

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

 

diff --git a/cpp/test/IceGrid/replication/icegridreplicationSvc.dsp b/cpp/test/IceGrid/replication/icegridreplicationSvc.dsp
index adca8ab30bb..31cf466a258 100755
--- a/cpp/test/IceGrid/replication/icegridreplicationSvc.dsp
+++ b/cpp/test/IceGrid/replication/icegridreplicationSvc.dsp
@@ -54,8 +54,8 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386

-# ADD LINK32 /nologo /dll /incremental:yes /machine:I386 /out:"Release/testservice.dll"

-# SUBTRACT LINK32 /pdb:none /debug /nodefaultlib

+# ADD LINK32 /nologo /dll /incremental:yes /debug /machine:I386 /out:"Release/testservice.dll"

+# SUBTRACT LINK32 /pdb:none /nodefaultlib

 # Begin Special Build Tool

 OutDir=.\Release

 SOURCE="$(InputPath)"

diff --git a/cpp/test/IceGrid/session/icegridsessionC.dsp b/cpp/test/IceGrid/session/icegridsessionC.dsp
index 891ed5a492c..aca57f5b3eb 100755
--- a/cpp/test/IceGrid/session/icegridsessionC.dsp
+++ b/cpp/test/IceGrid/session/icegridsessionC.dsp
@@ -51,8 +51,8 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 /nologo /subsystem:console /incremental:yes /machine:I386 /out:"client.exe" /libpath:"../../../lib" /FIXED:no

-# SUBTRACT LINK32 /debug /nodefaultlib

+# ADD LINK32 /nologo /subsystem:console /incremental:yes /debug /machine:I386 /out:"client.exe" /libpath:"../../../lib" /FIXED:no

+# SUBTRACT LINK32 /nodefaultlib

 

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

 

diff --git a/cpp/test/IceGrid/session/icegridsessionS.dsp b/cpp/test/IceGrid/session/icegridsessionS.dsp
index eef17cdf8c5..3a92de50de9 100755
--- a/cpp/test/IceGrid/session/icegridsessionS.dsp
+++ b/cpp/test/IceGrid/session/icegridsessionS.dsp
@@ -51,8 +51,8 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 /nologo /subsystem:console /incremental:yes /machine:I386 /out:"server.exe" /libpath:"../../../lib" /FIXED:no

-# SUBTRACT LINK32 /debug /nodefaultlib

+# ADD LINK32 /nologo /subsystem:console /incremental:yes /debug /machine:I386 /out:"server.exe" /libpath:"../../../lib" /FIXED:no

+# SUBTRACT LINK32 /nodefaultlib

 

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

 

diff --git a/cpp/test/IceGrid/simple/icegridsimpleC.dsp b/cpp/test/IceGrid/simple/icegridsimpleC.dsp
index 0539d4af243..a355cb0276a 100644
--- a/cpp/test/IceGrid/simple/icegridsimpleC.dsp
+++ b/cpp/test/IceGrid/simple/icegridsimpleC.dsp
@@ -51,8 +51,8 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 /nologo /subsystem:console /incremental:yes /machine:I386 /out:"client.exe" /libpath:"../../../lib" /FIXED:no

-# SUBTRACT LINK32 /debug /nodefaultlib

+# ADD LINK32 /nologo /subsystem:console /incremental:yes /debug /machine:I386 /out:"client.exe" /libpath:"../../../lib" /FIXED:no

+# SUBTRACT LINK32 /nodefaultlib

 

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

 

diff --git a/cpp/test/IceGrid/simple/icegridsimpleS.dsp b/cpp/test/IceGrid/simple/icegridsimpleS.dsp
index 315cba91613..7d3640d0422 100644
--- a/cpp/test/IceGrid/simple/icegridsimpleS.dsp
+++ b/cpp/test/IceGrid/simple/icegridsimpleS.dsp
@@ -51,8 +51,8 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 /nologo /subsystem:console /incremental:yes /machine:I386 /out:"server.exe" /libpath:"../../../lib" /FIXED:no

-# SUBTRACT LINK32 /debug /nodefaultlib

+# ADD LINK32 /nologo /subsystem:console /incremental:yes /debug /machine:I386 /out:"server.exe" /libpath:"../../../lib" /FIXED:no

+# SUBTRACT LINK32 /nodefaultlib

 

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

 

diff --git a/cpp/test/IceGrid/update/icegridupdateC.dsp b/cpp/test/IceGrid/update/icegridupdateC.dsp
index 06eecacc06d..cc4bb88c8fb 100644
--- a/cpp/test/IceGrid/update/icegridupdateC.dsp
+++ b/cpp/test/IceGrid/update/icegridupdateC.dsp
@@ -51,8 +51,8 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 /nologo /subsystem:console /incremental:yes /machine:I386 /out:"client.exe" /libpath:"../../../lib" /FIXED:no

-# SUBTRACT LINK32 /debug /nodefaultlib

+# ADD LINK32 /nologo /subsystem:console /incremental:yes /debug /machine:I386 /out:"client.exe" /libpath:"../../../lib" /FIXED:no

+# SUBTRACT LINK32 /nodefaultlib

 

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

 

diff --git a/cpp/test/IceGrid/update/icegridupdateS.dsp b/cpp/test/IceGrid/update/icegridupdateS.dsp
index d62ca5d0173..3aa89b306fa 100644
--- a/cpp/test/IceGrid/update/icegridupdateS.dsp
+++ b/cpp/test/IceGrid/update/icegridupdateS.dsp
@@ -51,8 +51,8 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 /nologo /subsystem:console /incremental:yes /machine:I386 /out:"server.exe" /libpath:"../../../lib" /FIXED:no

-# SUBTRACT LINK32 /debug /nodefaultlib

+# ADD LINK32 /nologo /subsystem:console /incremental:yes /debug /machine:I386 /out:"server.exe" /libpath:"../../../lib" /FIXED:no

+# SUBTRACT LINK32 /nodefaultlib

 

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

 

diff --git a/cpp/test/IceSSL/certificateAndKeyParsing/certificateandkeyparsing.dsp b/cpp/test/IceSSL/certificateAndKeyParsing/certificateandkeyparsing.dsp
index fc7619789d3..d5398a70e94 100644
--- a/cpp/test/IceSSL/certificateAndKeyParsing/certificateandkeyparsing.dsp
+++ b/cpp/test/IceSSL/certificateAndKeyParsing/certificateandkeyparsing.dsp
@@ -51,7 +51,8 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 /nologo /subsystem:console /incremental:yes /machine:I386 /out:"certificateandkeyparsing.exe" /libpath:"../../../lib" /FIXED:no

+# ADD LINK32 /nologo /subsystem:console /incremental:yes /debug /machine:I386 /out:"certificateandkeyparsing.exe" /libpath:"../../../lib" /FIXED:no

+# SUBTRACT LINK32 /pdb:none

 

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

 

diff --git a/cpp/test/IceSSL/certificateVerification/certificateverificationC.dsp b/cpp/test/IceSSL/certificateVerification/certificateverificationC.dsp
index cfce0fdcdd2..a103381ab5d 100644
--- a/cpp/test/IceSSL/certificateVerification/certificateverificationC.dsp
+++ b/cpp/test/IceSSL/certificateVerification/certificateverificationC.dsp
@@ -51,7 +51,8 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 /nologo /subsystem:console /incremental:yes /machine:I386 /out:"client.exe" /libpath:"../../../lib" /FIXED:no

+# ADD LINK32 /nologo /subsystem:console /incremental:yes /debug /machine:I386 /out:"client.exe" /libpath:"../../../lib" /FIXED:no

+# SUBTRACT LINK32 /pdb:none

 

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

 

diff --git a/cpp/test/IceSSL/certificateVerification/certificateverificationS.dsp b/cpp/test/IceSSL/certificateVerification/certificateverificationS.dsp
index c782aa8eb9c..df58563d969 100644
--- a/cpp/test/IceSSL/certificateVerification/certificateverificationS.dsp
+++ b/cpp/test/IceSSL/certificateVerification/certificateverificationS.dsp
@@ -51,7 +51,8 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 /nologo /subsystem:console /incremental:yes /machine:I386 /out:"server.exe" /libpath:"../../../lib" /FIXED:no

+# ADD LINK32 /nologo /subsystem:console /incremental:yes /debug /machine:I386 /out:"server.exe" /libpath:"../../../lib" /FIXED:no

+# SUBTRACT LINK32 /pdb:none

 

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

 

diff --git a/cpp/test/IceSSL/certificateVerifier/certificateverifier.dsp b/cpp/test/IceSSL/certificateVerifier/certificateverifier.dsp
index e77df8c33e6..003e7321f82 100644
--- a/cpp/test/IceSSL/certificateVerifier/certificateverifier.dsp
+++ b/cpp/test/IceSSL/certificateVerifier/certificateverifier.dsp
@@ -51,7 +51,8 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 /nologo /subsystem:console /incremental:yes /machine:I386 /out:"certificateverifier.exe" /libpath:"../../../lib" /FIXED:no

+# ADD LINK32 /nologo /subsystem:console /incremental:yes /debug /machine:I386 /out:"certificateverifier.exe" /libpath:"../../../lib" /FIXED:no

+# SUBTRACT LINK32 /pdb:none

 

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

 

diff --git a/cpp/test/IceSSL/configuration/configuration.dsp b/cpp/test/IceSSL/configuration/configuration.dsp
index 6e4ff287ccb..cd58d8dbfc7 100644
--- a/cpp/test/IceSSL/configuration/configuration.dsp
+++ b/cpp/test/IceSSL/configuration/configuration.dsp
@@ -51,7 +51,8 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 /nologo /subsystem:console /incremental:yes /machine:I386 /out:"configuration.exe" /FIXED:no

+# ADD LINK32 /nologo /subsystem:console /incremental:yes /debug /machine:I386 /out:"configuration.exe" /FIXED:no

+# SUBTRACT LINK32 /pdb:none

 

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

 

diff --git a/cpp/test/IceSSL/loadPEM/loadpem.dsp b/cpp/test/IceSSL/loadPEM/loadpem.dsp
index 7110f7e0e88..a6300da67fe 100644
--- a/cpp/test/IceSSL/loadPEM/loadpem.dsp
+++ b/cpp/test/IceSSL/loadPEM/loadpem.dsp
@@ -51,7 +51,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 /nologo /subsystem:console /incremental:yes /machine:I386 /out:"loadpem.exe" /libpath:"../../../lib" /FIXED:no

+# ADD LINK32 /nologo /subsystem:console /incremental:yes /debug /machine:I386 /out:"loadpem.exe" /libpath:"../../../lib" /FIXED:no

 

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

 

diff --git a/cpp/test/IceStorm/federation/federationC.dsp b/cpp/test/IceStorm/federation/federationC.dsp
index 6143eda4696..1e000d5199a 100644
--- a/cpp/test/IceStorm/federation/federationC.dsp
+++ b/cpp/test/IceStorm/federation/federationC.dsp
@@ -51,8 +51,8 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 /nologo /subsystem:console /incremental:yes /machine:I386 /out:"publisher.exe" /libpath:"../../../lib" /FIXED:no

-# SUBTRACT LINK32 /debug /nodefaultlib

+# ADD LINK32 /nologo /subsystem:console /incremental:yes /debug /machine:I386 /out:"publisher.exe" /libpath:"../../../lib" /FIXED:no

+# SUBTRACT LINK32 /nodefaultlib

 

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

 

diff --git a/cpp/test/IceStorm/federation/federationS.dsp b/cpp/test/IceStorm/federation/federationS.dsp
index acbdc8b4ce0..3e5a9590375 100644
--- a/cpp/test/IceStorm/federation/federationS.dsp
+++ b/cpp/test/IceStorm/federation/federationS.dsp
@@ -51,8 +51,8 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 /nologo /subsystem:console /incremental:yes /machine:I386 /out:"subscriber.exe" /libpath:"../../../lib" /FIXED:no

-# SUBTRACT LINK32 /debug /nodefaultlib

+# ADD LINK32 /nologo /subsystem:console /incremental:yes /debug /machine:I386 /out:"subscriber.exe" /libpath:"../../../lib" /FIXED:no

+# SUBTRACT LINK32 /nodefaultlib

 

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

 

diff --git a/cpp/test/IceStorm/single/singleC.dsp b/cpp/test/IceStorm/single/singleC.dsp
index 395f5881689..04d5c50d842 100644
--- a/cpp/test/IceStorm/single/singleC.dsp
+++ b/cpp/test/IceStorm/single/singleC.dsp
@@ -51,8 +51,8 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 /nologo /subsystem:console /incremental:yes /machine:I386 /out:"publisher.exe" /libpath:"../../../lib" /FIXED:no

-# SUBTRACT LINK32 /debug /nodefaultlib

+# ADD LINK32 /nologo /subsystem:console /incremental:yes /debug /machine:I386 /out:"publisher.exe" /libpath:"../../../lib" /FIXED:no

+# SUBTRACT LINK32 /nodefaultlib

 

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

 

diff --git a/cpp/test/IceStorm/single/singleS.dsp b/cpp/test/IceStorm/single/singleS.dsp
index 9405f032819..405899a8cee 100644
--- a/cpp/test/IceStorm/single/singleS.dsp
+++ b/cpp/test/IceStorm/single/singleS.dsp
@@ -51,8 +51,8 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 /nologo /subsystem:console /incremental:yes /machine:I386 /out:"subscriber.exe" /libpath:"../../../lib" /FIXED:no

-# SUBTRACT LINK32 /debug /nodefaultlib

+# ADD LINK32 /nologo /subsystem:console /incremental:yes /debug /machine:I386 /out:"subscriber.exe" /libpath:"../../../lib" /FIXED:no

+# SUBTRACT LINK32 /nodefaultlib

 

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

 

diff --git a/cpp/test/IceUtil/ctrlCHandler/ctrlchandler.dsp b/cpp/test/IceUtil/ctrlCHandler/ctrlchandler.dsp
index c9f968534de..de06c3db040 100644
--- a/cpp/test/IceUtil/ctrlCHandler/ctrlchandler.dsp
+++ b/cpp/test/IceUtil/ctrlCHandler/ctrlchandler.dsp
@@ -51,8 +51,8 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib ctrlchandler.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib ctrlCHandler.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 /nologo /subsystem:console /incremental:yes /machine:I386 /out:"client.exe" /libpath:"../../../lib" /FIXED:no

-# SUBTRACT LINK32 /nodefaultlib

+# ADD LINK32 /nologo /subsystem:console /incremental:yes /debug /machine:I386 /out:"client.exe" /libpath:"../../../lib" /FIXED:no

+# SUBTRACT LINK32 /pdb:none

 

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

 

diff --git a/cpp/test/IceUtil/inputUtil/inpututil.dsp b/cpp/test/IceUtil/inputUtil/inpututil.dsp
index 74b72823490..5610264d1dd 100644
--- a/cpp/test/IceUtil/inputUtil/inpututil.dsp
+++ b/cpp/test/IceUtil/inputUtil/inpututil.dsp
@@ -51,8 +51,8 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 /nologo /subsystem:console /incremental:yes /machine:I386 /out:"client.exe" /libpath:"../../../lib" /FIXED:no

-# SUBTRACT LINK32 /debug /nodefaultlib

+# ADD LINK32 /nologo /subsystem:console /incremental:yes /debug /machine:I386 /out:"client.exe" /libpath:"../../../lib" /FIXED:no

+# SUBTRACT LINK32 /nodefaultlib

 

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

 

diff --git a/cpp/test/IceUtil/thread/thread.dsp b/cpp/test/IceUtil/thread/thread.dsp
index 692746980df..c9ad11c0ab1 100644
--- a/cpp/test/IceUtil/thread/thread.dsp
+++ b/cpp/test/IceUtil/thread/thread.dsp
@@ -51,7 +51,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 /nologo /subsystem:console /incremental:yes /machine:I386 /out:"client.exe" /libpath:"../../../lib" /FIXED:no

+# ADD LINK32 /nologo /subsystem:console /incremental:yes /debug /machine:I386 /out:"client.exe" /libpath:"../../../lib" /FIXED:no

 # SUBTRACT LINK32 /nodefaultlib

 

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

diff --git a/cpp/test/IceUtil/unicode/unicode.dsp b/cpp/test/IceUtil/unicode/unicode.dsp
index e906fa6fc80..ce611fd0da1 100644
--- a/cpp/test/IceUtil/unicode/unicode.dsp
+++ b/cpp/test/IceUtil/unicode/unicode.dsp
@@ -51,7 +51,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 /nologo /subsystem:console /incremental:yes /machine:I386 /out:"client.exe" /libpath:"../../../lib" /FIXED:no

+# ADD LINK32 /nologo /subsystem:console /incremental:yes /debug /machine:I386 /out:"client.exe" /libpath:"../../../lib" /FIXED:no

 # SUBTRACT LINK32 /nodefaultlib

 

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

diff --git a/cpp/test/IceUtil/uuid/uuid.dsp b/cpp/test/IceUtil/uuid/uuid.dsp
index bc6af1c4f66..63cd7024510 100644
--- a/cpp/test/IceUtil/uuid/uuid.dsp
+++ b/cpp/test/IceUtil/uuid/uuid.dsp
@@ -51,7 +51,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 /nologo /subsystem:console /incremental:yes /machine:I386 /out:"client.exe" /libpath:"../../../lib" /FIXED:no

+# ADD LINK32 /nologo /subsystem:console /incremental:yes /debug /machine:I386 /out:"client.exe" /libpath:"../../../lib" /FIXED:no

 # SUBTRACT LINK32 /nodefaultlib

 

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