diff options
69 files changed, 211 insertions, 203 deletions
diff --git a/tests/Atomic_Op_Test.dsp b/tests/Atomic_Op_Test.dsp index 3d77667edc7..1a6ce9340c5 100644 --- a/tests/Atomic_Op_Test.dsp +++ b/tests/Atomic_Op_Test.dsp @@ -100,7 +100,7 @@ LINK32=link.exe CPP=cl.exe
# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -110,7 +110,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"
-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /out:"Atomic_Op_Test_ETS.exe" /pdbtype:sept /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
+# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"Atomic_Op_Test_ETS.exe" /pdbtype:sept /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
# SUBTRACT LINK32 /pdb:none
!ENDIF
diff --git a/tests/Barrier_Test.dsp b/tests/Barrier_Test.dsp index 958275aef71..866de6ab5e9 100644 --- a/tests/Barrier_Test.dsp +++ b/tests/Barrier_Test.dsp @@ -100,7 +100,7 @@ LINK32=link.exe CPP=cl.exe
# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -110,7 +110,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"
-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /out:"Barrier_Test_ETS.exe" /pdbtype:sept /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
+# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"Barrier_Test_ETS.exe" /pdbtype:sept /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
# SUBTRACT LINK32 /pdb:none
!ENDIF
diff --git a/tests/Basic_Types_Test.dsp b/tests/Basic_Types_Test.dsp index ae8ef8783e6..3d74b532a57 100644 --- a/tests/Basic_Types_Test.dsp +++ b/tests/Basic_Types_Test.dsp @@ -65,12 +65,12 @@ LINK32=link.exe # PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "."
-# PROP Intermediate_Dir "./ETS_DLL/Debug"
+# PROP Intermediate_Dir ".\ETS_LIB\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D ACE_HAS_DLL=0 /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -80,7 +80,7 @@ BSC32=bscmake.exe LINK32=link.exe
# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"
# SUBTRACT BASE LINK32 /pdb:none
-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /out:"Basic_Types_Test_ETS.exe" /pdbtype:sept /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
+# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"Basic_Types_Test_ETS.exe" /pdbtype:sept /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
# SUBTRACT LINK32 /pdb:none
!ENDIF
@@ -93,5 +93,9 @@ LINK32=link.exe SOURCE=.\Basic_Types_Test.cpp
# End Source File
+# Begin Source File
+
+SOURCE=.\tests_pharlap_msvc.lnk
+# End Source File
# End Target
# End Project
diff --git a/tests/Buffer_Stream_Test.dsp b/tests/Buffer_Stream_Test.dsp index 2c0a4ad6f0e..d2517bbaaa9 100644 --- a/tests/Buffer_Stream_Test.dsp +++ b/tests/Buffer_Stream_Test.dsp @@ -94,13 +94,13 @@ LINK32=link.exe # PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "."
-# PROP Intermediate_Dir "./ETS_DLL/Debug"
+# PROP Intermediate_Dir ".\ETS_LIB\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir "Buffer_Stream_Test"
CPP=cl.exe
# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -110,7 +110,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Buffer_Stream_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
+# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Buffer_Stream_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
# SUBTRACT LINK32 /pdb:none
!ENDIF
diff --git a/tests/CDR_Test.dsp b/tests/CDR_Test.dsp index 93c1387422c..8e4c4e4891e 100644 --- a/tests/CDR_Test.dsp +++ b/tests/CDR_Test.dsp @@ -94,13 +94,13 @@ LINK32=link.exe # PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "."
-# PROP Intermediate_Dir "./ETS_DLL/Debug"
+# PROP Intermediate_Dir ".\ETS_LIB\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir "CDR_Test"
CPP=cl.exe
# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -110,7 +110,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /out:"CDR_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
+# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"CDR_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
# SUBTRACT LINK32 /pdb:none
!ENDIF
diff --git a/tests/Collection_Test.dsp b/tests/Collection_Test.dsp index cd845a17e00..ed0a0a09d86 100644 --- a/tests/Collection_Test.dsp +++ b/tests/Collection_Test.dsp @@ -64,12 +64,12 @@ LINK32=link.exe # PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "."
-# PROP Intermediate_Dir "./ETS_DLL/Debug"
+# PROP Intermediate_Dir ".\ETS_LIB\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "_MBCS" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -78,7 +78,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"
-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Collection_Test_ETS.exe" /pdbtype:sept /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
+# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Collection_Test_ETS.exe" /pdbtype:sept /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
# SUBTRACT LINK32 /pdb:none
!ENDIF
diff --git a/tests/Conn_Test.dsp b/tests/Conn_Test.dsp index 9b5d89a28fe..5c7e76e493a 100644 --- a/tests/Conn_Test.dsp +++ b/tests/Conn_Test.dsp @@ -94,13 +94,13 @@ LINK32=link.exe # PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "."
-# PROP Intermediate_Dir "./ETS_DLL/Debug"
+# PROP Intermediate_Dir ".\ETS_LIB\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir "Conn_Test"
CPP=cl.exe
# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -110,7 +110,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Conn_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
+# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Conn_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
# SUBTRACT LINK32 /pdb:none
!ENDIF
diff --git a/tests/DLList_Test.dsp b/tests/DLList_Test.dsp index 611764c6f7c..16ea84fe827 100644 --- a/tests/DLList_Test.dsp +++ b/tests/DLList_Test.dsp @@ -94,13 +94,13 @@ LINK32=link.exe # PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "."
-# PROP Intermediate_Dir "./ETS_DLL/Debug"
+# PROP Intermediate_Dir ".\ETS_LIB\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir "DLList_Test"
CPP=cl.exe
# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -110,7 +110,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /out:"./DLList_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
+# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./DLList_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
# SUBTRACT LINK32 /pdb:none
!ENDIF
diff --git a/tests/Dynamic_Priority_Test.dsp b/tests/Dynamic_Priority_Test.dsp index a4f48967568..30a53be7dd7 100644 --- a/tests/Dynamic_Priority_Test.dsp +++ b/tests/Dynamic_Priority_Test.dsp @@ -64,12 +64,12 @@ LINK32=link.exe # PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "."
-# PROP Intermediate_Dir "./ETS_DLL/Debug"
+# PROP Intermediate_Dir ".\ETS_LIB\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -78,7 +78,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Dynamic_Priority_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
+# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Dynamic_Priority_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
# SUBTRACT LINK32 /pdb:none
!ENDIF
diff --git a/tests/Enum_Interfaces_Test.dsp b/tests/Enum_Interfaces_Test.dsp index 33be0e87079..be49c4656a8 100644 --- a/tests/Enum_Interfaces_Test.dsp +++ b/tests/Enum_Interfaces_Test.dsp @@ -94,13 +94,13 @@ LINK32=link.exe # PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "."
-# PROP Intermediate_Dir "./ETS_DLL/Debug"
+# PROP Intermediate_Dir ".\ETS_LIB\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
CPP=cl.exe
# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -110,7 +110,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"
-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Enum_Interfaces_Test_ETS.exe" /pdbtype:sept /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
+# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Enum_Interfaces_Test_ETS.exe" /pdbtype:sept /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
# SUBTRACT LINK32 /pdb:none
!ENDIF
diff --git a/tests/Env_Value_Test.dsp b/tests/Env_Value_Test.dsp index d44d4682438..3ce8eb921e6 100644 --- a/tests/Env_Value_Test.dsp +++ b/tests/Env_Value_Test.dsp @@ -94,13 +94,13 @@ LINK32=link.exe # PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "."
-# PROP Intermediate_Dir "./ETS_DLL/Debug"
+# PROP Intermediate_Dir ".\ETS_LIB\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir "Env_Value_Test"
CPP=cl.exe
# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -110,7 +110,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Env_Value_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
+# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Env_Value_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
# SUBTRACT LINK32 /pdb:none
!ENDIF
diff --git a/tests/Future_Test.dsp b/tests/Future_Test.dsp index 10731979767..fcae3d09de3 100644 --- a/tests/Future_Test.dsp +++ b/tests/Future_Test.dsp @@ -94,13 +94,13 @@ LINK32=link.exe # PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "."
-# PROP Intermediate_Dir "./ETS_DLL/Debug"
+# PROP Intermediate_Dir ".\ETS_LIB\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir "Future_Test"
CPP=cl.exe
# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -110,7 +110,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Future_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
+# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Future_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
# SUBTRACT LINK32 /pdb:none
!ENDIF
diff --git a/tests/Handle_Set_Test.dsp b/tests/Handle_Set_Test.dsp index 02e746aac1d..2f0bedc5649 100644 --- a/tests/Handle_Set_Test.dsp +++ b/tests/Handle_Set_Test.dsp @@ -94,13 +94,13 @@ LINK32=link.exe # PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "."
-# PROP Intermediate_Dir "./ETS_DLL/Debug"
+# PROP Intermediate_Dir ".\ETS_LIB\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir "Handle_Set_Test"
CPP=cl.exe
# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -110,7 +110,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Handle_Set_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
+# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Handle_Set_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
# SUBTRACT LINK32 /pdb:none
!ENDIF
diff --git a/tests/Hash_Map_Manager_Test.dsp b/tests/Hash_Map_Manager_Test.dsp index 415d7c5edd3..b2fb5a1ab47 100644 --- a/tests/Hash_Map_Manager_Test.dsp +++ b/tests/Hash_Map_Manager_Test.dsp @@ -94,13 +94,13 @@ LINK32=link.exe # PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "."
-# PROP Intermediate_Dir "./ETS_DLL/Debug"
+# PROP Intermediate_Dir ".\ETS_LIB\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
CPP=cl.exe
# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -110,7 +110,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"
-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Hash_Map_Manager_Test_ETS.exe" /pdbtype:sept /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
+# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Hash_Map_Manager_Test_ETS.exe" /pdbtype:sept /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
# SUBTRACT LINK32 /pdb:none
!ENDIF
diff --git a/tests/High_Res_Timer_Test.dsp b/tests/High_Res_Timer_Test.dsp index a82edd006e2..cacae79bd3d 100644 --- a/tests/High_Res_Timer_Test.dsp +++ b/tests/High_Res_Timer_Test.dsp @@ -94,13 +94,13 @@ LINK32=link.exe # PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "."
-# PROP Intermediate_Dir "./ETS_DLL/Debug"
+# PROP Intermediate_Dir ".\ETS_LIB\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir "High_Res_Timer_Test"
CPP=cl.exe
# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -110,7 +110,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /out:"./High_Res_Timer_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
+# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./High_Res_Timer_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
# SUBTRACT LINK32 /pdb:none
!ENDIF
diff --git a/tests/IOStream_Test.dsp b/tests/IOStream_Test.dsp index 89930a0d384..587d5507ccf 100644 --- a/tests/IOStream_Test.dsp +++ b/tests/IOStream_Test.dsp @@ -94,13 +94,13 @@ LINK32=link.exe # PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "."
-# PROP Intermediate_Dir "./ETS_DLL/Debug"
+# PROP Intermediate_Dir ".\ETS_LIB\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir "IOStream_Test"
CPP=cl.exe
# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -110,7 +110,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /out:"./IOStream_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
+# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./IOStream_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
# SUBTRACT LINK32 /pdb:none
!ENDIF
diff --git a/tests/MM_Shared_Memory_Test.dsp b/tests/MM_Shared_Memory_Test.dsp index 77d948bba56..9623c77b2ee 100644 --- a/tests/MM_Shared_Memory_Test.dsp +++ b/tests/MM_Shared_Memory_Test.dsp @@ -94,13 +94,13 @@ LINK32=link.exe # PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "."
-# PROP Intermediate_Dir "./ETS_DLL/Debug"
+# PROP Intermediate_Dir ".\ETS_LIB\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir "MM_Shared_Memory_Test"
CPP=cl.exe
# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -110,7 +110,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /out:"./MM_Shared_Memory_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
+# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./MM_Shared_Memory_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
# SUBTRACT LINK32 /pdb:none
!ENDIF
diff --git a/tests/MT_Reactor_Timer_Test.dsp b/tests/MT_Reactor_Timer_Test.dsp index 6dc737c93b3..394e76b8ba1 100644 --- a/tests/MT_Reactor_Timer_Test.dsp +++ b/tests/MT_Reactor_Timer_Test.dsp @@ -94,13 +94,13 @@ LINK32=link.exe # PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "."
-# PROP Intermediate_Dir "./ETS_DLL/Debug"
+# PROP Intermediate_Dir ".\ETS_LIB\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir "MT_Reactor_Timer_Test"
CPP=cl.exe
# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -110,7 +110,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /out:"./MT_Reactor_Timer_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
+# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./MT_Reactor_Timer_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
# SUBTRACT LINK32 /pdb:none
!ENDIF
diff --git a/tests/MT_SOCK_Test.dsp b/tests/MT_SOCK_Test.dsp index d7c0f102ba1..0ccee16001f 100644 --- a/tests/MT_SOCK_Test.dsp +++ b/tests/MT_SOCK_Test.dsp @@ -94,13 +94,13 @@ LINK32=link.exe # PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "."
-# PROP Intermediate_Dir "./ETS_DLL/Debug"
+# PROP Intermediate_Dir ".\ETS_LIB\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
CPP=cl.exe
# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I ".." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I ".." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "_MBCS" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -110,7 +110,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"
-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /out:"./MT_SOCK_Test_ETS.exe" /pdbtype:sept /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
+# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./MT_SOCK_Test_ETS.exe" /pdbtype:sept /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
# SUBTRACT LINK32 /pdb:none
!ENDIF
diff --git a/tests/Map_Manager_Test.dsp b/tests/Map_Manager_Test.dsp index 48f4a423ae4..a5bf1d051ba 100644 --- a/tests/Map_Manager_Test.dsp +++ b/tests/Map_Manager_Test.dsp @@ -94,13 +94,13 @@ LINK32=link.exe # PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "."
-# PROP Intermediate_Dir "./ETS_DLL/Debug"
+# PROP Intermediate_Dir ".\ETS_LIB\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir "Map_Manager_Test"
CPP=cl.exe
# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -110,7 +110,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Map_Manager_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
+# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Map_Manager_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
# SUBTRACT LINK32 /pdb:none
!ENDIF
diff --git a/tests/Map_Test.dsp b/tests/Map_Test.dsp index 70d7a238c8e..77d933de1fe 100644 --- a/tests/Map_Test.dsp +++ b/tests/Map_Test.dsp @@ -94,13 +94,13 @@ LINK32=link.exe # PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "."
-# PROP Intermediate_Dir "./ETS_DLL/Debug"
+# PROP Intermediate_Dir ".\ETS_LIB\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir "Map_Test"
CPP=cl.exe
# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -110,7 +110,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Map_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
+# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Map_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
# SUBTRACT LINK32 /pdb:none
!ENDIF
diff --git a/tests/Mem_Map_Test.dsp b/tests/Mem_Map_Test.dsp index 4bfd8d673e4..b89066391f5 100644 --- a/tests/Mem_Map_Test.dsp +++ b/tests/Mem_Map_Test.dsp @@ -94,13 +94,13 @@ LINK32=link.exe # PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "."
-# PROP Intermediate_Dir "./ETS_DLL/Debug"
+# PROP Intermediate_Dir ".\ETS_LIB\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir "Mem_Map_Test"
CPP=cl.exe
# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -110,7 +110,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Mem_Map_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
+# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Mem_Map_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
# SUBTRACT LINK32 /pdb:none
!ENDIF
diff --git a/tests/Message_Block_Test.dsp b/tests/Message_Block_Test.dsp index f54016c8b5f..28c46aea16c 100644 --- a/tests/Message_Block_Test.dsp +++ b/tests/Message_Block_Test.dsp @@ -94,13 +94,13 @@ LINK32=link.exe # PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "."
-# PROP Intermediate_Dir "./ETS_DLL/Debug"
+# PROP Intermediate_Dir ".\ETS_LIB\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir "Message_Block_Test"
CPP=cl.exe
# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -110,7 +110,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Message_Block_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
+# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Message_Block_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
# SUBTRACT LINK32 /pdb:none
!ENDIF
diff --git a/tests/Message_Queue_Notifications_Test.dsp b/tests/Message_Queue_Notifications_Test.dsp index 4b60a2a986e..98157288de9 100644 --- a/tests/Message_Queue_Notifications_Test.dsp +++ b/tests/Message_Queue_Notifications_Test.dsp @@ -94,13 +94,13 @@ LINK32=link.exe # PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "."
-# PROP Intermediate_Dir "./ETS_DLL/Debug"
+# PROP Intermediate_Dir ".\ETS_LIB\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir "Message_Queue_Notifications_Test"
CPP=cl.exe
# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -110,7 +110,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Message_Queue_Notifications_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
+# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Message_Queue_Notifications_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
# SUBTRACT LINK32 /pdb:none
!ENDIF
diff --git a/tests/Message_Queue_Test.dsp b/tests/Message_Queue_Test.dsp index 879e4cef60c..e003350194d 100644 --- a/tests/Message_Queue_Test.dsp +++ b/tests/Message_Queue_Test.dsp @@ -94,13 +94,13 @@ LINK32=link.exe # PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "."
-# PROP Intermediate_Dir "./ETS_DLL/Debug"
+# PROP Intermediate_Dir ".\ETS_LIB\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir "Message_Queue_Test"
CPP=cl.exe
# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -110,7 +110,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Message_Queue_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
+# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Message_Queue_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
# SUBTRACT LINK32 /pdb:none
!ENDIF
diff --git a/tests/Naming_Test.dsp b/tests/Naming_Test.dsp index 4bd2601a1b6..7cd3a67f5eb 100644 --- a/tests/Naming_Test.dsp +++ b/tests/Naming_Test.dsp @@ -94,13 +94,13 @@ LINK32=link.exe # PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "."
-# PROP Intermediate_Dir "./ETS_DLL/Debug"
+# PROP Intermediate_Dir ".\ETS_LIB\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir "Naming_Test"
CPP=cl.exe
# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -110,7 +110,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Naming_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
+# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Naming_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
# SUBTRACT LINK32 /pdb:none
!ENDIF
diff --git a/tests/New_Fail_Test.dsp b/tests/New_Fail_Test.dsp index 9e01d2a4527..6df059c43e5 100644 --- a/tests/New_Fail_Test.dsp +++ b/tests/New_Fail_Test.dsp @@ -64,12 +64,12 @@ LINK32=link.exe # PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "."
-# PROP Intermediate_Dir "./ETS_DLL/Debug"
+# PROP Intermediate_Dir ".\ETS_LIB\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I ".." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I ".." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "_MBCS" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -78,7 +78,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"
-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /out:"./New_Fail_Test_ETS.exe" /pdbtype:sept /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
+# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./New_Fail_Test_ETS.exe" /pdbtype:sept /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
# SUBTRACT LINK32 /pdb:none
!ENDIF
diff --git a/tests/Notify_Performance_Test.dsp b/tests/Notify_Performance_Test.dsp index 2e8fa2b7799..27a264ce9e6 100644 --- a/tests/Notify_Performance_Test.dsp +++ b/tests/Notify_Performance_Test.dsp @@ -94,13 +94,13 @@ LINK32=link.exe # PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "."
-# PROP Intermediate_Dir "./ETS_DLL/Debug"
+# PROP Intermediate_Dir ".\ETS_LIB\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
CPP=cl.exe
# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I ".." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I ".." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "_MBCS" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -110,7 +110,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"
-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Notify_Performance_Test_ETS.exe" /pdbtype:sept /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
+# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Notify_Performance_Test_ETS.exe" /pdbtype:sept /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
# SUBTRACT LINK32 /pdb:none
!ENDIF
diff --git a/tests/OrdMultiSet_Test.dsp b/tests/OrdMultiSet_Test.dsp index 9b240bd2d32..809b5c593c1 100644 --- a/tests/OrdMultiSet_Test.dsp +++ b/tests/OrdMultiSet_Test.dsp @@ -94,13 +94,13 @@ LINK32=link.exe # PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "."
-# PROP Intermediate_Dir "./ETS_DLL/Debug"
+# PROP Intermediate_Dir ".\ETS_LIB\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir "OrdMultiSet_Test"
CPP=cl.exe
# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -110,7 +110,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /out:"./OrdMultiSet_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
+# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./OrdMultiSet_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
# SUBTRACT LINK32 /pdb:none
!ENDIF
diff --git a/tests/Pipe_Test.dsp b/tests/Pipe_Test.dsp index 6b35117127e..27618a64644 100644 --- a/tests/Pipe_Test.dsp +++ b/tests/Pipe_Test.dsp @@ -94,13 +94,13 @@ LINK32=link.exe # PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "."
-# PROP Intermediate_Dir "./ETS_DLL/Debug"
+# PROP Intermediate_Dir ".\ETS_LIB\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir "Pipe_Test"
CPP=cl.exe
# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -110,7 +110,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Pipe_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
+# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Pipe_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
# SUBTRACT LINK32 /pdb:none
!ENDIF
diff --git a/tests/Priority_Buffer_Test.dsp b/tests/Priority_Buffer_Test.dsp index 566e17d56d7..008126d39b7 100644 --- a/tests/Priority_Buffer_Test.dsp +++ b/tests/Priority_Buffer_Test.dsp @@ -94,13 +94,13 @@ LINK32=link.exe # PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "."
-# PROP Intermediate_Dir "./ETS_DLL/Debug"
+# PROP Intermediate_Dir ".\ETS_LIB\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir "Priority_Buffer_Test"
CPP=cl.exe
# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -110,7 +110,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Priority_Buffer_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
+# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Priority_Buffer_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
# SUBTRACT LINK32 /pdb:none
!ENDIF
diff --git a/tests/Priority_Reactor_Test.dsp b/tests/Priority_Reactor_Test.dsp index d3f1832232e..432971f992b 100644 --- a/tests/Priority_Reactor_Test.dsp +++ b/tests/Priority_Reactor_Test.dsp @@ -94,13 +94,13 @@ LINK32=link.exe # PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "."
-# PROP Intermediate_Dir "./ETS_DLL/Debug"
+# PROP Intermediate_Dir ".\ETS_LIB\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
CPP=cl.exe
# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "_MBCS" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -110,7 +110,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"
-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Priority_Reactor_Test_ETS.exe" /pdbtype:sept /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
+# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Priority_Reactor_Test_ETS.exe" /pdbtype:sept /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
# SUBTRACT LINK32 /pdb:none
!ENDIF
diff --git a/tests/Priority_Task_Test.dsp b/tests/Priority_Task_Test.dsp index 1e58e6dbd40..39d76d8c2df 100644 --- a/tests/Priority_Task_Test.dsp +++ b/tests/Priority_Task_Test.dsp @@ -94,13 +94,13 @@ LINK32=link.exe # PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "."
-# PROP Intermediate_Dir "./ETS_DLL/Debug"
+# PROP Intermediate_Dir ".\ETS_LIB\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir "Priority_Task_Test"
CPP=cl.exe
# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -110,7 +110,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Priority_Task_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
+# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Priority_Task_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
# SUBTRACT LINK32 /pdb:none
!ENDIF
diff --git a/tests/Process_Mutex_Test.dsp b/tests/Process_Mutex_Test.dsp index fdb101c5d48..a3b97aef63d 100644 --- a/tests/Process_Mutex_Test.dsp +++ b/tests/Process_Mutex_Test.dsp @@ -94,13 +94,13 @@ LINK32=link.exe # PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "."
-# PROP Intermediate_Dir "./ETS_DLL/Debug"
+# PROP Intermediate_Dir ".\ETS_LIB\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir "Process_Mutex_Test"
CPP=cl.exe
# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -110,7 +110,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Process_Mutex_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
+# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Process_Mutex_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
# SUBTRACT LINK32 /pdb:none
!ENDIF
diff --git a/tests/Process_Strategy_Test.dsp b/tests/Process_Strategy_Test.dsp index 235b948cd52..ee5311aa4ec 100644 --- a/tests/Process_Strategy_Test.dsp +++ b/tests/Process_Strategy_Test.dsp @@ -94,13 +94,13 @@ LINK32=link.exe # PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "."
-# PROP Intermediate_Dir "./ETS_DLL/Debug"
+# PROP Intermediate_Dir ".\ETS_LIB\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir "Process_Strategy_Test"
CPP=cl.exe
# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -110,7 +110,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Process_Strategy_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
+# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Process_Strategy_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
# SUBTRACT LINK32 /pdb:none
!ENDIF
diff --git a/tests/RB_Tree_Test.dsp b/tests/RB_Tree_Test.dsp index df37e086496..597c7471a12 100644 --- a/tests/RB_Tree_Test.dsp +++ b/tests/RB_Tree_Test.dsp @@ -94,13 +94,13 @@ LINK32=link.exe # PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "."
-# PROP Intermediate_Dir "./ETS_DLL/Debug"
+# PROP Intermediate_Dir ".\ETS_LIB\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
CPP=cl.exe
# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -110,7 +110,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"
-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /out:"./RB_Tree_Test_ETS.exe" /pdbtype:sept /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
+# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./RB_Tree_Test_ETS.exe" /pdbtype:sept /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
# SUBTRACT LINK32 /pdb:none
!ENDIF
diff --git a/tests/Reactor_Exceptions_Test.dsp b/tests/Reactor_Exceptions_Test.dsp index 7f0154e4827..9488855d57d 100644 --- a/tests/Reactor_Exceptions_Test.dsp +++ b/tests/Reactor_Exceptions_Test.dsp @@ -94,13 +94,13 @@ LINK32=link.exe # PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "."
-# PROP Intermediate_Dir "./ETS_DLL/Debug"
+# PROP Intermediate_Dir ".\ETS_LIB\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir "Reactor_Exceptions_Test"
CPP=cl.exe
# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -110,7 +110,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Reactor_Exceptions_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
+# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Reactor_Exceptions_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
# SUBTRACT LINK32 /pdb:none
!ENDIF
diff --git a/tests/Reactor_Notify_Test.dsp b/tests/Reactor_Notify_Test.dsp index af0b7166ada..65242b86f93 100644 --- a/tests/Reactor_Notify_Test.dsp +++ b/tests/Reactor_Notify_Test.dsp @@ -94,13 +94,13 @@ LINK32=link.exe # PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "."
-# PROP Intermediate_Dir "./ETS_DLL/Debug"
+# PROP Intermediate_Dir ".\ETS_LIB\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir "Reactor_Notify_Test"
CPP=cl.exe
# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -110,7 +110,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Reactor_Notify_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
+# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Reactor_Notify_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
# SUBTRACT LINK32 /pdb:none
!ENDIF
diff --git a/tests/Reactor_Performance_Test.dsp b/tests/Reactor_Performance_Test.dsp index 556d9315153..25a849ec724 100644 --- a/tests/Reactor_Performance_Test.dsp +++ b/tests/Reactor_Performance_Test.dsp @@ -94,13 +94,13 @@ LINK32=link.exe # PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "."
-# PROP Intermediate_Dir "./ETS_DLL/Debug"
+# PROP Intermediate_Dir ".\ETS_LIB\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
CPP=cl.exe
# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I ".." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I ".." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "_MBCS" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -110,7 +110,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"
-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Reactor_Performance_Test_ETS.exe" /pdbtype:sept /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
+# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Reactor_Performance_Test_ETS.exe" /pdbtype:sept /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
# SUBTRACT LINK32 /pdb:none
!ENDIF
diff --git a/tests/Reactor_Timer_Test.dsp b/tests/Reactor_Timer_Test.dsp index 90ef64a22a6..11b90d10433 100644 --- a/tests/Reactor_Timer_Test.dsp +++ b/tests/Reactor_Timer_Test.dsp @@ -94,13 +94,13 @@ LINK32=link.exe # PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "."
-# PROP Intermediate_Dir "./ETS_DLL/Debug"
+# PROP Intermediate_Dir ".\ETS_LIB\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir "Reactor_Timer_Test"
CPP=cl.exe
# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -110,7 +110,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Reactor_Timer_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
+# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Reactor_Timer_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
# SUBTRACT LINK32 /pdb:none
!ENDIF
diff --git a/tests/Reactors_Test.dsp b/tests/Reactors_Test.dsp index b2faae80de8..639702d3425 100644 --- a/tests/Reactors_Test.dsp +++ b/tests/Reactors_Test.dsp @@ -94,13 +94,13 @@ LINK32=link.exe # PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "."
-# PROP Intermediate_Dir "./ETS_DLL/Debug"
+# PROP Intermediate_Dir ".\ETS_LIB\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir "Reactors_Test"
CPP=cl.exe
# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -110,7 +110,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Reactors_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
+# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Reactors_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
# SUBTRACT LINK32 /pdb:none
!ENDIF
diff --git a/tests/Reader_Writer_Test.dsp b/tests/Reader_Writer_Test.dsp index 83741b9e569..094092618dd 100644 --- a/tests/Reader_Writer_Test.dsp +++ b/tests/Reader_Writer_Test.dsp @@ -94,13 +94,13 @@ LINK32=link.exe # PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "."
-# PROP Intermediate_Dir "./ETS_DLL/Debug"
+# PROP Intermediate_Dir ".\ETS_LIB\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir "Reader_Writer_Test"
CPP=cl.exe
# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -110,7 +110,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Reader_Writer_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
+# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Reader_Writer_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
# SUBTRACT LINK32 /pdb:none
!ENDIF
diff --git a/tests/Recursive_Mutex_Test.dsp b/tests/Recursive_Mutex_Test.dsp index 0fc2a1f1004..6117cce0dc0 100644 --- a/tests/Recursive_Mutex_Test.dsp +++ b/tests/Recursive_Mutex_Test.dsp @@ -94,13 +94,13 @@ LINK32=link.exe # PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "."
-# PROP Intermediate_Dir "./ETS_DLL/Debug"
+# PROP Intermediate_Dir ".\ETS_LIB\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir "Recursive_Mutex_Test"
CPP=cl.exe
# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -110,7 +110,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Recursive_Mutex_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
+# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Recursive_Mutex_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
# SUBTRACT LINK32 /pdb:none
!ENDIF
diff --git a/tests/Reverse_Lock_Test.dsp b/tests/Reverse_Lock_Test.dsp index fb43a209ce5..671cb750973 100644 --- a/tests/Reverse_Lock_Test.dsp +++ b/tests/Reverse_Lock_Test.dsp @@ -63,11 +63,12 @@ LINK32=link.exe # PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "."
-# PROP Intermediate_Dir "./ETS_DLL/Debug"
+# PROP Intermediate_Dir ".\ETS_LIB\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c
+# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
@@ -75,7 +76,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"
-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Reverse_Lock_Test_ETS.exe" /pdbtype:sept /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
+# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Reverse_Lock_Test_ETS.exe" /pdbtype:sept /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
# SUBTRACT LINK32 /pdb:none
!ENDIF
diff --git a/tests/SOCK_Connector_Test.dsp b/tests/SOCK_Connector_Test.dsp index 535ece933c5..c8b21ce7018 100644 --- a/tests/SOCK_Connector_Test.dsp +++ b/tests/SOCK_Connector_Test.dsp @@ -66,12 +66,12 @@ LINK32=link.exe # PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "."
-# PROP Intermediate_Dir "./ETS_DLL/Debug"
+# PROP Intermediate_Dir ".\ETS_LIB\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir "SOCK_Connector_Test"
# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -80,7 +80,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /out:"./SOCK_Connector_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
+# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./SOCK_Connector_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
# SUBTRACT LINK32 /pdb:none
!ENDIF
diff --git a/tests/SOCK_Send_Recv_Test.cpp b/tests/SOCK_Send_Recv_Test.cpp index b458f56528a..a8f19e8e673 100644 --- a/tests/SOCK_Send_Recv_Test.cpp +++ b/tests/SOCK_Send_Recv_Test.cpp @@ -47,7 +47,7 @@ client (void *arg) { ACE_INET_Addr * remote_addr = (ACE_INET_Addr *) arg; ACE_INET_Addr server_addr (remote_addr->get_port_number (), - ASYS_TEXT ("localhost")); + ACE_LOCALHOST); ACE_SOCK_Stream cli_stream; ACE_SOCK_Connector con; ACE_Time_Value timeout (ACE_DEFAULT_TIMEOUT); diff --git a/tests/SOCK_Send_Recv_Test.dsp b/tests/SOCK_Send_Recv_Test.dsp index fcc400223ae..69063cf3034 100644 --- a/tests/SOCK_Send_Recv_Test.dsp +++ b/tests/SOCK_Send_Recv_Test.dsp @@ -64,12 +64,12 @@ LINK32=link.exe # PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "."
-# PROP Intermediate_Dir "./ETS_DLL/Debug"
+# PROP Intermediate_Dir ".\ETS_LIB\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -78,7 +78,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /out:"./SOCK_Send_Recv_Test.exe" /pdbtype:sept /libpath:"..\ace"
-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /out:"./SOCK_Send_Recv_Test_ETS.exe" /pdbtype:sept /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
+# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./SOCK_Send_Recv_Test_ETS.exe" /pdbtype:sept /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
# SUBTRACT LINK32 /pdb:none
!ENDIF
diff --git a/tests/SOCK_Test.dsp b/tests/SOCK_Test.dsp index 94966d7bbdc..ccfbba5b06e 100644 --- a/tests/SOCK_Test.dsp +++ b/tests/SOCK_Test.dsp @@ -94,13 +94,13 @@ LINK32=link.exe # PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "."
-# PROP Intermediate_Dir "./ETS_DLL/Debug"
+# PROP Intermediate_Dir ".\ETS_LIB\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir "SOCK_Test"
CPP=cl.exe
# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -110,7 +110,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /out:"./SOCK_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
+# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./SOCK_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
# SUBTRACT LINK32 /pdb:none
!ENDIF
diff --git a/tests/SPIPE_Test.dsp b/tests/SPIPE_Test.dsp index 4875b3e910c..ce5bae020e9 100644 --- a/tests/SPIPE_Test.dsp +++ b/tests/SPIPE_Test.dsp @@ -94,13 +94,13 @@ LINK32=link.exe # PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "."
-# PROP Intermediate_Dir "./ETS_DLL/Debug"
+# PROP Intermediate_Dir ".\ETS_LIB\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir "SPIPE_Test"
CPP=cl.exe
# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -110,7 +110,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /out:"./SPIPE_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
+# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./SPIPE_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
# SUBTRACT LINK32 /pdb:none
!ENDIF
diff --git a/tests/SString_Test.dsp b/tests/SString_Test.dsp index 7d9ed4002f9..67efd24cf45 100644 --- a/tests/SString_Test.dsp +++ b/tests/SString_Test.dsp @@ -94,13 +94,13 @@ LINK32=link.exe # PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "."
-# PROP Intermediate_Dir "./ETS_DLL/Debug"
+# PROP Intermediate_Dir ".\ETS_LIB\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir "SString_Test"
CPP=cl.exe
# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -110,7 +110,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /out:"./SString_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
+# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./SString_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
# SUBTRACT LINK32 /pdb:none
!ENDIF
diff --git a/tests/SV_Shared_Memory_Test.dsp b/tests/SV_Shared_Memory_Test.dsp index 13fec5a896b..c1878793d42 100644 --- a/tests/SV_Shared_Memory_Test.dsp +++ b/tests/SV_Shared_Memory_Test.dsp @@ -94,13 +94,13 @@ LINK32=link.exe # PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "."
-# PROP Intermediate_Dir "./ETS_DLL/Debug"
+# PROP Intermediate_Dir ".\ETS_LIB\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir "SV_Shared_Memory_Test"
CPP=cl.exe
# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -110,7 +110,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /out:"./SV_Shared_Memory_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
+# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./SV_Shared_Memory_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
# SUBTRACT LINK32 /pdb:none
!ENDIF
diff --git a/tests/Semaphore_Test.dsp b/tests/Semaphore_Test.dsp index b8c02a35904..c4fe806b463 100644 --- a/tests/Semaphore_Test.dsp +++ b/tests/Semaphore_Test.dsp @@ -94,13 +94,13 @@ LINK32=link.exe # PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "."
-# PROP Intermediate_Dir "./ETS_DLL/Debug"
+# PROP Intermediate_Dir ".\ETS_LIB\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
CPP=cl.exe
# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -110,7 +110,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"
-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Semaphore_Test_ETS.exe" /pdbtype:sept /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
+# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Semaphore_Test_ETS.exe" /pdbtype:sept /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
# SUBTRACT LINK32 /pdb:none
!ENDIF
diff --git a/tests/Service_Config_Test.dsp b/tests/Service_Config_Test.dsp index 65a6754343c..e727f4a99c2 100644 --- a/tests/Service_Config_Test.dsp +++ b/tests/Service_Config_Test.dsp @@ -94,13 +94,13 @@ LINK32=link.exe # PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "."
-# PROP Intermediate_Dir "./ETS_DLL/Debug"
+# PROP Intermediate_Dir ".\ETS_LIB\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir "Service_Config_Test"
CPP=cl.exe
# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -110,7 +110,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Service_Config_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
+# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Service_Config_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
# SUBTRACT LINK32 /pdb:none
!ENDIF
diff --git a/tests/Sigset_Ops_Test.dsp b/tests/Sigset_Ops_Test.dsp index 6598939eea3..42194db0df1 100644 --- a/tests/Sigset_Ops_Test.dsp +++ b/tests/Sigset_Ops_Test.dsp @@ -94,13 +94,13 @@ LINK32=link.exe # PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "."
-# PROP Intermediate_Dir "./ETS_DLL/Debug"
+# PROP Intermediate_Dir ".\ETS_LIB\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir "Sigset_Ops_Test"
CPP=cl.exe
# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -110,7 +110,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Sigset_Ops_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
+# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Sigset_Ops_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
# SUBTRACT LINK32 /pdb:none
!ENDIF
diff --git a/tests/Simple_Message_Block_Test.dsp b/tests/Simple_Message_Block_Test.dsp index 0c41e0e2adc..a5a155e5ce5 100644 --- a/tests/Simple_Message_Block_Test.dsp +++ b/tests/Simple_Message_Block_Test.dsp @@ -94,13 +94,13 @@ LINK32=link.exe # PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "."
-# PROP Intermediate_Dir "./ETS_DLL/Debug"
+# PROP Intermediate_Dir ".\ETS_LIB\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir "Simple_Message_Block_Test"
CPP=cl.exe
# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -110,7 +110,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Simple_Message_Block_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
+# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Simple_Message_Block_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
# SUBTRACT LINK32 /pdb:none
!ENDIF
diff --git a/tests/Svc_Handler_Test.dsp b/tests/Svc_Handler_Test.dsp index 056f1551342..74749471720 100644 --- a/tests/Svc_Handler_Test.dsp +++ b/tests/Svc_Handler_Test.dsp @@ -94,13 +94,13 @@ LINK32=link.exe # PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "."
-# PROP Intermediate_Dir "./ETS_DLL/Debug"
+# PROP Intermediate_Dir ".\ETS_LIB\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir "Svc_Handler_Test"
CPP=cl.exe
# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -110,7 +110,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Svc_Handler_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
+# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Svc_Handler_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
# SUBTRACT LINK32 /pdb:none
!ENDIF
diff --git a/tests/TSS_Test.dsp b/tests/TSS_Test.dsp index 4648165f8e6..88a5b9297cf 100644 --- a/tests/TSS_Test.dsp +++ b/tests/TSS_Test.dsp @@ -94,13 +94,13 @@ LINK32=link.exe # PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "."
-# PROP Intermediate_Dir "./ETS_DLL/Debug"
+# PROP Intermediate_Dir ".\ETS_LIB\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir "TSS_Test"
CPP=cl.exe
# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -110,7 +110,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /out:"./TSS_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
+# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./TSS_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
# SUBTRACT LINK32 /pdb:none
!ENDIF
diff --git a/tests/Task_Test.dsp b/tests/Task_Test.dsp index c592a50aa57..bd504437729 100644 --- a/tests/Task_Test.dsp +++ b/tests/Task_Test.dsp @@ -94,13 +94,13 @@ LINK32=link.exe # PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "."
-# PROP Intermediate_Dir "./ETS_DLL/Debug"
+# PROP Intermediate_Dir ".\ETS_LIB\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir "Task_Test"
CPP=cl.exe
# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -110,7 +110,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Task_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
+# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Task_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
# SUBTRACT LINK32 /pdb:none
!ENDIF
diff --git a/tests/Thread_Manager_Test.dsp b/tests/Thread_Manager_Test.dsp index f44eeccbdb2..c471c079905 100644 --- a/tests/Thread_Manager_Test.dsp +++ b/tests/Thread_Manager_Test.dsp @@ -94,13 +94,13 @@ LINK32=link.exe # PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "."
-# PROP Intermediate_Dir "./ETS_DLL/Debug"
+# PROP Intermediate_Dir ".\ETS_LIB\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir "Thread_Manager_Test"
CPP=cl.exe
# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -110,7 +110,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Thread_Manager_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
+# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Thread_Manager_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
# SUBTRACT LINK32 /pdb:none
!ENDIF
diff --git a/tests/Thread_Mutex_Test.dsp b/tests/Thread_Mutex_Test.dsp index 6a5361fe151..4e3631aca14 100644 --- a/tests/Thread_Mutex_Test.dsp +++ b/tests/Thread_Mutex_Test.dsp @@ -63,11 +63,12 @@ LINK32=link.exe # PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "."
-# PROP Intermediate_Dir "./ETS_DLL/Debug"
+# PROP Intermediate_Dir ".\ETS_LIB\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c
+# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
@@ -75,7 +76,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"
-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Thread_Mutex_Test_ETS.exe" /pdbtype:sept /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
+# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Thread_Mutex_Test_ETS.exe" /pdbtype:sept /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
# SUBTRACT LINK32 /pdb:none
!ENDIF
diff --git a/tests/Thread_Pool_Reactor_Test.dsp b/tests/Thread_Pool_Reactor_Test.dsp index f009e58c9d5..b254a4c8a85 100644 --- a/tests/Thread_Pool_Reactor_Test.dsp +++ b/tests/Thread_Pool_Reactor_Test.dsp @@ -94,13 +94,13 @@ LINK32=link.exe # PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "."
-# PROP Intermediate_Dir "./ETS_DLL/Debug"
+# PROP Intermediate_Dir ".\ETS_LIB\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
CPP=cl.exe
# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -110,7 +110,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"
-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Thread_Pool_Reactor_Test_ETS.exe" /pdbtype:sept /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
+# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Thread_Pool_Reactor_Test_ETS.exe" /pdbtype:sept /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
# SUBTRACT LINK32 /pdb:none
!ENDIF
diff --git a/tests/Thread_Pool_Test.dsp b/tests/Thread_Pool_Test.dsp index f0362996647..a525b25d1a2 100644 --- a/tests/Thread_Pool_Test.dsp +++ b/tests/Thread_Pool_Test.dsp @@ -94,13 +94,13 @@ LINK32=link.exe # PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "."
-# PROP Intermediate_Dir "./ETS_DLL/Debug"
+# PROP Intermediate_Dir ".\ETS_LIB\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir "Thread_Pool_Test"
CPP=cl.exe
# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -110,7 +110,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Thread_Pool_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
+# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Thread_Pool_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
# SUBTRACT LINK32 /pdb:none
!ENDIF
diff --git a/tests/Time_Service_Test.dsp b/tests/Time_Service_Test.dsp index 2f802d4da23..eecdd2c504a 100644 --- a/tests/Time_Service_Test.dsp +++ b/tests/Time_Service_Test.dsp @@ -94,13 +94,13 @@ LINK32=link.exe # PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "."
-# PROP Intermediate_Dir "./ETS_DLL/Debug"
+# PROP Intermediate_Dir ".\ETS_LIB\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir "Time_Service_Test"
CPP=cl.exe
# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -110,7 +110,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Time_Service_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
+# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Time_Service_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
# SUBTRACT LINK32 /pdb:none
!ENDIF
diff --git a/tests/Time_Value_Test.dsp b/tests/Time_Value_Test.dsp index 9be8e800630..540632e9ce4 100644 --- a/tests/Time_Value_Test.dsp +++ b/tests/Time_Value_Test.dsp @@ -94,13 +94,13 @@ LINK32=link.exe # PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "."
-# PROP Intermediate_Dir "./ETS_DLL/Debug"
+# PROP Intermediate_Dir ".\ETS_LIB\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir "Time_Value_Test"
CPP=cl.exe
# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -110,7 +110,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Time_Value_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
+# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Time_Value_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
# SUBTRACT LINK32 /pdb:none
!ENDIF
diff --git a/tests/Timeprobe_Test.dsp b/tests/Timeprobe_Test.dsp index 30a84728f74..0371ce07940 100644 --- a/tests/Timeprobe_Test.dsp +++ b/tests/Timeprobe_Test.dsp @@ -64,11 +64,12 @@ LINK32=link.exe # PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "."
-# PROP Intermediate_Dir "./ETS_DLL/Debug"
+# PROP Intermediate_Dir ".\ETS_LIB\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c
+# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
@@ -77,7 +78,7 @@ BSC32=bscmake.exe LINK32=link.exe
# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"
# SUBTRACT BASE LINK32 /pdb:none
-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Timeprobe_Test_ETS.exe" /pdbtype:sept /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
+# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Timeprobe_Test_ETS.exe" /pdbtype:sept /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
# SUBTRACT LINK32 /pdb:none
!ENDIF
diff --git a/tests/Timer_Queue_Test.dsp b/tests/Timer_Queue_Test.dsp index 13d4cae0047..892ae5afdcf 100644 --- a/tests/Timer_Queue_Test.dsp +++ b/tests/Timer_Queue_Test.dsp @@ -94,13 +94,13 @@ LINK32=link.exe # PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "."
-# PROP Intermediate_Dir "./ETS_DLL/Debug"
+# PROP Intermediate_Dir ".\ETS_LIB\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir "Timer_Queue_Test"
CPP=cl.exe
# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -110,7 +110,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Timer_Queue_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
+# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Timer_Queue_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
# SUBTRACT LINK32 /pdb:none
!ENDIF
diff --git a/tests/Tokens_Test.dsp b/tests/Tokens_Test.dsp index e1a857995f7..d407a8937d9 100644 --- a/tests/Tokens_Test.dsp +++ b/tests/Tokens_Test.dsp @@ -94,13 +94,13 @@ LINK32=link.exe # PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "."
-# PROP Intermediate_Dir "./ETS_DLL/Debug"
+# PROP Intermediate_Dir ".\ETS_LIB\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir "Tokens_Test"
CPP=cl.exe
# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -110,7 +110,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Tokens_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
+# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Tokens_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
# SUBTRACT LINK32 /pdb:none
!ENDIF
diff --git a/tests/UPIPE_SAP_Test.dsp b/tests/UPIPE_SAP_Test.dsp index ba39ebd4d5c..192c018820b 100644 --- a/tests/UPIPE_SAP_Test.dsp +++ b/tests/UPIPE_SAP_Test.dsp @@ -94,13 +94,13 @@ LINK32=link.exe # PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "."
-# PROP Intermediate_Dir "./ETS_DLL/Debug"
+# PROP Intermediate_Dir ".\ETS_LIB\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir "UPIPE_SAP_Test"
CPP=cl.exe
# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -110,7 +110,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /out:"./UPIPE_SAP_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
+# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./UPIPE_SAP_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
# SUBTRACT LINK32 /pdb:none
!ENDIF
diff --git a/tests/Upgradable_RW_Test.dsp b/tests/Upgradable_RW_Test.dsp index 7b26c2e413f..a993d5e5519 100644 --- a/tests/Upgradable_RW_Test.dsp +++ b/tests/Upgradable_RW_Test.dsp @@ -63,11 +63,12 @@ LINK32=link.exe # PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "."
-# PROP Intermediate_Dir "./ETS_DLL/Debug"
+# PROP Intermediate_Dir ".\ETS_LIB\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c
+# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
@@ -75,7 +76,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"
-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Upgradable_RW_Test_ETS.exe" /pdbtype:sept /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
+# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Upgradable_RW_Test_ETS.exe" /pdbtype:sept /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
# SUBTRACT LINK32 /pdb:none
!ENDIF
|