diff options
51 files changed, 5380 insertions, 304 deletions
diff --git a/ChangeLog-97b b/ChangeLog-97b index 9ed02f1ab96..62a724a30da 100644 --- a/ChangeLog-97b +++ b/ChangeLog-97b @@ -1,3 +1,13 @@ +Sun Nov 16 21:58:51 1997 Darrell Brunsch <brunsch@cs.wustl.edu> + + * tests/*.dsp, ace/*.dsp: Added Release, Unicode Debug, and + Unicode Release versions for each of the tests. + + Also found out that precompiled headers take up insane + amounts of disk space when used with ACE and also slows + the compilation down. I turned it off for the tests and + for the ace libraries + Sun Nov 16 13:34:29 1997 Douglas C. Schmidt <schmidt@merengue.cs.wustl.edu> * tests/SOCK_Connector_Test.cpp (fail_no_listener_nonblocking): diff --git a/ace/ace_dll.dsp b/ace/ace_dll.dsp index bba01aa1025..6359be1b526 100644 --- a/ace/ace_dll.dsp +++ b/ace/ace_dll.dsp @@ -56,7 +56,8 @@ CFG=ACE dynamic library - Win32 Alpha Unicode Debug # PROP Target_Dir ""
CPP=cl.exe
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /G5 /MDd /W3 /Gm /GX /Zi /Od /Gy /I "..\STL" /I "..\\" /D ACE_HAS_DLL=1 /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /G5 /MDd /W3 /Gm /GX /Zi /Od /Gy /I "..\STL" /I "..\\" /D ACE_HAS_DLL=1 /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /FD /c
+# SUBTRACT CPP /YX /Yc /Yu
MTL=midl.exe
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
@@ -86,7 +87,8 @@ LINK32=link.exe # PROP Target_Dir ""
CPP=cl.exe
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /G5 /MD /W3 /GX /O2 /Ob2 /I "..\STL" /I "..\\" /D ACE_HAS_DLL=1 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /G5 /MD /W3 /GX /O2 /Ob2 /I "..\STL" /I "..\\" /D ACE_HAS_DLL=1 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /FD /c
+# SUBTRACT CPP /YX
MTL=midl.exe
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
@@ -116,7 +118,8 @@ LINK32=link.exe # PROP Target_Dir ""
CPP=cl.exe
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /G5 /MDd /W3 /Gm /GX /Zi /Od /Gy /I "..\STL" /I "..\\" /D ACE_HAS_DLL=1 /D "_DEBUG" /D "UNICODE" /D "WIN32" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /G5 /MDd /W3 /Gm /GX /Zi /Od /Gy /I "..\STL" /I "..\\" /D ACE_HAS_DLL=1 /D "_DEBUG" /D "UNICODE" /D "WIN32" /D "_WINDOWS" /FD /c
+# SUBTRACT CPP /YX
MTL=midl.exe
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
@@ -146,7 +149,8 @@ LINK32=link.exe # PROP Target_Dir ""
CPP=cl.exe
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /G5 /MD /W3 /GX /O2 /Ob2 /I "..\STL" /I "..\\" /D ACE_HAS_DLL=1 /D "NDEBUG" /D "UNICODE" /D "WIN32" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /G5 /MD /W3 /GX /O2 /Ob2 /I "..\STL" /I "..\\" /D ACE_HAS_DLL=1 /D "NDEBUG" /D "UNICODE" /D "WIN32" /D "_WINDOWS" /FD /c
+# SUBTRACT CPP /YX
MTL=midl.exe
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
@@ -180,7 +184,8 @@ MTL=midl.exe # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
CPP=cl.exe
# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /Gy /I "..\STL" /I "..\\" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D ACE_HAS_DLL=1 /YX /FD /MTd /c
-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /Gy /I "..\STL" /I "..\\" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D ACE_HAS_DLL=1 /YX /FD /MDd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /Gy /I "..\STL" /I "..\\" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D ACE_HAS_DLL=1 /FD /MDd /c
+# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -212,7 +217,8 @@ MTL=midl.exe # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
CPP=cl.exe
# ADD BASE CPP /nologo /MT /Gt0 /W3 /GX /O2 /Ob2 /I "..\STL" /I "..\\" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D ACE_HAS_DLL=1 /YX /FD /c
-# ADD CPP /nologo /MD /Gt0 /W3 /GX /O2 /Ob2 /I "..\STL" /I "..\\" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D ACE_HAS_DLL=1 /YX /FD /c
+# ADD CPP /nologo /MD /Gt0 /W3 /GX /O2 /Ob2 /I "..\STL" /I "..\\" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D ACE_HAS_DLL=1 /FD /c
+# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -244,7 +250,8 @@ MTL=midl.exe # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
CPP=cl.exe
# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /Gy /I "..\STL" /I "..\\" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D ACE_HAS_DLL=1 /D "UNICODE" /YX /FD /MTd /c
-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /Gy /I "..\STL" /I "..\\" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D ACE_HAS_DLL=1 /D "UNICODE" /YX /FD /MDd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /Gy /I "..\STL" /I "..\\" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D ACE_HAS_DLL=1 /D "UNICODE" /FD /MDd /c
+# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -276,7 +283,8 @@ MTL=midl.exe # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
CPP=cl.exe
# ADD BASE CPP /nologo /MT /Gt0 /W3 /GX /O2 /Ob2 /I "..\STL" /I "..\\" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D ACE_HAS_DLL=1 /D "UNICODE" /YX /FD /c
-# ADD CPP /nologo /MD /Gt0 /W3 /GX /O2 /Ob2 /I "..\STL" /I "..\\" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D ACE_HAS_DLL=1 /D "UNICODE" /YX /FD /c
+# ADD CPP /nologo /MD /Gt0 /W3 /GX /O2 /Ob2 /I "..\STL" /I "..\\" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D ACE_HAS_DLL=1 /D "UNICODE" /FD /c
+# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
diff --git a/ace/ace_lib.dsp b/ace/ace_lib.dsp index 39e34490513..cb21c8309b3 100644 --- a/ace/ace_lib.dsp +++ b/ace/ace_lib.dsp @@ -55,7 +55,8 @@ CFG=ACE static library - Win32 Alpha Unicode Debug # PROP Target_Dir ""
CPP=cl.exe
# ADD BASE CPP /nologo /G5 /MTd /W3 /Gm /GX /Zi /Od /Gy /I "..\STL" /I "..\\" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /YX /FD /c
-# ADD CPP /nologo /G5 /MTd /W3 /Gm /GX /Zi /Od /Gy /I "..\STL" /I "..\\" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /G5 /MTd /W3 /Gm /GX /Zi /Od /Gy /I "..\STL" /I "..\\" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /FD /c
+# SUBTRACT CPP /YX
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo /o"ace.bsc"
# ADD BSC32 /nologo /o".\ace.bsc"
@@ -77,7 +78,8 @@ LIB32=link.exe -lib # PROP Target_Dir ""
CPP=cl.exe
# ADD BASE CPP /nologo /G5 /MT /W3 /GX /O1 /I "..\STL" /I "..\\" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /YX /FD /c
-# ADD CPP /nologo /G5 /MT /W3 /GX /O1 /I "..\STL" /I "..\\" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /G5 /MT /W3 /GX /O1 /I "..\STL" /I "..\\" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /FD /c
+# SUBTRACT CPP /YX
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo /o"ace.bsc"
# ADD BSC32 /nologo /o".\ace.bsc"
@@ -99,7 +101,8 @@ LIB32=link.exe -lib # PROP Target_Dir ""
CPP=cl.exe
# ADD BASE CPP /nologo /G5 /MTd /W3 /Gm /GX /Zi /Od /Gy /I "..\STL" /I "..\\" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /YX /FD /c
-# ADD CPP /nologo /G5 /MTd /W3 /Gm /GX /Zi /Od /Gy /I "..\STL" /I "..\\" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "_DEBUG" /D "UNICODE" /D "WIN32" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /G5 /MTd /W3 /Gm /GX /Zi /Od /Gy /I "..\STL" /I "..\\" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "_DEBUG" /D "UNICODE" /D "WIN32" /D "_WINDOWS" /FD /c
+# SUBTRACT CPP /YX
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo /o"ace.bsc"
# ADD BSC32 /nologo /o".\ace.bsc"
@@ -121,7 +124,8 @@ LIB32=link.exe -lib # PROP Target_Dir ""
CPP=cl.exe
# ADD BASE CPP /nologo /G5 /MT /W3 /GX /O1 /I "..\STL" /I "..\\" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /YX /FD /c
-# ADD CPP /nologo /G5 /MT /W3 /GX /O1 /I "..\STL" /I "..\\" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "NDEBUG" /D "UNICODE" /D "WIN32" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /G5 /MT /W3 /GX /O1 /I "..\STL" /I "..\\" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "NDEBUG" /D "UNICODE" /D "WIN32" /D "_WINDOWS" /FD /c
+# SUBTRACT CPP /YX
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo /o"ace.bsc"
# ADD BSC32 /nologo /o".\ace.bsc"
@@ -143,7 +147,8 @@ LIB32=link.exe -lib # PROP Target_Dir ""
CPP=cl.exe
# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /Gy /I "..\STL" /I "..\\" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /Gy /I "..\STL" /I "..\\" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /Gy /I "..\STL" /I "..\\" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /MTd /c
+# SUBTRACT CPP /YX
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo /o".\ace.bsc"
# ADD BSC32 /nologo /o".\ace.bsc"
@@ -165,7 +170,8 @@ LIB32=link.exe -lib # PROP Target_Dir ""
CPP=cl.exe
# ADD BASE CPP /nologo /Gt0 /W3 /GX /O1 /I "..\STL" /I "..\\" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MT /Gt0 /W3 /GX /O1 /I "..\STL" /I "..\\" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /MT /Gt0 /W3 /GX /O1 /I "..\STL" /I "..\\" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c
+# SUBTRACT CPP /YX
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo /o".\ace.bsc"
# ADD BSC32 /nologo /o".\ace.bsc"
@@ -187,7 +193,8 @@ LIB32=link.exe -lib # PROP Target_Dir ""
CPP=cl.exe
# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /Gy /I "..\STL" /I "..\\" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "UNICODE" /YX /FD /c
-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /Gy /I "..\STL" /I "..\\" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "UNICODE" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /Gy /I "..\STL" /I "..\\" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "UNICODE" /FD /MTd /c
+# SUBTRACT CPP /YX
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo /o".\ace.bsc"
# ADD BSC32 /nologo /o".\ace.bsc"
@@ -209,7 +216,8 @@ LIB32=link.exe -lib # PROP Target_Dir ""
CPP=cl.exe
# ADD BASE CPP /nologo /Gt0 /W3 /GX /O1 /I "..\STL" /I "..\\" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "UNICODE" /YX /FD /c
-# ADD CPP /nologo /MT /Gt0 /W3 /GX /O1 /I "..\STL" /I "..\\" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "UNICODE" /YX /FD /c
+# ADD CPP /nologo /MT /Gt0 /W3 /GX /O1 /I "..\STL" /I "..\\" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "UNICODE" /FD /c
+# SUBTRACT CPP /YX
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo /o".\ace.bsc"
# ADD BSC32 /nologo /o".\ace.bsc"
diff --git a/tests/Atomic_Op_Test.dsp b/tests/Atomic_Op_Test.dsp index 1b0955bc04a..602e3cd5f3a 100644 --- a/tests/Atomic_Op_Test.dsp +++ b/tests/Atomic_Op_Test.dsp @@ -5,7 +5,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-CFG=Atomic_Op_Test - Win32 Alpha Debug
+CFG=Atomic_Op_Test - Win32 Unicode Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -14,7 +14,8 @@ CFG=Atomic_Op_Test - Win32 Alpha Debug !MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "Atomic_Op_Test.mak" CFG="Atomic_Op_Test - Win32 Alpha Debug"
+!MESSAGE NMAKE /f "Atomic_Op_Test.mak"\
+ CFG="Atomic_Op_Test - Win32 Unicode Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
@@ -22,6 +23,12 @@ CFG=Atomic_Op_Test - Win32 Alpha Debug "Win32 (x86) Console Application")
!MESSAGE "Atomic_Op_Test - Win32 Alpha Debug" (based on\
"Win32 (ALPHA) Console Application")
+!MESSAGE "Atomic_Op_Test - Win32 Release" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "Atomic_Op_Test - Win32 Unicode Debug" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "Atomic_Op_Test - Win32 Unicode Release" (based on\
+ "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
@@ -38,12 +45,13 @@ CFG=Atomic_Op_Test - Win32 Alpha Debug # PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "."
-# PROP Intermediate_Dir ".\Debug"
+# PROP Intermediate_Dir ".\DLL\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
CPP=cl.exe
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /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 /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
+# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -69,8 +77,9 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
CPP=cl.exe
-# ADD BASE CPP /nologo /MTd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /MDd /c
+# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -81,12 +90,103 @@ LINK32=link.exe # ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept /libpath:"..\ace"
# ADD LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept /libpath:"..\ace"
+!ELSEIF "$(CFG)" == "Atomic_Op_Test - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Atomic_O"
+# PROP BASE Intermediate_Dir "Atomic_O"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\DLL\Release"
+# PROP Intermediate_Dir ".\DLL\Release"
+# 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" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /FD /c
+# SUBTRACT CPP /Z<none> /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 odbc32.lib odbccp32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"
+# ADD LINK32 odbc32.lib odbccp32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
+# SUBTRACT LINK32 /debug /pdbtype:<none>
+
+!ELSEIF "$(CFG)" == "Atomic_Op_Test - Win32 Unicode Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Atomic_0"
+# PROP BASE Intermediate_Dir "Atomic_0"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\DLL\Unicode_Debug"
+# PROP Intermediate_Dir ".\DLL\Unicode_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" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
+# SUBTRACT CPP /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 odbc32.lib odbccp32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"
+# ADD LINK32 odbc32.lib odbccp32.lib aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"
+
+!ELSEIF "$(CFG)" == "Atomic_Op_Test - Win32 Unicode Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Atomic_O"
+# PROP BASE Intermediate_Dir "Atomic_O"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\DLL\Unicode_Release"
+# PROP Intermediate_Dir ".\DLL\Unicode_Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+CPP=cl.exe
+# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /FD /c
+# SUBTRACT BASE CPP /Z<none>
+# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
+# SUBTRACT CPP /Z<none> /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 odbc32.lib odbccp32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
+# SUBTRACT BASE LINK32 /debug /pdbtype:<none>
+# ADD LINK32 odbc32.lib odbccp32.lib aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
+# SUBTRACT LINK32 /debug /pdbtype:<none>
+
!ENDIF
# Begin Target
# Name "Atomic_Op_Test - Win32 Debug"
# Name "Atomic_Op_Test - Win32 Alpha Debug"
+# Name "Atomic_Op_Test - Win32 Release"
+# Name "Atomic_Op_Test - Win32 Unicode Debug"
+# Name "Atomic_Op_Test - Win32 Unicode Release"
# Begin Group "Source Files"
# PROP Default_Filter ".cpp"
@@ -141,6 +241,12 @@ DEP_CPP_ATOMI=\ ".\test_config.h"\
+!ELSEIF "$(CFG)" == "Atomic_Op_Test - Win32 Release"
+
+!ELSEIF "$(CFG)" == "Atomic_Op_Test - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "Atomic_Op_Test - Win32 Unicode Release"
+
!ENDIF
# End Source File
diff --git a/tests/Barrier_Test.dsp b/tests/Barrier_Test.dsp index 6575c889c95..4103bab533c 100644 --- a/tests/Barrier_Test.dsp +++ b/tests/Barrier_Test.dsp @@ -5,7 +5,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-CFG=Barrier_Test - Win32 Alpha Debug
+CFG=Barrier_Test - Win32 Unicode Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -14,7 +14,7 @@ CFG=Barrier_Test - Win32 Alpha Debug !MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "Barrier_Test.mak" CFG="Barrier_Test - Win32 Alpha Debug"
+!MESSAGE NMAKE /f "Barrier_Test.mak" CFG="Barrier_Test - Win32 Unicode Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
@@ -22,6 +22,12 @@ CFG=Barrier_Test - Win32 Alpha Debug "Win32 (x86) Console Application")
!MESSAGE "Barrier_Test - Win32 Alpha Debug" (based on\
"Win32 (ALPHA) Console Application")
+!MESSAGE "Barrier_Test - Win32 Release" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "Barrier_Test - Win32 Unicode Debug" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "Barrier_Test - Win32 Unicode Release" (based on\
+ "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
@@ -38,12 +44,13 @@ CFG=Barrier_Test - Win32 Alpha Debug # PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "."
-# PROP Intermediate_Dir ".\Debug"
+# PROP Intermediate_Dir ".\DLL\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Barrier_Test"
CPP=cl.exe
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD 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" /FD /c
+# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -69,8 +76,9 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir "Barrier_Test"
CPP=cl.exe
-# ADD BASE CPP /nologo /MTd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
+# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -81,12 +89,103 @@ LINK32=link.exe # ADD BASE LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
# ADD LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
+!ELSEIF "$(CFG)" == "Barrier_Test - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Barrier_Test\Debug"
+# PROP BASE Intermediate_Dir "Barrier_Test\Debug"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir "Barrier_Test"
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\DLL\Release"
+# PROP Intermediate_Dir ".\DLL\Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir "Barrier_Test"
+CPP=cl.exe
+# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /FD /c
+# SUBTRACT CPP /Z<none> /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 odbc32.lib odbccp32.lib wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
+# ADD LINK32 odbc32.lib odbccp32.lib wsock32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
+# SUBTRACT LINK32 /debug /pdbtype:<none>
+
+!ELSEIF "$(CFG)" == "Barrier_Test - Win32 Unicode Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Barrier_Test\Unicode Debug"
+# PROP BASE Intermediate_Dir "Barrier_Test\Unicode Debug"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir "Barrier_Test"
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\DLL\Unicode_Debug"
+# PROP Intermediate_Dir ".\DLL\Unicode_Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir "Barrier_Test"
+CPP=cl.exe
+# 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" /D "UNICODE" /FD /c
+# SUBTRACT CPP /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 odbc32.lib odbccp32.lib wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
+# ADD LINK32 odbc32.lib odbccp32.lib wsock32.lib aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
+
+!ELSEIF "$(CFG)" == "Barrier_Test - Win32 Unicode Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Barrier_Test\Unicode Release"
+# PROP BASE Intermediate_Dir "Barrier_Test\Unicode Release"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir "Barrier_Test"
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\DLL\Unicode_Release"
+# PROP Intermediate_Dir ".\DLL\Unicode_Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir "Barrier_Test"
+CPP=cl.exe
+# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /FD /c
+# SUBTRACT BASE CPP /Z<none>
+# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
+# SUBTRACT CPP /Z<none> /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 odbc32.lib odbccp32.lib wsock32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
+# SUBTRACT BASE LINK32 /debug /pdbtype:<none>
+# ADD LINK32 odbc32.lib odbccp32.lib wsock32.lib aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
+# SUBTRACT LINK32 /debug /pdbtype:<none>
+
!ENDIF
# Begin Target
# Name "Barrier_Test - Win32 Debug"
# Name "Barrier_Test - Win32 Alpha Debug"
+# Name "Barrier_Test - Win32 Release"
+# Name "Barrier_Test - Win32 Unicode Debug"
+# Name "Barrier_Test - Win32 Unicode Release"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
@@ -160,6 +259,12 @@ DEP_CPP_BARRI=\ ".\test_config.h"\
+!ELSEIF "$(CFG)" == "Barrier_Test - Win32 Release"
+
+!ELSEIF "$(CFG)" == "Barrier_Test - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "Barrier_Test - Win32 Unicode Release"
+
!ENDIF
# End Source File
diff --git a/tests/Buffer_Stream_Test.dsp b/tests/Buffer_Stream_Test.dsp index 7b552c3baa2..7b348598bc3 100644 --- a/tests/Buffer_Stream_Test.dsp +++ b/tests/Buffer_Stream_Test.dsp @@ -5,7 +5,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-CFG=Buffer_Stream_Test - Win32 Alpha Debug
+CFG=Buffer_Stream_Test - Win32 Unicode Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -15,7 +15,7 @@ CFG=Buffer_Stream_Test - Win32 Alpha Debug !MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "Buffer_Stream_Test.mak"\
- CFG="Buffer_Stream_Test - Win32 Alpha Debug"
+ CFG="Buffer_Stream_Test - Win32 Unicode Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
@@ -23,6 +23,12 @@ CFG=Buffer_Stream_Test - Win32 Alpha Debug "Win32 (x86) Console Application")
!MESSAGE "Buffer_Stream_Test - Win32 Alpha Debug" (based on\
"Win32 (ALPHA) Console Application")
+!MESSAGE "Buffer_Stream_Test - Win32 Release" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "Buffer_Stream_Test - Win32 Unicode Debug" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "Buffer_Stream_Test - Win32 Unicode Release" (based on\
+ "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
@@ -39,12 +45,13 @@ CFG=Buffer_Stream_Test - Win32 Alpha Debug # PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "."
-# PROP Intermediate_Dir ".\Debug"
+# PROP Intermediate_Dir ".\DLL\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Buffer_Stream_Test"
CPP=cl.exe
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD 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" /FD /c
+# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -70,8 +77,9 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir "Buffer_Stream_Test"
CPP=cl.exe
-# ADD BASE CPP /nologo /MTd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
+# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -82,12 +90,103 @@ LINK32=link.exe # ADD BASE LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
# ADD LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
+!ELSEIF "$(CFG)" == "Buffer_Stream_Test - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Buffer_Stream_Test\Debug"
+# PROP BASE Intermediate_Dir "Buffer_Stream_Test\Debug"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir "Buffer_Stream_Test"
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\DLL\Release"
+# PROP Intermediate_Dir ".\DLL\Release"
+# 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" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /FD /c
+# SUBTRACT CPP /Z<none> /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 odbc32.lib odbccp32.lib wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
+# ADD LINK32 odbc32.lib odbccp32.lib wsock32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
+# SUBTRACT LINK32 /debug /pdbtype:<none>
+
+!ELSEIF "$(CFG)" == "Buffer_Stream_Test - Win32 Unicode Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Buffer_Stream_Test\Unicode Debug"
+# PROP BASE Intermediate_Dir "Buffer_Stream_Test\Unicode Debug"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir "Buffer_Stream_Test"
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\DLL\Unicode_Debug"
+# PROP Intermediate_Dir ".\DLL\Unicode_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" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
+# SUBTRACT CPP /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 odbc32.lib odbccp32.lib wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
+# ADD LINK32 odbc32.lib odbccp32.lib wsock32.lib aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
+
+!ELSEIF "$(CFG)" == "Buffer_Stream_Test - Win32 Unicode Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Buffer_Stream_Test\Unicode Release"
+# PROP BASE Intermediate_Dir "Buffer_Stream_Test\Unicode Release"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir "Buffer_Stream_Test"
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\DLL\Unicode_Release"
+# PROP Intermediate_Dir ".\DLL\Unicode_Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir "Buffer_Stream_Test"
+CPP=cl.exe
+# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /FD /c
+# SUBTRACT BASE CPP /Z<none>
+# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
+# SUBTRACT CPP /Z<none> /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 odbc32.lib odbccp32.lib wsock32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
+# SUBTRACT BASE LINK32 /debug /pdbtype:<none>
+# ADD LINK32 odbc32.lib odbccp32.lib wsock32.lib aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
+# SUBTRACT LINK32 /debug /pdbtype:<none>
+
!ENDIF
# Begin Target
# Name "Buffer_Stream_Test - Win32 Debug"
# Name "Buffer_Stream_Test - Win32 Alpha Debug"
+# Name "Buffer_Stream_Test - Win32 Release"
+# Name "Buffer_Stream_Test - Win32 Unicode Debug"
+# Name "Buffer_Stream_Test - Win32 Unicode Release"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
@@ -208,6 +307,12 @@ DEP_CPP_BUFFE=\ ".\test_config.h"\
+!ELSEIF "$(CFG)" == "Buffer_Stream_Test - Win32 Release"
+
+!ELSEIF "$(CFG)" == "Buffer_Stream_Test - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "Buffer_Stream_Test - Win32 Unicode Release"
+
!ENDIF
# End Source File
diff --git a/tests/Conn_Test.dsp b/tests/Conn_Test.dsp index caf017238f4..03d066107dc 100644 --- a/tests/Conn_Test.dsp +++ b/tests/Conn_Test.dsp @@ -5,7 +5,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-CFG=Conn_Test - Win32 Alpha Debug
+CFG=Conn_Test - Win32 Unicode Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -14,13 +14,19 @@ CFG=Conn_Test - Win32 Alpha Debug !MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "Conn_Test.mak" CFG="Conn_Test - Win32 Alpha Debug"
+!MESSAGE NMAKE /f "Conn_Test.mak" CFG="Conn_Test - Win32 Unicode Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "Conn_Test - Win32 Debug" (based on "Win32 (x86) Console Application")
!MESSAGE "Conn_Test - Win32 Alpha Debug" (based on\
"Win32 (ALPHA) Console Application")
+!MESSAGE "Conn_Test - Win32 Release" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "Conn_Test - Win32 Unicode Debug" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "Conn_Test - Win32 Unicode Release" (based on\
+ "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
@@ -37,12 +43,13 @@ CFG=Conn_Test - Win32 Alpha Debug # PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "."
-# PROP Intermediate_Dir ".\Debug"
+# PROP Intermediate_Dir ".\DLL\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Conn_Test"
CPP=cl.exe
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD 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" /FD /c
+# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -68,8 +75,9 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir "Conn_Test"
CPP=cl.exe
-# ADD BASE CPP /nologo /MTd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
+# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -80,12 +88,103 @@ LINK32=link.exe # ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
# ADD LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
+!ELSEIF "$(CFG)" == "Conn_Test - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Conn_Test\Debug"
+# PROP BASE Intermediate_Dir "Conn_Test\Debug"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir "Conn_Test"
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\DLL\Release"
+# PROP Intermediate_Dir ".\DLL\Release"
+# 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" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /FD /c
+# SUBTRACT CPP /Z<none> /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 odbc32.lib odbccp32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
+# ADD LINK32 odbc32.lib odbccp32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
+# SUBTRACT LINK32 /debug /pdbtype:<none>
+
+!ELSEIF "$(CFG)" == "Conn_Test - Win32 Unicode Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Conn_Test\Unicode Debug"
+# PROP BASE Intermediate_Dir "Conn_Test\Unicode Debug"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir "Conn_Test"
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\DLL\Unicode_Debug"
+# PROP Intermediate_Dir ".\DLL\Unicode_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" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
+# SUBTRACT CPP /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 odbc32.lib odbccp32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
+# ADD LINK32 odbc32.lib odbccp32.lib aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
+
+!ELSEIF "$(CFG)" == "Conn_Test - Win32 Unicode Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Conn_Test\Unicode Release"
+# PROP BASE Intermediate_Dir "Conn_Test\Unicode Release"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir "Conn_Test"
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\DLL\Unicode_Release"
+# PROP Intermediate_Dir ".\DLL\Unicode_Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir "Conn_Test"
+CPP=cl.exe
+# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /FD /c
+# SUBTRACT BASE CPP /Z<none>
+# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
+# SUBTRACT CPP /Z<none> /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 odbc32.lib odbccp32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
+# SUBTRACT BASE LINK32 /debug /pdbtype:<none>
+# ADD LINK32 odbc32.lib odbccp32.lib aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
+# SUBTRACT LINK32 /debug /pdbtype:<none>
+
!ENDIF
# Begin Target
# Name "Conn_Test - Win32 Debug"
# Name "Conn_Test - Win32 Alpha Debug"
+# Name "Conn_Test - Win32 Release"
+# Name "Conn_Test - Win32 Unicode Debug"
+# Name "Conn_Test - Win32 Unicode Release"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
@@ -236,6 +335,12 @@ DEP_CPP_CONN_=\ ".\test_config.h"\
+!ELSEIF "$(CFG)" == "Conn_Test - Win32 Release"
+
+!ELSEIF "$(CFG)" == "Conn_Test - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "Conn_Test - Win32 Unicode Release"
+
!ENDIF
# End Source File
diff --git a/tests/Enum_Interfaces_Test.dsp b/tests/Enum_Interfaces_Test.dsp index a0ea3f127bd..05c13b081cd 100644 --- a/tests/Enum_Interfaces_Test.dsp +++ b/tests/Enum_Interfaces_Test.dsp @@ -5,7 +5,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-CFG=Enum_Interfaces_Test - Win32 Alpha Debug
+CFG=Enum_Interfaces_Test - Win32 Unicode Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -15,7 +15,7 @@ CFG=Enum_Interfaces_Test - Win32 Alpha Debug !MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "Enum_Interfaces_Test.mak"\
- CFG="Enum_Interfaces_Test - Win32 Alpha Debug"
+ CFG="Enum_Interfaces_Test - Win32 Unicode Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
@@ -23,6 +23,12 @@ CFG=Enum_Interfaces_Test - Win32 Alpha Debug "Win32 (x86) Console Application")
!MESSAGE "Enum_Interfaces_Test - Win32 Alpha Debug" (based on\
"Win32 (ALPHA) Console Application")
+!MESSAGE "Enum_Interfaces_Test - Win32 Release" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "Enum_Interfaces_Test - Win32 Unicode Debug" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "Enum_Interfaces_Test - Win32 Unicode Release" (based on\
+ "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
@@ -39,12 +45,13 @@ CFG=Enum_Interfaces_Test - Win32 Alpha Debug # PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "."
-# PROP Intermediate_Dir ".\Debug"
+# PROP Intermediate_Dir ".\DLL\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
CPP=cl.exe
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /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 /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
+# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -70,8 +77,9 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
CPP=cl.exe
-# ADD BASE CPP /nologo /MTd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /MDd /c
+# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -82,12 +90,103 @@ LINK32=link.exe # ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept /libpath:"..\ace"
# ADD LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept /libpath:"..\ace"
+!ELSEIF "$(CFG)" == "Enum_Interfaces_Test - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Enum_Int"
+# PROP BASE Intermediate_Dir "Enum_Int"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\DLL\Release"
+# PROP Intermediate_Dir ".\DLL\Release"
+# 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" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /FD /c
+# SUBTRACT CPP /Z<none> /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 odbc32.lib odbccp32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"
+# ADD LINK32 odbc32.lib odbccp32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
+# SUBTRACT LINK32 /debug /pdbtype:<none>
+
+!ELSEIF "$(CFG)" == "Enum_Interfaces_Test - Win32 Unicode Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Enum_In0"
+# PROP BASE Intermediate_Dir "Enum_In0"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\DLL\Unicode_Debug"
+# PROP Intermediate_Dir ".\DLL\Unicode_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" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
+# SUBTRACT CPP /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 odbc32.lib odbccp32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"
+# ADD LINK32 odbc32.lib odbccp32.lib aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"
+
+!ELSEIF "$(CFG)" == "Enum_Interfaces_Test - Win32 Unicode Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Enum_Int"
+# PROP BASE Intermediate_Dir "Enum_Int"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\DLL\Unicode_Release"
+# PROP Intermediate_Dir ".\DLL\Unicode_Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+CPP=cl.exe
+# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /FD /c
+# SUBTRACT BASE CPP /Z<none>
+# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
+# SUBTRACT CPP /Z<none> /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 odbc32.lib odbccp32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
+# SUBTRACT BASE LINK32 /debug /pdbtype:<none>
+# ADD LINK32 odbc32.lib odbccp32.lib aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
+# SUBTRACT LINK32 /debug /pdbtype:<none>
+
!ENDIF
# Begin Target
# Name "Enum_Interfaces_Test - Win32 Debug"
# Name "Enum_Interfaces_Test - Win32 Alpha Debug"
+# Name "Enum_Interfaces_Test - Win32 Release"
+# Name "Enum_Interfaces_Test - Win32 Unicode Debug"
+# Name "Enum_Interfaces_Test - Win32 Unicode Release"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
@@ -132,6 +231,12 @@ DEP_CPP_ENUM_=\ ".\test_config.h"\
+!ELSEIF "$(CFG)" == "Enum_Interfaces_Test - Win32 Release"
+
+!ELSEIF "$(CFG)" == "Enum_Interfaces_Test - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "Enum_Interfaces_Test - Win32 Unicode Release"
+
!ENDIF
# End Source File
diff --git a/tests/Future_Test.dsp b/tests/Future_Test.dsp index 41aa8a196f9..6abfdaf140a 100644 --- a/tests/Future_Test.dsp +++ b/tests/Future_Test.dsp @@ -5,7 +5,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-CFG=Future_Test - Win32 Alpha Debug
+CFG=Future_Test - Win32 Unicode Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -14,7 +14,7 @@ CFG=Future_Test - Win32 Alpha Debug !MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "Future_Test.mak" CFG="Future_Test - Win32 Alpha Debug"
+!MESSAGE NMAKE /f "Future_Test.mak" CFG="Future_Test - Win32 Unicode Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
@@ -22,6 +22,12 @@ CFG=Future_Test - Win32 Alpha Debug "Win32 (x86) Console Application")
!MESSAGE "Future_Test - Win32 Alpha Debug" (based on\
"Win32 (ALPHA) Console Application")
+!MESSAGE "Future_Test - Win32 Release" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "Future_Test - Win32 Unicode Debug" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "Future_Test - Win32 Unicode Release" (based on\
+ "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
@@ -38,12 +44,13 @@ CFG=Future_Test - Win32 Alpha Debug # PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "."
-# PROP Intermediate_Dir ".\Debug"
+# PROP Intermediate_Dir ".\DLL\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Future_Test"
CPP=cl.exe
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD 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" /FD /c
+# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -69,8 +76,9 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir "Future_Test"
CPP=cl.exe
-# ADD BASE CPP /nologo /MTd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
+# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -81,12 +89,103 @@ LINK32=link.exe # ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
# ADD LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
+!ELSEIF "$(CFG)" == "Future_Test - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Future_Test\Debug"
+# PROP BASE Intermediate_Dir "Future_Test\Debug"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir "Future_Test"
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\DLL\Release"
+# PROP Intermediate_Dir ".\DLL\Release"
+# 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" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /FD /c
+# SUBTRACT CPP /Z<none> /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 odbc32.lib odbccp32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
+# ADD LINK32 odbc32.lib odbccp32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
+# SUBTRACT LINK32 /debug /pdbtype:<none>
+
+!ELSEIF "$(CFG)" == "Future_Test - Win32 Unicode Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Future_Test\Unicode Debug"
+# PROP BASE Intermediate_Dir "Future_Test\Unicode Debug"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir "Future_Test"
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\DLL\Unicode_Debug"
+# PROP Intermediate_Dir ".\DLL\Unicode_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" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
+# SUBTRACT CPP /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 odbc32.lib odbccp32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
+# ADD LINK32 odbc32.lib odbccp32.lib aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
+
+!ELSEIF "$(CFG)" == "Future_Test - Win32 Unicode Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Future_Test\Unicode Release"
+# PROP BASE Intermediate_Dir "Future_Test\Unicode Release"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir "Future_Test"
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\DLL\Unicode_Release"
+# PROP Intermediate_Dir ".\DLL\Unicode_Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir "Future_Test"
+CPP=cl.exe
+# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /FD /c
+# SUBTRACT BASE CPP /Z<none>
+# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
+# SUBTRACT CPP /Z<none> /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 odbc32.lib odbccp32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
+# SUBTRACT BASE LINK32 /debug /pdbtype:<none>
+# ADD LINK32 odbc32.lib odbccp32.lib aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
+# SUBTRACT LINK32 /debug /pdbtype:<none>
+
!ENDIF
# Begin Target
# Name "Future_Test - Win32 Debug"
# Name "Future_Test - Win32 Alpha Debug"
+# Name "Future_Test - Win32 Release"
+# Name "Future_Test - Win32 Unicode Debug"
+# Name "Future_Test - Win32 Unicode Release"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
@@ -207,6 +306,12 @@ DEP_CPP_FUTUR=\ ".\test_config.h"\
+!ELSEIF "$(CFG)" == "Future_Test - Win32 Release"
+
+!ELSEIF "$(CFG)" == "Future_Test - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "Future_Test - Win32 Unicode Release"
+
!ENDIF
# End Source File
diff --git a/tests/Handle_Set_Test.dsp b/tests/Handle_Set_Test.dsp index 3eccc3ddab5..450ad81e625 100644 --- a/tests/Handle_Set_Test.dsp +++ b/tests/Handle_Set_Test.dsp @@ -5,7 +5,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-CFG=Handle_Set_Test - Win32 Alpha Debug
+CFG=Handle_Set_Test - Win32 Unicode Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -15,7 +15,7 @@ CFG=Handle_Set_Test - Win32 Alpha Debug !MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "Handle_Set_Test.mak"\
- CFG="Handle_Set_Test - Win32 Alpha Debug"
+ CFG="Handle_Set_Test - Win32 Unicode Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
@@ -23,6 +23,12 @@ CFG=Handle_Set_Test - Win32 Alpha Debug "Win32 (x86) Console Application")
!MESSAGE "Handle_Set_Test - Win32 Alpha Debug" (based on\
"Win32 (ALPHA) Console Application")
+!MESSAGE "Handle_Set_Test - Win32 Release" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "Handle_Set_Test - Win32 Unicode Debug" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "Handle_Set_Test - Win32 Unicode Release" (based on\
+ "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
@@ -39,12 +45,13 @@ CFG=Handle_Set_Test - Win32 Alpha Debug # PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "."
-# PROP Intermediate_Dir ".\Debug"
+# PROP Intermediate_Dir ".\DLL\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Handle_Set_Test"
CPP=cl.exe
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD 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" /FD /c
+# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -70,8 +77,9 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir "Handle_Set_Test"
CPP=cl.exe
-# ADD BASE CPP /nologo /MTd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
+# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -82,12 +90,103 @@ LINK32=link.exe # ADD BASE LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
# ADD LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
+!ELSEIF "$(CFG)" == "Handle_Set_Test - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Handle_Set_Test\Debug"
+# PROP BASE Intermediate_Dir "Handle_Set_Test\Debug"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir "Handle_Set_Test"
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\DLL\Release"
+# PROP Intermediate_Dir ".\DLL\Release"
+# 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" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /FD /c
+# SUBTRACT CPP /Z<none> /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wsock32.lib odbc32.lib odbccp32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
+# ADD LINK32 wsock32.lib odbc32.lib odbccp32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
+# SUBTRACT LINK32 /debug /pdbtype:<none>
+
+!ELSEIF "$(CFG)" == "Handle_Set_Test - Win32 Unicode Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Handle_Set_Test\Unicode Debug"
+# PROP BASE Intermediate_Dir "Handle_Set_Test\Unicode Debug"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir "Handle_Set_Test"
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\DLL\Unicode_Debug"
+# PROP Intermediate_Dir ".\DLL\Unicode_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" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
+# SUBTRACT CPP /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wsock32.lib odbc32.lib odbccp32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
+# ADD LINK32 wsock32.lib odbc32.lib odbccp32.lib aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
+
+!ELSEIF "$(CFG)" == "Handle_Set_Test - Win32 Unicode Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Handle_Set_Test\Unicode Release"
+# PROP BASE Intermediate_Dir "Handle_Set_Test\Unicode Release"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir "Handle_Set_Test"
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\DLL\Unicode_Release"
+# PROP Intermediate_Dir ".\DLL\Unicode_Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir "Handle_Set_Test"
+CPP=cl.exe
+# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /FD /c
+# SUBTRACT BASE CPP /Z<none>
+# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
+# SUBTRACT CPP /Z<none> /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wsock32.lib odbc32.lib odbccp32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
+# SUBTRACT BASE LINK32 /debug /pdbtype:<none>
+# ADD LINK32 wsock32.lib odbc32.lib odbccp32.lib aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
+# SUBTRACT LINK32 /debug /pdbtype:<none>
+
!ENDIF
# Begin Target
# Name "Handle_Set_Test - Win32 Debug"
# Name "Handle_Set_Test - Win32 Alpha Debug"
+# Name "Handle_Set_Test - Win32 Release"
+# Name "Handle_Set_Test - Win32 Unicode Debug"
+# Name "Handle_Set_Test - Win32 Unicode Release"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
@@ -166,6 +265,12 @@ DEP_CPP_HANDL=\ ".\test_config.h"\
+!ELSEIF "$(CFG)" == "Handle_Set_Test - Win32 Release"
+
+!ELSEIF "$(CFG)" == "Handle_Set_Test - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "Handle_Set_Test - Win32 Unicode Release"
+
!ENDIF
# End Source File
diff --git a/tests/Hash_Map_Manager_Test.dsp b/tests/Hash_Map_Manager_Test.dsp index f9e99b18418..50821736cb8 100644 --- a/tests/Hash_Map_Manager_Test.dsp +++ b/tests/Hash_Map_Manager_Test.dsp @@ -5,7 +5,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-CFG=Hash_Map_Manager_Test - Win32 Alpha Debug
+CFG=Hash_Map_Manager_Test - Win32 Unicode Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -15,7 +15,7 @@ CFG=Hash_Map_Manager_Test - Win32 Alpha Debug !MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "Hash_Map_Manager_Test.mak"\
- CFG="Hash_Map_Manager_Test - Win32 Alpha Debug"
+ CFG="Hash_Map_Manager_Test - Win32 Unicode Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
@@ -23,6 +23,12 @@ CFG=Hash_Map_Manager_Test - Win32 Alpha Debug "Win32 (x86) Console Application")
!MESSAGE "Hash_Map_Manager_Test - Win32 Alpha Debug" (based on\
"Win32 (ALPHA) Console Application")
+!MESSAGE "Hash_Map_Manager_Test - Win32 Release" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "Hash_Map_Manager_Test - Win32 Unicode Debug" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "Hash_Map_Manager_Test - Win32 Unicode Release" (based on\
+ "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
@@ -39,12 +45,13 @@ CFG=Hash_Map_Manager_Test - Win32 Alpha Debug # PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "."
-# PROP Intermediate_Dir ".\Debug"
+# PROP Intermediate_Dir ".\DLL\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
CPP=cl.exe
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /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 /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
+# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -70,8 +77,9 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
CPP=cl.exe
-# ADD BASE CPP /nologo /MTd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /MDd /c
+# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -82,12 +90,104 @@ LINK32=link.exe # ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept /libpath:"..\ace"
# ADD LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept /libpath:"..\ace"
+!ELSEIF "$(CFG)" == "Hash_Map_Manager_Test - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Hash_Map"
+# PROP BASE Intermediate_Dir "Hash_Map"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\DLL\Release"
+# PROP Intermediate_Dir ".\DLL\Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+CPP=cl.exe
+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MDd /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /FD /c
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:IX86 /pdbtype:sept /libpath:"..\ace"
+# SUBTRACT BASE LINK32 /incremental:no
+# ADD LINK32 odbc32.lib odbccp32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:IX86 /libpath:"..\ace"
+# SUBTRACT LINK32 /debug /pdbtype:<none>
+
+!ELSEIF "$(CFG)" == "Hash_Map_Manager_Test - Win32 Unicode Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Hash_Ma0"
+# PROP BASE Intermediate_Dir "Hash_Ma0"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\DLL\Unicode_Debug"
+# PROP Intermediate_Dir ".\DLL\Unicode_Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+CPP=cl.exe
+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MDd /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "_MBCS" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "UNICODE" /FD /MDd /c
+# SUBTRACT CPP /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:IX86 /pdbtype:sept /libpath:"..\ace"
+# SUBTRACT BASE LINK32 /incremental:no
+# ADD LINK32 odbc32.lib odbccp32.lib aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:IX86 /pdbtype:sept /libpath:"..\ace"
+# SUBTRACT LINK32 /incremental:no
+
+!ELSEIF "$(CFG)" == "Hash_Map_Manager_Test - Win32 Unicode Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Hash_Map"
+# PROP BASE Intermediate_Dir "Hash_Map"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\DLL\Unicode_Release"
+# PROP Intermediate_Dir ".\DLL\Unicode_Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+CPP=cl.exe
+# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\\" /D "_MBCS" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /FD /MDd /c
+# SUBTRACT BASE CPP /Z<none>
+# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "_MBCS" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 odbc32.lib odbccp32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:IX86 /libpath:"..\ace"
+# SUBTRACT BASE LINK32 /debug /pdbtype:<none>
+# ADD LINK32 odbc32.lib odbccp32.lib aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:IX86 /libpath:"..\ace"
+# SUBTRACT LINK32 /debug /pdbtype:<none>
+
!ENDIF
# Begin Target
# Name "Hash_Map_Manager_Test - Win32 Debug"
# Name "Hash_Map_Manager_Test - Win32 Alpha Debug"
+# Name "Hash_Map_Manager_Test - Win32 Release"
+# Name "Hash_Map_Manager_Test - Win32 Unicode Debug"
+# Name "Hash_Map_Manager_Test - Win32 Unicode Release"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
@@ -178,6 +278,12 @@ DEP_CPP_HASH_=\ ".\test_config.h"\
+!ELSEIF "$(CFG)" == "Hash_Map_Manager_Test - Win32 Release"
+
+!ELSEIF "$(CFG)" == "Hash_Map_Manager_Test - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "Hash_Map_Manager_Test - Win32 Unicode Release"
+
!ENDIF
# End Source File
diff --git a/tests/IOStream_Test.dsp b/tests/IOStream_Test.dsp index 1182e57fddf..808c9852899 100644 --- a/tests/IOStream_Test.dsp +++ b/tests/IOStream_Test.dsp @@ -5,7 +5,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-CFG=IOStream_Test - Win32 Alpha Debug
+CFG=IOStream_Test - Win32 Unicode Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -14,7 +14,8 @@ CFG=IOStream_Test - Win32 Alpha Debug !MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "IOStream_Test.mak" CFG="IOStream_Test - Win32 Alpha Debug"
+!MESSAGE NMAKE /f "IOStream_Test.mak"\
+ CFG="IOStream_Test - Win32 Unicode Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
@@ -22,6 +23,12 @@ CFG=IOStream_Test - Win32 Alpha Debug "Win32 (x86) Console Application")
!MESSAGE "IOStream_Test - Win32 Alpha Debug" (based on\
"Win32 (ALPHA) Console Application")
+!MESSAGE "IOStream_Test - Win32 Release" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "IOStream_Test - Win32 Unicode Debug" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "IOStream_Test - Win32 Unicode Release" (based on\
+ "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
@@ -38,12 +45,13 @@ CFG=IOStream_Test - Win32 Alpha Debug # PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "."
-# PROP Intermediate_Dir ".\Debug"
+# PROP Intermediate_Dir ".\DLL\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\IOStream_Test"
CPP=cl.exe
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD 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" /FD /c
+# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -69,8 +77,9 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir "IOStream_Test"
CPP=cl.exe
-# ADD BASE CPP /nologo /MTd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
+# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -81,12 +90,103 @@ LINK32=link.exe # ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
# ADD LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
+!ELSEIF "$(CFG)" == "IOStream_Test - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "IOStream_Test\Debug"
+# PROP BASE Intermediate_Dir "IOStream_Test\Debug"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir "IOStream_Test"
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\DLL\Release"
+# PROP Intermediate_Dir ".\DLL\Release"
+# 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" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /FD /c
+# SUBTRACT CPP /Z<none> /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 odbc32.lib odbccp32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
+# ADD LINK32 odbc32.lib odbccp32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
+# SUBTRACT LINK32 /debug /pdbtype:<none>
+
+!ELSEIF "$(CFG)" == "IOStream_Test - Win32 Unicode Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "IOStream_Test\Unicode Debug"
+# PROP BASE Intermediate_Dir "IOStream_Test\Unicode Debug"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir "IOStream_Test"
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\DLL\Unicode_Debug"
+# PROP Intermediate_Dir ".\DLL\Unicode_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" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
+# SUBTRACT CPP /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 odbc32.lib odbccp32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
+# ADD LINK32 odbc32.lib odbccp32.lib aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
+
+!ELSEIF "$(CFG)" == "IOStream_Test - Win32 Unicode Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "IOStream_Test\Unicode Release"
+# PROP BASE Intermediate_Dir "IOStream_Test\Unicode Release"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir "IOStream_Test"
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\DLL\Unicode_Release"
+# PROP Intermediate_Dir ".\DLL\Unicode_Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir "IOStream_Test"
+CPP=cl.exe
+# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /FD /c
+# SUBTRACT BASE CPP /Z<none>
+# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
+# SUBTRACT CPP /Z<none> /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 odbc32.lib odbccp32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
+# SUBTRACT BASE LINK32 /debug /pdbtype:<none>
+# ADD LINK32 odbc32.lib odbccp32.lib aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
+# SUBTRACT LINK32 /debug /pdbtype:<none>
+
!ENDIF
# Begin Target
# Name "IOStream_Test - Win32 Debug"
# Name "IOStream_Test - Win32 Alpha Debug"
+# Name "IOStream_Test - Win32 Release"
+# Name "IOStream_Test - Win32 Unicode Debug"
+# Name "IOStream_Test - Win32 Unicode Release"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
@@ -232,6 +332,12 @@ DEP_CPP_IOSTR=\ ".\test_config.h"\
+!ELSEIF "$(CFG)" == "IOStream_Test - Win32 Release"
+
+!ELSEIF "$(CFG)" == "IOStream_Test - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "IOStream_Test - Win32 Unicode Release"
+
!ENDIF
# End Source File
diff --git a/tests/MM_Shared_Memory_Test.dsp b/tests/MM_Shared_Memory_Test.dsp index 47ded436f8d..9c1f0b0a51d 100644 --- a/tests/MM_Shared_Memory_Test.dsp +++ b/tests/MM_Shared_Memory_Test.dsp @@ -5,7 +5,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-CFG=MM_Shared_Memory_Test - Win32 Alpha Debug
+CFG=MM_Shared_Memory_Test - Win32 Unicode Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -15,7 +15,7 @@ CFG=MM_Shared_Memory_Test - Win32 Alpha Debug !MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "MM_Shared_Memory_Test.mak"\
- CFG="MM_Shared_Memory_Test - Win32 Alpha Debug"
+ CFG="MM_Shared_Memory_Test - Win32 Unicode Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
@@ -23,6 +23,12 @@ CFG=MM_Shared_Memory_Test - Win32 Alpha Debug "Win32 (x86) Console Application")
!MESSAGE "MM_Shared_Memory_Test - Win32 Alpha Debug" (based on\
"Win32 (ALPHA) Console Application")
+!MESSAGE "MM_Shared_Memory_Test - Win32 Release" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "MM_Shared_Memory_Test - Win32 Unicode Debug" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "MM_Shared_Memory_Test - Win32 Unicode Release" (based on\
+ "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
@@ -39,12 +45,13 @@ CFG=MM_Shared_Memory_Test - Win32 Alpha Debug # PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "."
-# PROP Intermediate_Dir ".\Debug"
+# PROP Intermediate_Dir ".\DLL\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\MM_Shared_Memory_Test"
CPP=cl.exe
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD 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" /FD /c
+# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -70,8 +77,9 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir "MM_Shared_Memory_Test"
CPP=cl.exe
-# ADD BASE CPP /nologo /MTd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
+# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -82,12 +90,103 @@ LINK32=link.exe # ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
# ADD LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
+!ELSEIF "$(CFG)" == "MM_Shared_Memory_Test - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "MM_Shared_Memory_Test\Debug"
+# PROP BASE Intermediate_Dir "MM_Shared_Memory_Test\Debug"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir "MM_Shared_Memory_Test"
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\DLL\Release"
+# PROP Intermediate_Dir ".\DLL\Release"
+# 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" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /FD /c
+# SUBTRACT CPP /Z<none> /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 odbc32.lib odbccp32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
+# ADD LINK32 odbc32.lib odbccp32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
+# SUBTRACT LINK32 /debug /pdbtype:<none>
+
+!ELSEIF "$(CFG)" == "MM_Shared_Memory_Test - Win32 Unicode Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "MM_Shared_Memory_Test\Unicode Debug"
+# PROP BASE Intermediate_Dir "MM_Shared_Memory_Test\Unicode Debug"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir "MM_Shared_Memory_Test"
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\DLL\Unicode_Debug"
+# PROP Intermediate_Dir ".\DLL\Unicode_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" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
+# SUBTRACT CPP /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 odbc32.lib odbccp32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
+# ADD LINK32 odbc32.lib odbccp32.lib aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
+
+!ELSEIF "$(CFG)" == "MM_Shared_Memory_Test - Win32 Unicode Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "MM_Shared_Memory_Test\Unicode Release"
+# PROP BASE Intermediate_Dir "MM_Shared_Memory_Test\Unicode Release"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir "MM_Shared_Memory_Test"
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\DLL\Unicode_Release"
+# PROP Intermediate_Dir ".\DLL\Unicode_Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir "MM_Shared_Memory_Test"
+CPP=cl.exe
+# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /FD /c
+# SUBTRACT BASE CPP /Z<none>
+# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
+# SUBTRACT CPP /Z<none> /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 odbc32.lib odbccp32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
+# SUBTRACT BASE LINK32 /debug /pdbtype:<none>
+# ADD LINK32 odbc32.lib odbccp32.lib aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
+# SUBTRACT LINK32 /debug /pdbtype:<none>
+
!ENDIF
# Begin Target
# Name "MM_Shared_Memory_Test - Win32 Debug"
# Name "MM_Shared_Memory_Test - Win32 Alpha Debug"
+# Name "MM_Shared_Memory_Test - Win32 Release"
+# Name "MM_Shared_Memory_Test - Win32 Unicode Debug"
+# Name "MM_Shared_Memory_Test - Win32 Unicode Release"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
@@ -164,6 +263,12 @@ DEP_CPP_MM_SH=\ ".\test_config.h"\
+!ELSEIF "$(CFG)" == "MM_Shared_Memory_Test - Win32 Release"
+
+!ELSEIF "$(CFG)" == "MM_Shared_Memory_Test - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "MM_Shared_Memory_Test - Win32 Unicode Release"
+
!ENDIF
# End Source File
diff --git a/tests/MT_SOCK_Test.dsp b/tests/MT_SOCK_Test.dsp index e3cdd67595a..30f144ae8fb 100644 --- a/tests/MT_SOCK_Test.dsp +++ b/tests/MT_SOCK_Test.dsp @@ -5,7 +5,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-CFG=MT_SOCK_Test - Win32 Alpha Debug
+CFG=MT_SOCK_Test - Win32 Unicode Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -14,7 +14,7 @@ CFG=MT_SOCK_Test - Win32 Alpha Debug !MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "MT_SOCK_Test.mak" CFG="MT_SOCK_Test - Win32 Alpha Debug"
+!MESSAGE NMAKE /f "MT_SOCK_Test.mak" CFG="MT_SOCK_Test - Win32 Unicode Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
@@ -22,6 +22,12 @@ CFG=MT_SOCK_Test - Win32 Alpha Debug "Win32 (x86) Console Application")
!MESSAGE "MT_SOCK_Test - Win32 Alpha Debug" (based on\
"Win32 (ALPHA) Console Application")
+!MESSAGE "MT_SOCK_Test - Win32 Release" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "MT_SOCK_Test - Win32 Unicode Debug" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "MT_SOCK_Test - Win32 Unicode Release" (based on\
+ "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
@@ -38,12 +44,13 @@ CFG=MT_SOCK_Test - Win32 Alpha Debug # PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir ""
-# PROP Intermediate_Dir "Debug"
+# PROP Intermediate_Dir ".\DLL\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
CPP=cl.exe
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I ".." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I ".." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -69,8 +76,9 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
CPP=cl.exe
-# ADD BASE CPP /nologo /MTd /Gt0 /W3 /GX /Zi /Od /I ".." /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I ".." /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I ".." /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I ".." /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
+# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -81,12 +89,103 @@ LINK32=link.exe # ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept /libpath:"..\ace"
# ADD LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept /libpath:"..\ace"
+!ELSEIF "$(CFG)" == "MT_SOCK_Test - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "MT_SOCK_"
+# PROP BASE Intermediate_Dir "MT_SOCK_"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\DLL\Release"
+# PROP Intermediate_Dir ".\DLL\Release"
+# 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" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I ".." /D "_MBCS" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /FD /c
+# SUBTRACT CPP /Z<none> /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"
+# ADD LINK32 odbc32.lib odbccp32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
+# SUBTRACT LINK32 /debug /pdbtype:<none>
+
+!ELSEIF "$(CFG)" == "MT_SOCK_Test - Win32 Unicode Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "MT_SOCK0"
+# PROP BASE Intermediate_Dir "MT_SOCK0"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\DLL\Unicode_Debug"
+# PROP Intermediate_Dir ".\DLL\Unicode_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" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I ".." /D "_MBCS" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
+# SUBTRACT CPP /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"
+# ADD LINK32 odbc32.lib odbccp32.lib aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"
+
+!ELSEIF "$(CFG)" == "MT_SOCK_Test - Win32 Unicode Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "MT_SOCK_"
+# PROP BASE Intermediate_Dir "MT_SOCK_"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\DLL\Unicode_Release"
+# PROP Intermediate_Dir ".\DLL\Unicode_Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+CPP=cl.exe
+# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I ".." /D "_MBCS" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /FD /c
+# SUBTRACT BASE CPP /Z<none>
+# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I ".." /D "_MBCS" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
+# SUBTRACT CPP /Z<none> /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 odbc32.lib odbccp32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
+# SUBTRACT BASE LINK32 /debug /pdbtype:<none>
+# ADD LINK32 odbc32.lib odbccp32.lib aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
+# SUBTRACT LINK32 /debug /pdbtype:<none>
+
!ENDIF
# Begin Target
# Name "MT_SOCK_Test - Win32 Debug"
# Name "MT_SOCK_Test - Win32 Alpha Debug"
+# Name "MT_SOCK_Test - Win32 Release"
+# Name "MT_SOCK_Test - Win32 Unicode Debug"
+# Name "MT_SOCK_Test - Win32 Unicode Release"
# Begin Source File
SOURCE=.\MT_SOCK_Test.cpp
@@ -176,6 +275,12 @@ DEP_CPP_MT_SO=\ ".\test_config.h"\
+!ELSEIF "$(CFG)" == "MT_SOCK_Test - Win32 Release"
+
+!ELSEIF "$(CFG)" == "MT_SOCK_Test - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "MT_SOCK_Test - Win32 Unicode Release"
+
!ENDIF
# End Source File
diff --git a/tests/Map_Manager_Test.dsp b/tests/Map_Manager_Test.dsp index e1573f3d652..d6c05ab5626 100644 --- a/tests/Map_Manager_Test.dsp +++ b/tests/Map_Manager_Test.dsp @@ -5,7 +5,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-CFG=Map_Manager_Test - Win32 Alpha Debug
+CFG=Map_Manager_Test - Win32 Unicode Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -15,7 +15,7 @@ CFG=Map_Manager_Test - Win32 Alpha Debug !MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "Map_Manager_Test.mak"\
- CFG="Map_Manager_Test - Win32 Alpha Debug"
+ CFG="Map_Manager_Test - Win32 Unicode Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
@@ -23,6 +23,12 @@ CFG=Map_Manager_Test - Win32 Alpha Debug "Win32 (x86) Console Application")
!MESSAGE "Map_Manager_Test - Win32 Alpha Debug" (based on\
"Win32 (ALPHA) Console Application")
+!MESSAGE "Map_Manager_Test - Win32 Release" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "Map_Manager_Test - Win32 Unicode Debug" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "Map_Manager_Test - Win32 Unicode Release" (based on\
+ "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
@@ -39,12 +45,13 @@ CFG=Map_Manager_Test - Win32 Alpha Debug # PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "."
-# PROP Intermediate_Dir ".\Debug"
+# PROP Intermediate_Dir ".\DLL\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Map_Manager_Test"
CPP=cl.exe
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD 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" /FD /c
+# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -70,8 +77,9 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir "Map_Manager_Test"
CPP=cl.exe
-# ADD BASE CPP /nologo /MTd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
+# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -82,12 +90,105 @@ LINK32=link.exe # ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
# ADD LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
+!ELSEIF "$(CFG)" == "Map_Manager_Test - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Map_Manager_Test\Debug"
+# PROP BASE Intermediate_Dir "Map_Manager_Test\Debug"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir "Map_Manager_Test"
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\DLL\Release"
+# PROP Intermediate_Dir ".\DLL\Release"
+# 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" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /FD /c
+# SUBTRACT CPP /Z<none> /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 odbc32.lib odbccp32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
+# ADD LINK32 odbc32.lib odbccp32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
+# SUBTRACT LINK32 /debug /pdbtype:<none>
+
+!ELSEIF "$(CFG)" == "Map_Manager_Test - Win32 Unicode Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Map_Manager_Test\Unicode Debug"
+# PROP BASE Intermediate_Dir "Map_Manager_Test\Unicode Debug"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir "Map_Manager_Test"
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\DLL\Unicode_Debug"
+# PROP Intermediate_Dir ".\DLL\Unicode_Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir "Map_Manager_Test"
+CPP=cl.exe
+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MDd /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "_MBCS" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "UNICODE" /FD /MDd /c
+# SUBTRACT CPP /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:IX86 /pdbtype:sept /libpath:"..\ace"
+# SUBTRACT BASE LINK32 /incremental:no
+# ADD LINK32 odbc32.lib odbccp32.lib aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:IX86 /pdbtype:sept /libpath:"..\ace"
+# SUBTRACT LINK32 /incremental:no
+
+!ELSEIF "$(CFG)" == "Map_Manager_Test - Win32 Unicode Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Map_Manager_Test\Unicode Release"
+# PROP BASE Intermediate_Dir "Map_Manager_Test\Unicode Release"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir "Map_Manager_Test"
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\DLL\Unicode_Release"
+# PROP Intermediate_Dir ".\DLL\Unicode_Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir "Map_Manager_Test"
+CPP=cl.exe
+# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /FD /c
+# SUBTRACT BASE CPP /Z<none>
+# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
+# SUBTRACT CPP /Z<none> /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 odbc32.lib odbccp32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
+# SUBTRACT BASE LINK32 /debug /pdbtype:<none>
+# ADD LINK32 odbc32.lib odbccp32.lib aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
+# SUBTRACT LINK32 /debug /pdbtype:<none>
+
!ENDIF
# Begin Target
# Name "Map_Manager_Test - Win32 Debug"
# Name "Map_Manager_Test - Win32 Alpha Debug"
+# Name "Map_Manager_Test - Win32 Release"
+# Name "Map_Manager_Test - Win32 Unicode Debug"
+# Name "Map_Manager_Test - Win32 Unicode Release"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
@@ -185,6 +286,12 @@ DEP_CPP_MAP_M=\ ".\test_config.h"\
+!ELSEIF "$(CFG)" == "Map_Manager_Test - Win32 Release"
+
+!ELSEIF "$(CFG)" == "Map_Manager_Test - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "Map_Manager_Test - Win32 Unicode Release"
+
!ENDIF
# End Source File
diff --git a/tests/Mem_Map_Test.dsp b/tests/Mem_Map_Test.dsp index d8670219040..14dc954ff3b 100644 --- a/tests/Mem_Map_Test.dsp +++ b/tests/Mem_Map_Test.dsp @@ -5,7 +5,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-CFG=Mem_Map_Test - Win32 Alpha Debug
+CFG=Mem_Map_Test - Win32 Unicode Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -14,7 +14,7 @@ CFG=Mem_Map_Test - Win32 Alpha Debug !MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "Mem_Map_Test.mak" CFG="Mem_Map_Test - Win32 Alpha Debug"
+!MESSAGE NMAKE /f "Mem_Map_Test.mak" CFG="Mem_Map_Test - Win32 Unicode Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
@@ -22,6 +22,12 @@ CFG=Mem_Map_Test - Win32 Alpha Debug "Win32 (x86) Console Application")
!MESSAGE "Mem_Map_Test - Win32 Alpha Debug" (based on\
"Win32 (ALPHA) Console Application")
+!MESSAGE "Mem_Map_Test - Win32 Release" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "Mem_Map_Test - Win32 Unicode Debug" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "Mem_Map_Test - Win32 Unicode Release" (based on\
+ "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
@@ -38,12 +44,13 @@ CFG=Mem_Map_Test - Win32 Alpha Debug # PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "."
-# PROP Intermediate_Dir ".\Debug"
+# PROP Intermediate_Dir ".\DLL\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Mem_Map_Test"
CPP=cl.exe
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD 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" /FD /c
+# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -69,8 +76,9 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir "Mem_Map_Test"
CPP=cl.exe
-# ADD BASE CPP /nologo /MTd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
+# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -81,12 +89,103 @@ LINK32=link.exe # ADD BASE LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
# ADD LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
+!ELSEIF "$(CFG)" == "Mem_Map_Test - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Mem_Map_Test\Debug"
+# PROP BASE Intermediate_Dir "Mem_Map_Test\Debug"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir "Mem_Map_Test"
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\DLL\Release"
+# PROP Intermediate_Dir ".\DLL\Release"
+# 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" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /FD /c
+# SUBTRACT CPP /Z<none> /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wsock32.lib odbc32.lib odbccp32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
+# ADD LINK32 wsock32.lib odbc32.lib odbccp32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
+# SUBTRACT LINK32 /debug /pdbtype:<none>
+
+!ELSEIF "$(CFG)" == "Mem_Map_Test - Win32 Unicode Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Mem_Map_Test\Unicode Debug"
+# PROP BASE Intermediate_Dir "Mem_Map_Test\Unicode Debug"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir "Mem_Map_Test"
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\DLL\Unicode_Debug"
+# PROP Intermediate_Dir ".\DLL\Unicode_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" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
+# SUBTRACT CPP /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wsock32.lib odbc32.lib odbccp32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
+# ADD LINK32 wsock32.lib odbc32.lib odbccp32.lib aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
+
+!ELSEIF "$(CFG)" == "Mem_Map_Test - Win32 Unicode Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Mem_Map_Test\Unicode Release"
+# PROP BASE Intermediate_Dir "Mem_Map_Test\Unicode Release"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir "Mem_Map_Test"
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\DLL\Unicode_Release"
+# PROP Intermediate_Dir ".\DLL\Unicode_Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir "Mem_Map_Test"
+CPP=cl.exe
+# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /FD /c
+# SUBTRACT BASE CPP /Z<none>
+# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
+# SUBTRACT CPP /Z<none> /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wsock32.lib odbc32.lib odbccp32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
+# SUBTRACT BASE LINK32 /debug /pdbtype:<none>
+# ADD LINK32 wsock32.lib odbc32.lib odbccp32.lib aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
+# SUBTRACT LINK32 /debug /pdbtype:<none>
+
!ENDIF
# Begin Target
# Name "Mem_Map_Test - Win32 Debug"
# Name "Mem_Map_Test - Win32 Alpha Debug"
+# Name "Mem_Map_Test - Win32 Release"
+# Name "Mem_Map_Test - Win32 Unicode Debug"
+# Name "Mem_Map_Test - Win32 Unicode Release"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
@@ -129,6 +228,12 @@ DEP_CPP_MEM_M=\ ".\test_config.h"\
+!ELSEIF "$(CFG)" == "Mem_Map_Test - Win32 Release"
+
+!ELSEIF "$(CFG)" == "Mem_Map_Test - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "Mem_Map_Test - Win32 Unicode Release"
+
!ENDIF
# End Source File
diff --git a/tests/Message_Block_Test.dsp b/tests/Message_Block_Test.dsp index 11db9f04f68..f438319fb97 100644 --- a/tests/Message_Block_Test.dsp +++ b/tests/Message_Block_Test.dsp @@ -5,7 +5,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-CFG=Message_Block_Test - Win32 Alpha Debug
+CFG=Message_Block_Test - Win32 Unicode Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -15,7 +15,7 @@ CFG=Message_Block_Test - Win32 Alpha Debug !MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "Message_Block_Test.mak"\
- CFG="Message_Block_Test - Win32 Alpha Debug"
+ CFG="Message_Block_Test - Win32 Unicode Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
@@ -23,6 +23,12 @@ CFG=Message_Block_Test - Win32 Alpha Debug "Win32 (x86) Console Application")
!MESSAGE "Message_Block_Test - Win32 Alpha Debug" (based on\
"Win32 (ALPHA) Console Application")
+!MESSAGE "Message_Block_Test - Win32 Release" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "Message_Block_Test - Win32 Unicode Debug" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "Message_Block_Test - Win32 Unicode Release" (based on\
+ "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
@@ -39,12 +45,13 @@ CFG=Message_Block_Test - Win32 Alpha Debug # PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "."
-# PROP Intermediate_Dir ".\Debug"
+# PROP Intermediate_Dir ".\DLL\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Message_Block_Test"
CPP=cl.exe
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD 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" /FD /c
+# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -70,8 +77,9 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir "Message_Block_Test"
CPP=cl.exe
-# ADD BASE CPP /nologo /MTd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
+# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -82,12 +90,103 @@ LINK32=link.exe # ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
# ADD LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
+!ELSEIF "$(CFG)" == "Message_Block_Test - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Message_Block_Test\Debug"
+# PROP BASE Intermediate_Dir "Message_Block_Test\Debug"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir "Message_Block_Test"
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\DLL\Release"
+# PROP Intermediate_Dir ".\DLL\Release"
+# 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" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /FD /c
+# SUBTRACT CPP /Z<none> /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 odbc32.lib odbccp32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
+# ADD LINK32 odbc32.lib odbccp32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
+# SUBTRACT LINK32 /debug /pdbtype:<none>
+
+!ELSEIF "$(CFG)" == "Message_Block_Test - Win32 Unicode Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Message_Block_Test\Unicode Debug"
+# PROP BASE Intermediate_Dir "Message_Block_Test\Unicode Debug"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir "Message_Block_Test"
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\DLL\Unicode_Debug"
+# PROP Intermediate_Dir ".\DLL\Unicode_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" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
+# SUBTRACT CPP /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 odbc32.lib odbccp32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
+# ADD LINK32 odbc32.lib odbccp32.lib aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
+
+!ELSEIF "$(CFG)" == "Message_Block_Test - Win32 Unicode Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Message_Block_Test\Unicode Release"
+# PROP BASE Intermediate_Dir "Message_Block_Test\Unicode Release"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir "Message_Block_Test"
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\DLL\Unicode_Release"
+# PROP Intermediate_Dir ".\DLL\Unicode_Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir "Message_Block_Test"
+CPP=cl.exe
+# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /FD /c
+# SUBTRACT BASE CPP /Z<none>
+# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
+# SUBTRACT CPP /Z<none> /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 odbc32.lib odbccp32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
+# SUBTRACT BASE LINK32 /debug /pdbtype:<none>
+# ADD LINK32 odbc32.lib odbccp32.lib aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
+# SUBTRACT LINK32 /debug /pdbtype:<none>
+
!ENDIF
# Begin Target
# Name "Message_Block_Test - Win32 Debug"
# Name "Message_Block_Test - Win32 Alpha Debug"
+# Name "Message_Block_Test - Win32 Release"
+# Name "Message_Block_Test - Win32 Unicode Debug"
+# Name "Message_Block_Test - Win32 Unicode Release"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
@@ -209,6 +308,12 @@ DEP_CPP_MESSA=\ ".\test_config.h"\
+!ELSEIF "$(CFG)" == "Message_Block_Test - Win32 Release"
+
+!ELSEIF "$(CFG)" == "Message_Block_Test - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "Message_Block_Test - Win32 Unicode Release"
+
!ENDIF
# End Source File
diff --git a/tests/Message_Queue_Notifications_Test.dsp b/tests/Message_Queue_Notifications_Test.dsp index 5fd46eba8ce..29610490478 100644 --- a/tests/Message_Queue_Notifications_Test.dsp +++ b/tests/Message_Queue_Notifications_Test.dsp @@ -5,7 +5,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-CFG=Message_Queue_Notifications_Test - Win32 Alpha Debug
+CFG=Message_Queue_Notifications_Test - Win32 Unicode Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -15,7 +15,7 @@ CFG=Message_Queue_Notifications_Test - Win32 Alpha Debug !MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "Message_Queue_Notifications_Test.mak"\
- CFG="Message_Queue_Notifications_Test - Win32 Alpha Debug"
+ CFG="Message_Queue_Notifications_Test - Win32 Unicode Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
@@ -23,6 +23,12 @@ CFG=Message_Queue_Notifications_Test - Win32 Alpha Debug "Win32 (x86) Console Application")
!MESSAGE "Message_Queue_Notifications_Test - Win32 Alpha Debug" (based on\
"Win32 (ALPHA) Console Application")
+!MESSAGE "Message_Queue_Notifications_Test - Win32 Release" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "Message_Queue_Notifications_Test - Win32 Unicode Debug" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "Message_Queue_Notifications_Test - Win32 Unicode Release" (based on\
+ "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
@@ -39,12 +45,13 @@ CFG=Message_Queue_Notifications_Test - Win32 Alpha Debug # PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "."
-# PROP Intermediate_Dir ".\Debug"
+# PROP Intermediate_Dir ".\DLL\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
CPP=cl.exe
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /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 /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
+# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -70,8 +77,9 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
CPP=cl.exe
-# ADD BASE CPP /nologo /MTd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /MDd /c
+# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -82,12 +90,103 @@ LINK32=link.exe # ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept /libpath:"..\ace"
# ADD LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept /libpath:"..\ace"
+!ELSEIF "$(CFG)" == "Message_Queue_Notifications_Test - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Message_"
+# PROP BASE Intermediate_Dir "Message_"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\DLL\Release"
+# PROP Intermediate_Dir ".\DLL\Release"
+# 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" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /FD /c
+# SUBTRACT CPP /Z<none> /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 odbc32.lib odbccp32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"
+# ADD LINK32 odbc32.lib odbccp32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
+# SUBTRACT LINK32 /debug /pdbtype:<none>
+
+!ELSEIF "$(CFG)" == "Message_Queue_Notifications_Test - Win32 Unicode Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Message0"
+# PROP BASE Intermediate_Dir "Message0"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\DLL\Unicode_Debug"
+# PROP Intermediate_Dir ".\DLL\Unicode_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" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
+# SUBTRACT CPP /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 odbc32.lib odbccp32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"
+# ADD LINK32 odbc32.lib odbccp32.lib aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"
+
+!ELSEIF "$(CFG)" == "Message_Queue_Notifications_Test - Win32 Unicode Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Message_"
+# PROP BASE Intermediate_Dir "Message_"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\DLL\Unicode_Release"
+# PROP Intermediate_Dir ".\DLL\Unicode_Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+CPP=cl.exe
+# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /FD /c
+# SUBTRACT BASE CPP /Z<none>
+# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
+# SUBTRACT CPP /Z<none> /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 odbc32.lib odbccp32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
+# SUBTRACT BASE LINK32 /debug /pdbtype:<none>
+# ADD LINK32 odbc32.lib odbccp32.lib aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
+# SUBTRACT LINK32 /debug /pdbtype:<none>
+
!ENDIF
# Begin Target
# Name "Message_Queue_Notifications_Test - Win32 Debug"
# Name "Message_Queue_Notifications_Test - Win32 Alpha Debug"
+# Name "Message_Queue_Notifications_Test - Win32 Release"
+# Name "Message_Queue_Notifications_Test - Win32 Unicode Debug"
+# Name "Message_Queue_Notifications_Test - Win32 Unicode Release"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
@@ -204,6 +303,12 @@ DEP_CPP_MESSA=\ ".\test_config.h"\
+!ELSEIF "$(CFG)" == "Message_Queue_Notifications_Test - Win32 Release"
+
+!ELSEIF "$(CFG)" == "Message_Queue_Notifications_Test - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "Message_Queue_Notifications_Test - Win32 Unicode Release"
+
!ENDIF
# End Source File
diff --git a/tests/Message_Queue_Test.dsp b/tests/Message_Queue_Test.dsp index a906975c583..b5f88aea192 100644 --- a/tests/Message_Queue_Test.dsp +++ b/tests/Message_Queue_Test.dsp @@ -5,7 +5,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-CFG=Message_Queue_Test - Win32 Alpha Debug
+CFG=Message_Queue_Test - Win32 Unicode Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -15,7 +15,7 @@ CFG=Message_Queue_Test - Win32 Alpha Debug !MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "Message_Queue_Test.mak"\
- CFG="Message_Queue_Test - Win32 Alpha Debug"
+ CFG="Message_Queue_Test - Win32 Unicode Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
@@ -23,6 +23,12 @@ CFG=Message_Queue_Test - Win32 Alpha Debug "Win32 (x86) Console Application")
!MESSAGE "Message_Queue_Test - Win32 Alpha Debug" (based on\
"Win32 (ALPHA) Console Application")
+!MESSAGE "Message_Queue_Test - Win32 Release" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "Message_Queue_Test - Win32 Unicode Debug" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "Message_Queue_Test - Win32 Unicode Release" (based on\
+ "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
@@ -39,12 +45,13 @@ CFG=Message_Queue_Test - Win32 Alpha Debug # PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "."
-# PROP Intermediate_Dir ".\Debug"
+# PROP Intermediate_Dir ".\DLL\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Message_Queue_Test"
CPP=cl.exe
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD 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" /FD /c
+# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -70,8 +77,9 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir "Message_Queue_Test"
CPP=cl.exe
-# ADD BASE CPP /nologo /MTd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
+# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -82,12 +90,103 @@ LINK32=link.exe # ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
# ADD LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
+!ELSEIF "$(CFG)" == "Message_Queue_Test - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Message_Queue_Test\Debug"
+# PROP BASE Intermediate_Dir "Message_Queue_Test\Debug"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir "Message_Queue_Test"
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\DLL\Release"
+# PROP Intermediate_Dir ".\DLL\Release"
+# 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" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /FD /c
+# SUBTRACT CPP /Z<none> /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 odbc32.lib odbccp32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
+# ADD LINK32 odbc32.lib odbccp32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
+# SUBTRACT LINK32 /debug /pdbtype:<none>
+
+!ELSEIF "$(CFG)" == "Message_Queue_Test - Win32 Unicode Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Message_Queue_Test\Unicode Debug"
+# PROP BASE Intermediate_Dir "Message_Queue_Test\Unicode Debug"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir "Message_Queue_Test"
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\DLL\Unicode_Debug"
+# PROP Intermediate_Dir ".\DLL\Unicode_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" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
+# SUBTRACT CPP /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 odbc32.lib odbccp32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
+# ADD LINK32 odbc32.lib odbccp32.lib aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
+
+!ELSEIF "$(CFG)" == "Message_Queue_Test - Win32 Unicode Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Message_Queue_Test\Unicode Release"
+# PROP BASE Intermediate_Dir "Message_Queue_Test\Unicode Release"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir "Message_Queue_Test"
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\DLL\Unicode_Release"
+# PROP Intermediate_Dir ".\DLL\Unicode_Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir "Message_Queue_Test"
+CPP=cl.exe
+# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /FD /c
+# SUBTRACT BASE CPP /Z<none>
+# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
+# SUBTRACT CPP /Z<none> /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 odbc32.lib odbccp32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
+# SUBTRACT BASE LINK32 /debug /pdbtype:<none>
+# ADD LINK32 odbc32.lib odbccp32.lib aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
+# SUBTRACT LINK32 /debug /pdbtype:<none>
+
!ENDIF
# Begin Target
# Name "Message_Queue_Test - Win32 Debug"
# Name "Message_Queue_Test - Win32 Alpha Debug"
+# Name "Message_Queue_Test - Win32 Release"
+# Name "Message_Queue_Test - Win32 Unicode Debug"
+# Name "Message_Queue_Test - Win32 Unicode Release"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
@@ -193,6 +292,12 @@ DEP_CPP_MESSA=\ ".\test_config.h"\
+!ELSEIF "$(CFG)" == "Message_Queue_Test - Win32 Release"
+
+!ELSEIF "$(CFG)" == "Message_Queue_Test - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "Message_Queue_Test - Win32 Unicode Release"
+
!ENDIF
# End Source File
diff --git a/tests/Naming_Test.dsp b/tests/Naming_Test.dsp index 76cc06ab6d3..069b8b388d2 100644 --- a/tests/Naming_Test.dsp +++ b/tests/Naming_Test.dsp @@ -5,7 +5,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-CFG=Naming_Test - Win32 Alpha Debug
+CFG=Naming_Test - Win32 Unicode Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -14,7 +14,7 @@ CFG=Naming_Test - Win32 Alpha Debug !MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "Naming_Test.mak" CFG="Naming_Test - Win32 Alpha Debug"
+!MESSAGE NMAKE /f "Naming_Test.mak" CFG="Naming_Test - Win32 Unicode Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
@@ -22,6 +22,12 @@ CFG=Naming_Test - Win32 Alpha Debug "Win32 (x86) Console Application")
!MESSAGE "Naming_Test - Win32 Alpha Debug" (based on\
"Win32 (ALPHA) Console Application")
+!MESSAGE "Naming_Test - Win32 Release" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "Naming_Test - Win32 Unicode Debug" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "Naming_Test - Win32 Unicode Release" (based on\
+ "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
@@ -38,12 +44,13 @@ CFG=Naming_Test - Win32 Alpha Debug # PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "."
-# PROP Intermediate_Dir ".\Debug"
+# PROP Intermediate_Dir ".\DLL\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Naming_Test"
CPP=cl.exe
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD 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" /FD /c
+# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -69,8 +76,9 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir "Naming_Test"
CPP=cl.exe
-# ADD BASE CPP /nologo /MTd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
+# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -81,12 +89,103 @@ LINK32=link.exe # ADD BASE LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
# ADD LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
+!ELSEIF "$(CFG)" == "Naming_Test - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Naming_Test\Debug"
+# PROP BASE Intermediate_Dir "Naming_Test\Debug"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir "Naming_Test"
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\DLL\Release"
+# PROP Intermediate_Dir ".\DLL\Release"
+# 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" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /FD /c
+# SUBTRACT CPP /Z<none> /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wsock32.lib odbc32.lib odbccp32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
+# ADD LINK32 wsock32.lib odbc32.lib odbccp32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
+# SUBTRACT LINK32 /debug /pdbtype:<none>
+
+!ELSEIF "$(CFG)" == "Naming_Test - Win32 Unicode Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Naming_Test\Unicode Debug"
+# PROP BASE Intermediate_Dir "Naming_Test\Unicode Debug"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir "Naming_Test"
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\DLL\Unicode_Debug"
+# PROP Intermediate_Dir ".\DLL\Unicode_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" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
+# SUBTRACT CPP /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wsock32.lib odbc32.lib odbccp32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
+# ADD LINK32 wsock32.lib odbc32.lib odbccp32.lib aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
+
+!ELSEIF "$(CFG)" == "Naming_Test - Win32 Unicode Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Naming_Test\Unicode Release"
+# PROP BASE Intermediate_Dir "Naming_Test\Unicode Release"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir "Naming_Test"
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\DLL\Unicode_Release"
+# PROP Intermediate_Dir ".\DLL\Unicode_Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir "Naming_Test"
+CPP=cl.exe
+# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /FD /c
+# SUBTRACT BASE CPP /Z<none>
+# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
+# SUBTRACT CPP /Z<none> /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wsock32.lib odbc32.lib odbccp32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
+# SUBTRACT BASE LINK32 /debug /pdbtype:<none>
+# ADD LINK32 wsock32.lib odbc32.lib odbccp32.lib aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
+# SUBTRACT LINK32 /debug /pdbtype:<none>
+
!ENDIF
# Begin Target
# Name "Naming_Test - Win32 Debug"
# Name "Naming_Test - Win32 Alpha Debug"
+# Name "Naming_Test - Win32 Release"
+# Name "Naming_Test - Win32 Unicode Debug"
+# Name "Naming_Test - Win32 Unicode Release"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
@@ -198,6 +297,12 @@ DEP_CPP_NAMIN=\ ".\test_config.h"\
+!ELSEIF "$(CFG)" == "Naming_Test - Win32 Release"
+
+!ELSEIF "$(CFG)" == "Naming_Test - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "Naming_Test - Win32 Unicode Release"
+
!ENDIF
# End Source File
diff --git a/tests/Notify_Performance_Test.dsp b/tests/Notify_Performance_Test.dsp index 62264db9f3f..df1eff4e6bd 100644 --- a/tests/Notify_Performance_Test.dsp +++ b/tests/Notify_Performance_Test.dsp @@ -5,7 +5,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-CFG=Notify_Performance_Test - Win32 Alpha Debug
+CFG=Notify_Performance_Test - Win32 Unicode Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -15,7 +15,7 @@ CFG=Notify_Performance_Test - Win32 Alpha Debug !MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "Notify_Performance_Test.mak"\
- CFG="Notify_Performance_Test - Win32 Alpha Debug"
+ CFG="Notify_Performance_Test - Win32 Unicode Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
@@ -23,6 +23,12 @@ CFG=Notify_Performance_Test - Win32 Alpha Debug "Win32 (x86) Console Application")
!MESSAGE "Notify_Performance_Test - Win32 Alpha Debug" (based on\
"Win32 (ALPHA) Console Application")
+!MESSAGE "Notify_Performance_Test - Win32 Release" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "Notify_Performance_Test - Win32 Unicode Debug" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "Notify_Performance_Test - Win32 Unicode Release" (based on\
+ "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
@@ -39,12 +45,13 @@ CFG=Notify_Performance_Test - Win32 Alpha Debug # PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir ""
-# PROP Intermediate_Dir "Debug"
+# PROP Intermediate_Dir ".\DLL\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
CPP=cl.exe
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I ".." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I ".." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -70,8 +77,9 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
CPP=cl.exe
-# ADD BASE CPP /nologo /MTd /Gt0 /W3 /GX /Zi /Od /I ".." /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I ".." /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I ".." /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I ".." /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
+# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -82,12 +90,103 @@ LINK32=link.exe # ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept /libpath:"..\ace"
# ADD LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept /libpath:"..\ace"
+!ELSEIF "$(CFG)" == "Notify_Performance_Test - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Notify_P"
+# PROP BASE Intermediate_Dir "Notify_P"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\DLL\Release"
+# PROP Intermediate_Dir ".\DLL\Release"
+# 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" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I ".." /D "_MBCS" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /FD /c
+# SUBTRACT CPP /Z<none> /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"
+# ADD LINK32 odbc32.lib odbccp32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
+# SUBTRACT LINK32 /debug /pdbtype:<none>
+
+!ELSEIF "$(CFG)" == "Notify_Performance_Test - Win32 Unicode Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Notify_0"
+# PROP BASE Intermediate_Dir "Notify_0"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\DLL\Unicode_Debug"
+# PROP Intermediate_Dir ".\DLL\Unicode_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" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I ".." /D "_MBCS" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
+# SUBTRACT CPP /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"
+# ADD LINK32 odbc32.lib odbccp32.lib aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"
+
+!ELSEIF "$(CFG)" == "Notify_Performance_Test - Win32 Unicode Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Notify_P"
+# PROP BASE Intermediate_Dir "Notify_P"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\DLL\Unicode_Release"
+# PROP Intermediate_Dir ".\DLL\Unicode_Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+CPP=cl.exe
+# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I ".." /D "_MBCS" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /FD /c
+# SUBTRACT BASE CPP /Z<none>
+# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I ".." /D "_MBCS" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
+# SUBTRACT CPP /Z<none> /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 odbc32.lib odbccp32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
+# SUBTRACT BASE LINK32 /debug /pdbtype:<none>
+# ADD LINK32 odbc32.lib odbccp32.lib aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
+# SUBTRACT LINK32 /debug /pdbtype:<none>
+
!ENDIF
# Begin Target
# Name "Notify_Performance_Test - Win32 Debug"
# Name "Notify_Performance_Test - Win32 Alpha Debug"
+# Name "Notify_Performance_Test - Win32 Release"
+# Name "Notify_Performance_Test - Win32 Unicode Debug"
+# Name "Notify_Performance_Test - Win32 Unicode Release"
# Begin Source File
SOURCE=.\Notify_Performance_Test.cpp
@@ -208,6 +307,12 @@ DEP_CPP_NOTIF=\ ".\test_config.h"\
+!ELSEIF "$(CFG)" == "Notify_Performance_Test - Win32 Release"
+
+!ELSEIF "$(CFG)" == "Notify_Performance_Test - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "Notify_Performance_Test - Win32 Unicode Release"
+
!ENDIF
# End Source File
diff --git a/tests/Pipe_Test.dsp b/tests/Pipe_Test.dsp index f9d6073fbd3..97c1f9faeb6 100644 --- a/tests/Pipe_Test.dsp +++ b/tests/Pipe_Test.dsp @@ -5,7 +5,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-CFG=Pipe_Test - Win32 Alpha Debug
+CFG=Pipe_Test - Win32 Unicode Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -14,13 +14,19 @@ CFG=Pipe_Test - Win32 Alpha Debug !MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "Pipe_Test.mak" CFG="Pipe_Test - Win32 Alpha Debug"
+!MESSAGE NMAKE /f "Pipe_Test.mak" CFG="Pipe_Test - Win32 Unicode Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "Pipe_Test - Win32 Debug" (based on "Win32 (x86) Console Application")
!MESSAGE "Pipe_Test - Win32 Alpha Debug" (based on\
"Win32 (ALPHA) Console Application")
+!MESSAGE "Pipe_Test - Win32 Release" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "Pipe_Test - Win32 Unicode Debug" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "Pipe_Test - Win32 Unicode Release" (based on\
+ "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
@@ -37,12 +43,13 @@ CFG=Pipe_Test - Win32 Alpha Debug # PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "."
-# PROP Intermediate_Dir ".\Debug"
+# PROP Intermediate_Dir ".\DLL\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Pipe_Test"
CPP=cl.exe
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD 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" /FD /c
+# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -68,8 +75,9 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir "Pipe_Test"
CPP=cl.exe
-# ADD BASE CPP /nologo /MTd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
+# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -80,12 +88,103 @@ LINK32=link.exe # ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
# ADD LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
+!ELSEIF "$(CFG)" == "Pipe_Test - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Pipe_Test\Debug"
+# PROP BASE Intermediate_Dir "Pipe_Test\Debug"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir "Pipe_Test"
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\DLL\Release"
+# PROP Intermediate_Dir ".\DLL\Release"
+# 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" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /FD /c
+# SUBTRACT CPP /Z<none> /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 odbc32.lib odbccp32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
+# ADD LINK32 odbc32.lib odbccp32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
+# SUBTRACT LINK32 /debug /pdbtype:<none>
+
+!ELSEIF "$(CFG)" == "Pipe_Test - Win32 Unicode Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Pipe_Test\Unicode Debug"
+# PROP BASE Intermediate_Dir "Pipe_Test\Unicode Debug"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir "Pipe_Test"
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\DLL\Unicode_Debug"
+# PROP Intermediate_Dir ".\DLL\Unicode_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" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
+# SUBTRACT CPP /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 odbc32.lib odbccp32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
+# ADD LINK32 odbc32.lib odbccp32.lib aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
+
+!ELSEIF "$(CFG)" == "Pipe_Test - Win32 Unicode Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Pipe_Test\Unicode Release"
+# PROP BASE Intermediate_Dir "Pipe_Test\Unicode Release"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir "Pipe_Test"
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\DLL\Unicode_Release"
+# PROP Intermediate_Dir ".\DLL\Unicode_Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir "Pipe_Test"
+CPP=cl.exe
+# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /FD /c
+# SUBTRACT BASE CPP /Z<none>
+# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
+# SUBTRACT CPP /Z<none> /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 odbc32.lib odbccp32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
+# SUBTRACT BASE LINK32 /debug /pdbtype:<none>
+# ADD LINK32 odbc32.lib odbccp32.lib aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
+# SUBTRACT LINK32 /debug /pdbtype:<none>
+
!ENDIF
# Begin Target
# Name "Pipe_Test - Win32 Debug"
# Name "Pipe_Test - Win32 Alpha Debug"
+# Name "Pipe_Test - Win32 Release"
+# Name "Pipe_Test - Win32 Unicode Debug"
+# Name "Pipe_Test - Win32 Unicode Release"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
@@ -132,6 +231,12 @@ DEP_CPP_PIPE_=\ ".\test_config.h"\
+!ELSEIF "$(CFG)" == "Pipe_Test - Win32 Release"
+
+!ELSEIF "$(CFG)" == "Pipe_Test - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "Pipe_Test - Win32 Unicode Release"
+
!ENDIF
# End Source File
diff --git a/tests/Priority_Buffer_Test.dsp b/tests/Priority_Buffer_Test.dsp index 8ed7a401170..bded8c423ca 100644 --- a/tests/Priority_Buffer_Test.dsp +++ b/tests/Priority_Buffer_Test.dsp @@ -5,7 +5,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-CFG=Priority_Buffer_Test - Win32 Alpha Debug
+CFG=Priority_Buffer_Test - Win32 Unicode Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -15,7 +15,7 @@ CFG=Priority_Buffer_Test - Win32 Alpha Debug !MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "Priority_Buffer_Test.mak"\
- CFG="Priority_Buffer_Test - Win32 Alpha Debug"
+ CFG="Priority_Buffer_Test - Win32 Unicode Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
@@ -23,6 +23,12 @@ CFG=Priority_Buffer_Test - Win32 Alpha Debug "Win32 (x86) Console Application")
!MESSAGE "Priority_Buffer_Test - Win32 Alpha Debug" (based on\
"Win32 (ALPHA) Console Application")
+!MESSAGE "Priority_Buffer_Test - Win32 Release" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "Priority_Buffer_Test - Win32 Unicode Debug" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "Priority_Buffer_Test - Win32 Unicode Release" (based on\
+ "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
@@ -39,12 +45,13 @@ CFG=Priority_Buffer_Test - Win32 Alpha Debug # PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "."
-# PROP Intermediate_Dir ".\Debug"
+# PROP Intermediate_Dir ".\DLL\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Priority_Buffer_Test"
CPP=cl.exe
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD 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" /FD /c
+# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -70,8 +77,9 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir "Priority_Buffer_Test"
CPP=cl.exe
-# ADD BASE CPP /nologo /MTd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
+# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -82,12 +90,105 @@ LINK32=link.exe # ADD BASE LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
# ADD LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
+!ELSEIF "$(CFG)" == "Priority_Buffer_Test - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Priority_Buffer_Test\Debug"
+# PROP BASE Intermediate_Dir "Priority_Buffer_Test\Debug"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir "Priority_Buffer_Test"
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\DLL\Release"
+# PROP Intermediate_Dir ".\DLL\Release"
+# 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" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /FD /c
+# SUBTRACT CPP /Z<none> /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 odbc32.lib odbccp32.lib wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
+# ADD LINK32 odbc32.lib odbccp32.lib wsock32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
+# SUBTRACT LINK32 /debug /pdbtype:<none>
+
+!ELSEIF "$(CFG)" == "Priority_Buffer_Test - Win32 Unicode Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Priority_Buffer_Test\Unicode Debug"
+# PROP BASE Intermediate_Dir "Priority_Buffer_Test\Unicode Debug"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir "Priority_Buffer_Test"
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\DLL\Unicode_Debug"
+# PROP Intermediate_Dir ".\DLL\Unicode_Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir "Priority_Buffer_Test"
+CPP=cl.exe
+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MDd /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "_MBCS" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "UNICODE" /FD /MDd /c
+# SUBTRACT CPP /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:IX86 /pdbtype:sept /libpath:"..\ace"
+# SUBTRACT BASE LINK32 /incremental:no
+# ADD LINK32 wsock32.lib odbc32.lib odbccp32.lib aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:IX86 /pdbtype:sept /libpath:"..\ace"
+# SUBTRACT LINK32 /incremental:no
+
+!ELSEIF "$(CFG)" == "Priority_Buffer_Test - Win32 Unicode Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Priority_Buffer_Test\Unicode Release"
+# PROP BASE Intermediate_Dir "Priority_Buffer_Test\Unicode Release"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir "Priority_Buffer_Test"
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\DLL\Unicode_Release"
+# PROP Intermediate_Dir ".\DLL\Unicode_Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir "Priority_Buffer_Test"
+CPP=cl.exe
+# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /FD /c
+# SUBTRACT BASE CPP /Z<none>
+# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
+# SUBTRACT CPP /Z<none> /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 odbc32.lib odbccp32.lib wsock32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
+# SUBTRACT BASE LINK32 /debug /pdbtype:<none>
+# ADD LINK32 odbc32.lib odbccp32.lib wsock32.lib aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
+# SUBTRACT LINK32 /debug /pdbtype:<none>
+
!ENDIF
# Begin Target
# Name "Priority_Buffer_Test - Win32 Debug"
# Name "Priority_Buffer_Test - Win32 Alpha Debug"
+# Name "Priority_Buffer_Test - Win32 Release"
+# Name "Priority_Buffer_Test - Win32 Unicode Debug"
+# Name "Priority_Buffer_Test - Win32 Unicode Release"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
@@ -193,6 +294,12 @@ DEP_CPP_PRIOR=\ ".\test_config.h"\
+!ELSEIF "$(CFG)" == "Priority_Buffer_Test - Win32 Release"
+
+!ELSEIF "$(CFG)" == "Priority_Buffer_Test - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "Priority_Buffer_Test - Win32 Unicode Release"
+
!ENDIF
# End Source File
diff --git a/tests/Priority_Reactor_Test.dsp b/tests/Priority_Reactor_Test.dsp index f64fdb8572b..49b88aba371 100644 --- a/tests/Priority_Reactor_Test.dsp +++ b/tests/Priority_Reactor_Test.dsp @@ -5,7 +5,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-CFG=Priority_Reactor_Test - Win32 Alpha Debug
+CFG=Priority_Reactor_Test - Win32 Unicode Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -15,7 +15,7 @@ CFG=Priority_Reactor_Test - Win32 Alpha Debug !MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "Priority_Reactor_Test.mak"\
- CFG="Priority_Reactor_Test - Win32 Alpha Debug"
+ CFG="Priority_Reactor_Test - Win32 Unicode Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
@@ -23,6 +23,12 @@ CFG=Priority_Reactor_Test - Win32 Alpha Debug "Win32 (x86) Console Application")
!MESSAGE "Priority_Reactor_Test - Win32 Alpha Debug" (based on\
"Win32 (ALPHA) Console Application")
+!MESSAGE "Priority_Reactor_Test - Win32 Release" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "Priority_Reactor_Test - Win32 Unicode Debug" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "Priority_Reactor_Test - Win32 Unicode Release" (based on\
+ "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
@@ -39,12 +45,13 @@ CFG=Priority_Reactor_Test - Win32 Alpha Debug # PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir ""
-# PROP Intermediate_Dir "Debug"
+# PROP Intermediate_Dir ".\DLL\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
CPP=cl.exe
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -70,8 +77,9 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
CPP=cl.exe
-# ADD BASE CPP /nologo /MTd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
+# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -82,12 +90,103 @@ LINK32=link.exe # ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept /libpath:"..\ace"
# ADD LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept /libpath:"..\ace"
+!ELSEIF "$(CFG)" == "Priority_Reactor_Test - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Priority"
+# PROP BASE Intermediate_Dir "Priority"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\DLL\Release"
+# PROP Intermediate_Dir ".\DLL\Release"
+# 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" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "_MBCS" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /FD /c
+# SUBTRACT CPP /Z<none> /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"
+# ADD LINK32 odbc32.lib odbccp32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
+# SUBTRACT LINK32 /debug /pdbtype:<none>
+
+!ELSEIF "$(CFG)" == "Priority_Reactor_Test - Win32 Unicode Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Priorit0"
+# PROP BASE Intermediate_Dir "Priorit0"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\DLL\Unicode_Debug"
+# PROP Intermediate_Dir ".\DLL\Unicode_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" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "_MBCS" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
+# SUBTRACT CPP /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"
+# ADD LINK32 odbc32.lib odbccp32.lib aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"
+
+!ELSEIF "$(CFG)" == "Priority_Reactor_Test - Win32 Unicode Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Priority"
+# PROP BASE Intermediate_Dir "Priority"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\DLL\Unicode_Release"
+# PROP Intermediate_Dir ".\DLL\Unicode_Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+CPP=cl.exe
+# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\\" /D "_MBCS" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /FD /c
+# SUBTRACT BASE CPP /Z<none>
+# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "_MBCS" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
+# SUBTRACT CPP /Z<none> /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 odbc32.lib odbccp32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
+# SUBTRACT BASE LINK32 /debug /pdbtype:<none>
+# ADD LINK32 odbc32.lib odbccp32.lib aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
+# SUBTRACT LINK32 /debug /pdbtype:<none>
+
!ENDIF
# Begin Target
# Name "Priority_Reactor_Test - Win32 Debug"
# Name "Priority_Reactor_Test - Win32 Alpha Debug"
+# Name "Priority_Reactor_Test - Win32 Release"
+# Name "Priority_Reactor_Test - Win32 Unicode Debug"
+# Name "Priority_Reactor_Test - Win32 Unicode Release"
# Begin Source File
SOURCE=.\Priority_Reactor_Test.cpp
@@ -245,6 +344,12 @@ DEP_CPP_PRIOR=\ ".\test_config.h"\
+!ELSEIF "$(CFG)" == "Priority_Reactor_Test - Win32 Release"
+
+!ELSEIF "$(CFG)" == "Priority_Reactor_Test - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "Priority_Reactor_Test - Win32 Unicode Release"
+
!ENDIF
# End Source File
diff --git a/tests/Priority_Task_Test.dsp b/tests/Priority_Task_Test.dsp index a61d803a556..eca91af3084 100644 --- a/tests/Priority_Task_Test.dsp +++ b/tests/Priority_Task_Test.dsp @@ -5,7 +5,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-CFG=Priority_Task_Test - Win32 Alpha Debug
+CFG=Priority_Task_Test - Win32 Unicode Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -15,7 +15,7 @@ CFG=Priority_Task_Test - Win32 Alpha Debug !MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "Priority_Task_Test.mak"\
- CFG="Priority_Task_Test - Win32 Alpha Debug"
+ CFG="Priority_Task_Test - Win32 Unicode Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
@@ -23,6 +23,12 @@ CFG=Priority_Task_Test - Win32 Alpha Debug "Win32 (x86) Console Application")
!MESSAGE "Priority_Task_Test - Win32 Alpha Debug" (based on\
"Win32 (ALPHA) Console Application")
+!MESSAGE "Priority_Task_Test - Win32 Release" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "Priority_Task_Test - Win32 Unicode Debug" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "Priority_Task_Test - Win32 Unicode Release" (based on\
+ "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
@@ -39,12 +45,13 @@ CFG=Priority_Task_Test - Win32 Alpha Debug # PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "."
-# PROP Intermediate_Dir ".\Debug"
+# PROP Intermediate_Dir ".\DLL\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Priority_Task_Test"
CPP=cl.exe
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD 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" /FD /c
+# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -70,8 +77,9 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir "Priority_Task_Test"
CPP=cl.exe
-# ADD BASE CPP /nologo /MTd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
+# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -82,12 +90,103 @@ LINK32=link.exe # ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
# ADD LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
+!ELSEIF "$(CFG)" == "Priority_Task_Test - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Priority_Task_Test\Debug"
+# PROP BASE Intermediate_Dir "Priority_Task_Test\Debug"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir "Priority_Task_Test"
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\DLL\Release"
+# PROP Intermediate_Dir ".\DLL\Release"
+# 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" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /FD /c
+# SUBTRACT CPP /Z<none> /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 odbc32.lib odbccp32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
+# ADD LINK32 odbc32.lib odbccp32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
+# SUBTRACT LINK32 /debug /pdbtype:<none>
+
+!ELSEIF "$(CFG)" == "Priority_Task_Test - Win32 Unicode Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Priority_Task_Test\Unicode Debug"
+# PROP BASE Intermediate_Dir "Priority_Task_Test\Unicode Debug"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir "Priority_Task_Test"
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\DLL\Unicode_Debug"
+# PROP Intermediate_Dir ".\DLL\Unicode_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" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
+# SUBTRACT CPP /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 odbc32.lib odbccp32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
+# ADD LINK32 odbc32.lib odbccp32.lib aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
+
+!ELSEIF "$(CFG)" == "Priority_Task_Test - Win32 Unicode Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Priority_Task_Test\Unicode Release"
+# PROP BASE Intermediate_Dir "Priority_Task_Test\Unicode Release"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir "Priority_Task_Test"
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\DLL\Unicode_Release"
+# PROP Intermediate_Dir ".\DLL\Unicode_Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir "Priority_Task_Test"
+CPP=cl.exe
+# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /FD /c
+# SUBTRACT BASE CPP /Z<none>
+# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
+# SUBTRACT CPP /Z<none> /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 odbc32.lib odbccp32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
+# SUBTRACT BASE LINK32 /debug /pdbtype:<none>
+# ADD LINK32 odbc32.lib odbccp32.lib aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
+# SUBTRACT LINK32 /debug /pdbtype:<none>
+
!ENDIF
# Begin Target
# Name "Priority_Task_Test - Win32 Debug"
# Name "Priority_Task_Test - Win32 Alpha Debug"
+# Name "Priority_Task_Test - Win32 Release"
+# Name "Priority_Task_Test - Win32 Unicode Debug"
+# Name "Priority_Task_Test - Win32 Unicode Release"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
@@ -206,6 +305,12 @@ DEP_CPP_PRIOR=\ ".\test_config.h"\
+!ELSEIF "$(CFG)" == "Priority_Task_Test - Win32 Release"
+
+!ELSEIF "$(CFG)" == "Priority_Task_Test - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "Priority_Task_Test - Win32 Unicode Release"
+
!ENDIF
# End Source File
diff --git a/tests/Process_Mutex_Test.dsp b/tests/Process_Mutex_Test.dsp index 1b624650cce..8c69af8b25a 100644 --- a/tests/Process_Mutex_Test.dsp +++ b/tests/Process_Mutex_Test.dsp @@ -5,7 +5,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-CFG=Process_Mutex_Test - Win32 Alpha Debug
+CFG=Process_Mutex_Test - Win32 Unicode Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -15,7 +15,7 @@ CFG=Process_Mutex_Test - Win32 Alpha Debug !MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "Process_Mutex_Test.mak"\
- CFG="Process_Mutex_Test - Win32 Alpha Debug"
+ CFG="Process_Mutex_Test - Win32 Unicode Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
@@ -23,6 +23,12 @@ CFG=Process_Mutex_Test - Win32 Alpha Debug "Win32 (x86) Console Application")
!MESSAGE "Process_Mutex_Test - Win32 Alpha Debug" (based on\
"Win32 (ALPHA) Console Application")
+!MESSAGE "Process_Mutex_Test - Win32 Release" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "Process_Mutex_Test - Win32 Unicode Debug" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "Process_Mutex_Test - Win32 Unicode Release" (based on\
+ "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
@@ -39,12 +45,13 @@ CFG=Process_Mutex_Test - Win32 Alpha Debug # PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "."
-# PROP Intermediate_Dir ".\Debug"
+# PROP Intermediate_Dir ".\DLL\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Process_Mutex_Test"
CPP=cl.exe
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD 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" /FD /c
+# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -70,8 +77,9 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir "Process_Mutex_Test"
CPP=cl.exe
-# ADD BASE CPP /nologo /MTd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
+# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -82,12 +90,103 @@ LINK32=link.exe # ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
# ADD LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
+!ELSEIF "$(CFG)" == "Process_Mutex_Test - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Process_Mutex_Test\Debug"
+# PROP BASE Intermediate_Dir "Process_Mutex_Test\Debug"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir "Process_Mutex_Test"
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\DLL\Release"
+# PROP Intermediate_Dir ".\DLL\Release"
+# 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" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /FD /c
+# SUBTRACT CPP /Z<none> /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 odbc32.lib odbccp32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
+# ADD LINK32 odbc32.lib odbccp32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
+# SUBTRACT LINK32 /debug /pdbtype:<none>
+
+!ELSEIF "$(CFG)" == "Process_Mutex_Test - Win32 Unicode Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Process_Mutex_Test\Unicode Debug"
+# PROP BASE Intermediate_Dir "Process_Mutex_Test\Unicode Debug"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir "Process_Mutex_Test"
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\DLL\Unicode_Debug"
+# PROP Intermediate_Dir ".\DLL\Unicode_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" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
+# SUBTRACT CPP /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 odbc32.lib odbccp32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
+# ADD LINK32 odbc32.lib odbccp32.lib aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
+
+!ELSEIF "$(CFG)" == "Process_Mutex_Test - Win32 Unicode Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Process_Mutex_Test\Unicode Release"
+# PROP BASE Intermediate_Dir "Process_Mutex_Test\Unicode Release"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir "Process_Mutex_Test"
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\DLL\Unicode_Release"
+# PROP Intermediate_Dir ".\DLL\Unicode_Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir "Process_Mutex_Test"
+CPP=cl.exe
+# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /FD /c
+# SUBTRACT BASE CPP /Z<none>
+# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
+# SUBTRACT CPP /Z<none> /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 odbc32.lib odbccp32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
+# SUBTRACT BASE LINK32 /debug /pdbtype:<none>
+# ADD LINK32 odbc32.lib odbccp32.lib aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
+# SUBTRACT LINK32 /debug /pdbtype:<none>
+
!ENDIF
# Begin Target
# Name "Process_Mutex_Test - Win32 Debug"
# Name "Process_Mutex_Test - Win32 Alpha Debug"
+# Name "Process_Mutex_Test - Win32 Release"
+# Name "Process_Mutex_Test - Win32 Unicode Debug"
+# Name "Process_Mutex_Test - Win32 Unicode Release"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
@@ -146,6 +245,12 @@ DEP_CPP_PROCE=\ ".\test_config.h"\
+!ELSEIF "$(CFG)" == "Process_Mutex_Test - Win32 Release"
+
+!ELSEIF "$(CFG)" == "Process_Mutex_Test - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "Process_Mutex_Test - Win32 Unicode Release"
+
!ENDIF
# End Source File
diff --git a/tests/Process_Strategy_Test.dsp b/tests/Process_Strategy_Test.dsp index 61a0764fbd8..77d9defc7b6 100644 --- a/tests/Process_Strategy_Test.dsp +++ b/tests/Process_Strategy_Test.dsp @@ -5,7 +5,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-CFG=Process_Strategy_Test - Win32 Alpha Debug
+CFG=Process_Strategy_Test - Win32 Unicode Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -15,7 +15,7 @@ CFG=Process_Strategy_Test - Win32 Alpha Debug !MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "Process_Strategy_Test.mak"\
- CFG="Process_Strategy_Test - Win32 Alpha Debug"
+ CFG="Process_Strategy_Test - Win32 Unicode Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
@@ -23,6 +23,12 @@ CFG=Process_Strategy_Test - Win32 Alpha Debug "Win32 (x86) Console Application")
!MESSAGE "Process_Strategy_Test - Win32 Alpha Debug" (based on\
"Win32 (ALPHA) Console Application")
+!MESSAGE "Process_Strategy_Test - Win32 Release" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "Process_Strategy_Test - Win32 Unicode Debug" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "Process_Strategy_Test - Win32 Unicode Release" (based on\
+ "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
@@ -39,12 +45,13 @@ CFG=Process_Strategy_Test - Win32 Alpha Debug # PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "."
-# PROP Intermediate_Dir ".\Debug"
+# PROP Intermediate_Dir ".\DLL\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Process_Strategy_Test"
CPP=cl.exe
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD 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" /FD /c
+# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -70,8 +77,9 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir "Process_Strategy_Test"
CPP=cl.exe
-# ADD BASE CPP /nologo /MTd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
+# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -82,12 +90,103 @@ LINK32=link.exe # ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
# ADD LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
+!ELSEIF "$(CFG)" == "Process_Strategy_Test - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Process_Strategy_Test\Debug"
+# PROP BASE Intermediate_Dir "Process_Strategy_Test\Debug"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir "Process_Strategy_Test"
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\DLL\Release"
+# PROP Intermediate_Dir ".\DLL\Release"
+# 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" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /FD /c
+# SUBTRACT CPP /Z<none> /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 odbc32.lib odbccp32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
+# ADD LINK32 odbc32.lib odbccp32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
+# SUBTRACT LINK32 /debug /pdbtype:<none>
+
+!ELSEIF "$(CFG)" == "Process_Strategy_Test - Win32 Unicode Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Process_Strategy_Test\Unicode Debug"
+# PROP BASE Intermediate_Dir "Process_Strategy_Test\Unicode Debug"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir "Process_Strategy_Test"
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\DLL\Unicode_Debug"
+# PROP Intermediate_Dir ".\DLL\Unicode_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" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
+# SUBTRACT CPP /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 odbc32.lib odbccp32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
+# ADD LINK32 odbc32.lib odbccp32.lib aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
+
+!ELSEIF "$(CFG)" == "Process_Strategy_Test - Win32 Unicode Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Process_Strategy_Test\Unicode Release"
+# PROP BASE Intermediate_Dir "Process_Strategy_Test\Unicode Release"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir "Process_Strategy_Test"
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\DLL\Unicode_Release"
+# PROP Intermediate_Dir ".\DLL\Unicode_Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir "Process_Strategy_Test"
+CPP=cl.exe
+# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /FD /c
+# SUBTRACT BASE CPP /Z<none>
+# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
+# SUBTRACT CPP /Z<none> /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 odbc32.lib odbccp32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
+# SUBTRACT BASE LINK32 /debug /pdbtype:<none>
+# ADD LINK32 odbc32.lib odbccp32.lib aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
+# SUBTRACT LINK32 /debug /pdbtype:<none>
+
!ENDIF
# Begin Target
# Name "Process_Strategy_Test - Win32 Debug"
# Name "Process_Strategy_Test - Win32 Alpha Debug"
+# Name "Process_Strategy_Test - Win32 Release"
+# Name "Process_Strategy_Test - Win32 Unicode Debug"
+# Name "Process_Strategy_Test - Win32 Unicode Release"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
@@ -235,6 +334,12 @@ DEP_CPP_PROCE=\ ".\test_config.h"\
+!ELSEIF "$(CFG)" == "Process_Strategy_Test - Win32 Release"
+
+!ELSEIF "$(CFG)" == "Process_Strategy_Test - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "Process_Strategy_Test - Win32 Unicode Release"
+
!ENDIF
# End Source File
diff --git a/tests/Reactor_Exceptions_Test.dsp b/tests/Reactor_Exceptions_Test.dsp index 83992b78290..4a057a535e1 100644 --- a/tests/Reactor_Exceptions_Test.dsp +++ b/tests/Reactor_Exceptions_Test.dsp @@ -5,7 +5,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-CFG=Reactor_Exceptions_Test - Win32 Alpha Debug
+CFG=Reactor_Exceptions_Test - Win32 Unicode Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -15,7 +15,7 @@ CFG=Reactor_Exceptions_Test - Win32 Alpha Debug !MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "Reactor_Exceptions_Test.mak"\
- CFG="Reactor_Exceptions_Test - Win32 Alpha Debug"
+ CFG="Reactor_Exceptions_Test - Win32 Unicode Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
@@ -23,6 +23,12 @@ CFG=Reactor_Exceptions_Test - Win32 Alpha Debug "Win32 (x86) Console Application")
!MESSAGE "Reactor_Exceptions_Test - Win32 Alpha Debug" (based on\
"Win32 (ALPHA) Console Application")
+!MESSAGE "Reactor_Exceptions_Test - Win32 Release" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "Reactor_Exceptions_Test - Win32 Unicode Debug" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "Reactor_Exceptions_Test - Win32 Unicode Release" (based on\
+ "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
@@ -39,12 +45,13 @@ CFG=Reactor_Exceptions_Test - Win32 Alpha Debug # PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "."
-# PROP Intermediate_Dir ".\Debug"
+# PROP Intermediate_Dir ".\DLL\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Reactor_Exceptions_Test"
CPP=cl.exe
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD 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" /FD /c
+# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -70,8 +77,9 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir "Reactor_Exceptions_Test"
CPP=cl.exe
-# ADD BASE CPP /nologo /MTd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
+# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -82,12 +90,103 @@ LINK32=link.exe # ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
# ADD LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
+!ELSEIF "$(CFG)" == "Reactor_Exceptions_Test - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Reactor_Exceptions_Test\Debug"
+# PROP BASE Intermediate_Dir "Reactor_Exceptions_Test\Debug"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir "Reactor_Exceptions_Test"
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\DLL\Release"
+# PROP Intermediate_Dir ".\DLL\Release"
+# 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" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /FD /c
+# SUBTRACT CPP /Z<none> /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 odbc32.lib odbccp32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
+# ADD LINK32 odbc32.lib odbccp32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
+# SUBTRACT LINK32 /debug /pdbtype:<none>
+
+!ELSEIF "$(CFG)" == "Reactor_Exceptions_Test - Win32 Unicode Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Reactor_Exceptions_Test\Unicode Debug"
+# PROP BASE Intermediate_Dir "Reactor_Exceptions_Test\Unicode Debug"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir "Reactor_Exceptions_Test"
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\DLL\Unicode_Debug"
+# PROP Intermediate_Dir ".\DLL\Unicode_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" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
+# SUBTRACT CPP /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 odbc32.lib odbccp32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
+# ADD LINK32 odbc32.lib odbccp32.lib aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
+
+!ELSEIF "$(CFG)" == "Reactor_Exceptions_Test - Win32 Unicode Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Reactor_Exceptions_Test\Unicode Release"
+# PROP BASE Intermediate_Dir "Reactor_Exceptions_Test\Unicode Release"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir "Reactor_Exceptions_Test"
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\DLL\Unicode_Release"
+# PROP Intermediate_Dir ".\DLL\Unicode_Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir "Reactor_Exceptions_Test"
+CPP=cl.exe
+# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /FD /c
+# SUBTRACT BASE CPP /Z<none>
+# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
+# SUBTRACT CPP /Z<none> /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 odbc32.lib odbccp32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
+# SUBTRACT BASE LINK32 /debug /pdbtype:<none>
+# ADD LINK32 odbc32.lib odbccp32.lib aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
+# SUBTRACT LINK32 /debug /pdbtype:<none>
+
!ENDIF
# Begin Target
# Name "Reactor_Exceptions_Test - Win32 Debug"
# Name "Reactor_Exceptions_Test - Win32 Alpha Debug"
+# Name "Reactor_Exceptions_Test - Win32 Release"
+# Name "Reactor_Exceptions_Test - Win32 Unicode Debug"
+# Name "Reactor_Exceptions_Test - Win32 Unicode Release"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
@@ -180,6 +279,12 @@ DEP_CPP_REACT=\ ".\test_config.h"\
+!ELSEIF "$(CFG)" == "Reactor_Exceptions_Test - Win32 Release"
+
+!ELSEIF "$(CFG)" == "Reactor_Exceptions_Test - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "Reactor_Exceptions_Test - Win32 Unicode Release"
+
!ENDIF
# End Source File
diff --git a/tests/Reactor_Notify_Test.dsp b/tests/Reactor_Notify_Test.dsp index 586f6bbe749..34e267a8c6a 100644 --- a/tests/Reactor_Notify_Test.dsp +++ b/tests/Reactor_Notify_Test.dsp @@ -5,7 +5,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-CFG=Reactor_Notify_Test - Win32 Alpha Debug
+CFG=Reactor_Notify_Test - Win32 Unicode Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -15,7 +15,7 @@ CFG=Reactor_Notify_Test - Win32 Alpha Debug !MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "Reactor_Notify_Test.mak"\
- CFG="Reactor_Notify_Test - Win32 Alpha Debug"
+ CFG="Reactor_Notify_Test - Win32 Unicode Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
@@ -23,6 +23,12 @@ CFG=Reactor_Notify_Test - Win32 Alpha Debug "Win32 (x86) Console Application")
!MESSAGE "Reactor_Notify_Test - Win32 Alpha Debug" (based on\
"Win32 (ALPHA) Console Application")
+!MESSAGE "Reactor_Notify_Test - Win32 Release" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "Reactor_Notify_Test - Win32 Unicode Debug" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "Reactor_Notify_Test - Win32 Unicode Release" (based on\
+ "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
@@ -39,12 +45,13 @@ CFG=Reactor_Notify_Test - Win32 Alpha Debug # PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "."
-# PROP Intermediate_Dir ".\Debug"
+# PROP Intermediate_Dir ".\DLL\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Reactor_Notify_Test"
CPP=cl.exe
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD 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" /FD /c
+# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -70,8 +77,9 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir "Reactor_Notify_Test"
CPP=cl.exe
-# ADD BASE CPP /nologo /MTd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
+# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -82,12 +90,103 @@ LINK32=link.exe # ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
# ADD LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
+!ELSEIF "$(CFG)" == "Reactor_Notify_Test - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Reactor_Notify_Test\Debug"
+# PROP BASE Intermediate_Dir "Reactor_Notify_Test\Debug"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir "Reactor_Notify_Test"
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\DLL\Release"
+# PROP Intermediate_Dir ".\DLL\Release"
+# 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" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /FD /c
+# SUBTRACT CPP /Z<none> /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 odbc32.lib odbccp32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
+# ADD LINK32 odbc32.lib odbccp32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
+# SUBTRACT LINK32 /debug /pdbtype:<none>
+
+!ELSEIF "$(CFG)" == "Reactor_Notify_Test - Win32 Unicode Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Reactor_Notify_Test\Unicode Debug"
+# PROP BASE Intermediate_Dir "Reactor_Notify_Test\Unicode Debug"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir "Reactor_Notify_Test"
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\DLL\Unicode_Debug"
+# PROP Intermediate_Dir ".\DLL\Unicode_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" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
+# SUBTRACT CPP /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 odbc32.lib odbccp32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
+# ADD LINK32 odbc32.lib odbccp32.lib aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
+
+!ELSEIF "$(CFG)" == "Reactor_Notify_Test - Win32 Unicode Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Reactor_Notify_Test\Unicode Release"
+# PROP BASE Intermediate_Dir "Reactor_Notify_Test\Unicode Release"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir "Reactor_Notify_Test"
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\DLL\Unicode_Release"
+# PROP Intermediate_Dir ".\DLL\Unicode_Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir "Reactor_Notify_Test"
+CPP=cl.exe
+# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /FD /c
+# SUBTRACT BASE CPP /Z<none>
+# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
+# SUBTRACT CPP /Z<none> /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 odbc32.lib odbccp32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
+# SUBTRACT BASE LINK32 /debug /pdbtype:<none>
+# ADD LINK32 odbc32.lib odbccp32.lib aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
+# SUBTRACT LINK32 /debug /pdbtype:<none>
+
!ENDIF
# Begin Target
# Name "Reactor_Notify_Test - Win32 Debug"
# Name "Reactor_Notify_Test - Win32 Alpha Debug"
+# Name "Reactor_Notify_Test - Win32 Release"
+# Name "Reactor_Notify_Test - Win32 Unicode Debug"
+# Name "Reactor_Notify_Test - Win32 Unicode Release"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
@@ -206,6 +305,12 @@ DEP_CPP_REACT=\ ".\test_config.h"\
+!ELSEIF "$(CFG)" == "Reactor_Notify_Test - Win32 Release"
+
+!ELSEIF "$(CFG)" == "Reactor_Notify_Test - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "Reactor_Notify_Test - Win32 Unicode Release"
+
!ENDIF
# End Source File
diff --git a/tests/Reactor_Performance_Test.dsp b/tests/Reactor_Performance_Test.dsp index 7ec52c4d715..7e3e843aa1f 100644 --- a/tests/Reactor_Performance_Test.dsp +++ b/tests/Reactor_Performance_Test.dsp @@ -5,7 +5,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-CFG=Reactor_Performance_Test - Win32 Alpha Debug
+CFG=Reactor_Performance_Test - Win32 Unicode Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -15,7 +15,7 @@ CFG=Reactor_Performance_Test - Win32 Alpha Debug !MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "Reactor_Performance_Test.mak"\
- CFG="Reactor_Performance_Test - Win32 Alpha Debug"
+ CFG="Reactor_Performance_Test - Win32 Unicode Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
@@ -23,6 +23,12 @@ CFG=Reactor_Performance_Test - Win32 Alpha Debug "Win32 (x86) Console Application")
!MESSAGE "Reactor_Performance_Test - Win32 Alpha Debug" (based on\
"Win32 (ALPHA) Console Application")
+!MESSAGE "Reactor_Performance_Test - Win32 Release" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "Reactor_Performance_Test - Win32 Unicode Debug" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "Reactor_Performance_Test - Win32 Unicode Release" (based on\
+ "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
@@ -39,12 +45,13 @@ CFG=Reactor_Performance_Test - Win32 Alpha Debug # PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir ""
-# PROP Intermediate_Dir "Debug"
+# PROP Intermediate_Dir ".\DLL\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
CPP=cl.exe
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I ".." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I ".." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -70,8 +77,9 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
CPP=cl.exe
-# ADD BASE CPP /nologo /MTd /Gt0 /W3 /GX /Zi /Od /I ".." /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I ".." /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I ".." /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I ".." /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
+# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -82,12 +90,103 @@ LINK32=link.exe # ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept /libpath:"..\ace"
# ADD LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept /libpath:"..\ace"
+!ELSEIF "$(CFG)" == "Reactor_Performance_Test - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Reactor_"
+# PROP BASE Intermediate_Dir "Reactor_"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\DLL\Release"
+# PROP Intermediate_Dir ".\DLL\Release"
+# 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" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I ".." /D "_MBCS" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /FD /c
+# SUBTRACT CPP /Z<none> /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"
+# ADD LINK32 odbc32.lib odbccp32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
+# SUBTRACT LINK32 /debug /pdbtype:<none>
+
+!ELSEIF "$(CFG)" == "Reactor_Performance_Test - Win32 Unicode Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Reactor0"
+# PROP BASE Intermediate_Dir "Reactor0"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\DLL\Unicode_Debug"
+# PROP Intermediate_Dir ".\DLL\Unicode_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" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I ".." /D "_MBCS" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
+# SUBTRACT CPP /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"
+# ADD LINK32 odbc32.lib odbccp32.lib aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"
+
+!ELSEIF "$(CFG)" == "Reactor_Performance_Test - Win32 Unicode Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Reactor_"
+# PROP BASE Intermediate_Dir "Reactor_"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\DLL\Unicode_Release"
+# PROP Intermediate_Dir ".\DLL\Unicode_Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+CPP=cl.exe
+# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I ".." /D "_MBCS" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /FD /c
+# SUBTRACT BASE CPP /Z<none>
+# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I ".." /D "_MBCS" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
+# SUBTRACT CPP /Z<none> /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 odbc32.lib odbccp32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
+# SUBTRACT BASE LINK32 /debug /pdbtype:<none>
+# ADD LINK32 odbc32.lib odbccp32.lib aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
+# SUBTRACT LINK32 /debug /pdbtype:<none>
+
!ENDIF
# Begin Target
# Name "Reactor_Performance_Test - Win32 Debug"
# Name "Reactor_Performance_Test - Win32 Alpha Debug"
+# Name "Reactor_Performance_Test - Win32 Release"
+# Name "Reactor_Performance_Test - Win32 Unicode Debug"
+# Name "Reactor_Performance_Test - Win32 Unicode Release"
# Begin Source File
SOURCE=.\Reactor_Performance_Test.cpp
@@ -246,6 +345,12 @@ DEP_CPP_REACT=\ ".\test_config.h"\
+!ELSEIF "$(CFG)" == "Reactor_Performance_Test - Win32 Release"
+
+!ELSEIF "$(CFG)" == "Reactor_Performance_Test - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "Reactor_Performance_Test - Win32 Unicode Release"
+
!ENDIF
# End Source File
diff --git a/tests/Reactor_Timer_Test.dsp b/tests/Reactor_Timer_Test.dsp index a3fd5e6e3b3..77c0ae39594 100644 --- a/tests/Reactor_Timer_Test.dsp +++ b/tests/Reactor_Timer_Test.dsp @@ -5,7 +5,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-CFG=Reactor_Timer_Test - Win32 Alpha Debug
+CFG=Reactor_Timer_Test - Win32 Unicode Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -15,7 +15,7 @@ CFG=Reactor_Timer_Test - Win32 Alpha Debug !MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "Reactor_Timer_Test.mak"\
- CFG="Reactor_Timer_Test - Win32 Alpha Debug"
+ CFG="Reactor_Timer_Test - Win32 Unicode Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
@@ -23,6 +23,12 @@ CFG=Reactor_Timer_Test - Win32 Alpha Debug "Win32 (x86) Console Application")
!MESSAGE "Reactor_Timer_Test - Win32 Alpha Debug" (based on\
"Win32 (ALPHA) Console Application")
+!MESSAGE "Reactor_Timer_Test - Win32 Release" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "Reactor_Timer_Test - Win32 Unicode Debug" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "Reactor_Timer_Test - Win32 Unicode Release" (based on\
+ "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
@@ -39,12 +45,13 @@ CFG=Reactor_Timer_Test - Win32 Alpha Debug # PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "."
-# PROP Intermediate_Dir ".\Debug"
+# PROP Intermediate_Dir ".\DLL\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Reactor_Timer_Test"
CPP=cl.exe
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD 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" /FD /c
+# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -70,8 +77,9 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir "Reactor_Timer_Test"
CPP=cl.exe
-# ADD BASE CPP /nologo /MTd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
+# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -82,12 +90,103 @@ LINK32=link.exe # ADD BASE LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
# ADD LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
+!ELSEIF "$(CFG)" == "Reactor_Timer_Test - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Reactor_Timer_Test\Debug"
+# PROP BASE Intermediate_Dir "Reactor_Timer_Test\Debug"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir "Reactor_Timer_Test"
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\DLL\Release"
+# PROP Intermediate_Dir ".\DLL\Release"
+# 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" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /FD /c
+# SUBTRACT CPP /Z<none> /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wsock32.lib odbc32.lib odbccp32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
+# ADD LINK32 wsock32.lib odbc32.lib odbccp32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
+# SUBTRACT LINK32 /debug /pdbtype:<none>
+
+!ELSEIF "$(CFG)" == "Reactor_Timer_Test - Win32 Unicode Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Reactor_Timer_Test\Unicode Debug"
+# PROP BASE Intermediate_Dir "Reactor_Timer_Test\Unicode Debug"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir "Reactor_Timer_Test"
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\DLL\Unicode_Debug"
+# PROP Intermediate_Dir ".\DLL\Unicode_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" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
+# SUBTRACT CPP /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wsock32.lib odbc32.lib odbccp32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
+# ADD LINK32 wsock32.lib odbc32.lib odbccp32.lib aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
+
+!ELSEIF "$(CFG)" == "Reactor_Timer_Test - Win32 Unicode Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Reactor_Timer_Test\Unicode Release"
+# PROP BASE Intermediate_Dir "Reactor_Timer_Test\Unicode Release"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir "Reactor_Timer_Test"
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\DLL\Unicode_Release"
+# PROP Intermediate_Dir ".\DLL\Unicode_Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir "Reactor_Timer_Test"
+CPP=cl.exe
+# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /FD /c
+# SUBTRACT BASE CPP /Z<none>
+# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
+# SUBTRACT CPP /Z<none> /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wsock32.lib odbc32.lib odbccp32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
+# SUBTRACT BASE LINK32 /debug /pdbtype:<none>
+# ADD LINK32 wsock32.lib odbc32.lib odbccp32.lib aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
+# SUBTRACT LINK32 /debug /pdbtype:<none>
+
!ENDIF
# Begin Target
# Name "Reactor_Timer_Test - Win32 Debug"
# Name "Reactor_Timer_Test - Win32 Alpha Debug"
+# Name "Reactor_Timer_Test - Win32 Release"
+# Name "Reactor_Timer_Test - Win32 Unicode Debug"
+# Name "Reactor_Timer_Test - Win32 Unicode Release"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
@@ -168,6 +267,12 @@ DEP_CPP_REACT=\ ".\test_config.h"\
+!ELSEIF "$(CFG)" == "Reactor_Timer_Test - Win32 Release"
+
+!ELSEIF "$(CFG)" == "Reactor_Timer_Test - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "Reactor_Timer_Test - Win32 Unicode Release"
+
!ENDIF
# End Source File
diff --git a/tests/Reactors_Test.dsp b/tests/Reactors_Test.dsp index 7924a5bdf5f..6c630e145a5 100644 --- a/tests/Reactors_Test.dsp +++ b/tests/Reactors_Test.dsp @@ -5,7 +5,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-CFG=Reactors_Test - Win32 Alpha Debug
+CFG=Reactors_Test - Win32 Unicode Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -14,7 +14,8 @@ CFG=Reactors_Test - Win32 Alpha Debug !MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "Reactors_Test.mak" CFG="Reactors_Test - Win32 Alpha Debug"
+!MESSAGE NMAKE /f "Reactors_Test.mak"\
+ CFG="Reactors_Test - Win32 Unicode Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
@@ -22,6 +23,12 @@ CFG=Reactors_Test - Win32 Alpha Debug "Win32 (x86) Console Application")
!MESSAGE "Reactors_Test - Win32 Alpha Debug" (based on\
"Win32 (ALPHA) Console Application")
+!MESSAGE "Reactors_Test - Win32 Release" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "Reactors_Test - Win32 Unicode Debug" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "Reactors_Test - Win32 Unicode Release" (based on\
+ "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
@@ -38,12 +45,13 @@ CFG=Reactors_Test - Win32 Alpha Debug # PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "."
-# PROP Intermediate_Dir ".\Debug"
+# PROP Intermediate_Dir ".\DLL\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Reactors_Test"
CPP=cl.exe
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD 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" /FD /c
+# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -69,8 +77,9 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir "Reactors_Test"
CPP=cl.exe
-# ADD BASE CPP /nologo /MTd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
+# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -81,12 +90,103 @@ LINK32=link.exe # ADD BASE LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
# ADD LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
+!ELSEIF "$(CFG)" == "Reactors_Test - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Reactors_Test\Debug"
+# PROP BASE Intermediate_Dir "Reactors_Test\Debug"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir "Reactors_Test"
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\DLL\Release"
+# PROP Intermediate_Dir ".\DLL\Release"
+# 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" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /FD /c
+# SUBTRACT CPP /Z<none> /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wsock32.lib odbc32.lib odbccp32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
+# ADD LINK32 wsock32.lib odbc32.lib odbccp32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
+# SUBTRACT LINK32 /debug /pdbtype:<none>
+
+!ELSEIF "$(CFG)" == "Reactors_Test - Win32 Unicode Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Reactors_Test\Unicode Debug"
+# PROP BASE Intermediate_Dir "Reactors_Test\Unicode Debug"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir "Reactors_Test"
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\DLL\Unicode_Debug"
+# PROP Intermediate_Dir ".\DLL\Unicode_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" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
+# SUBTRACT CPP /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wsock32.lib odbc32.lib odbccp32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
+# ADD LINK32 wsock32.lib odbc32.lib odbccp32.lib aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
+
+!ELSEIF "$(CFG)" == "Reactors_Test - Win32 Unicode Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Reactors_Test\Unicode Release"
+# PROP BASE Intermediate_Dir "Reactors_Test\Unicode Release"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir "Reactors_Test"
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\DLL\Unicode_Release"
+# PROP Intermediate_Dir ".\DLL\Unicode_Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir "Reactors_Test"
+CPP=cl.exe
+# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /FD /c
+# SUBTRACT BASE CPP /Z<none>
+# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
+# SUBTRACT CPP /Z<none> /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wsock32.lib odbc32.lib odbccp32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
+# SUBTRACT BASE LINK32 /debug /pdbtype:<none>
+# ADD LINK32 wsock32.lib odbc32.lib odbccp32.lib aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
+# SUBTRACT LINK32 /debug /pdbtype:<none>
+
!ENDIF
# Begin Target
# Name "Reactors_Test - Win32 Debug"
# Name "Reactors_Test - Win32 Alpha Debug"
+# Name "Reactors_Test - Win32 Release"
+# Name "Reactors_Test - Win32 Unicode Debug"
+# Name "Reactors_Test - Win32 Unicode Release"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
@@ -203,6 +303,12 @@ DEP_CPP_REACT=\ ".\test_config.h"\
+!ELSEIF "$(CFG)" == "Reactors_Test - Win32 Release"
+
+!ELSEIF "$(CFG)" == "Reactors_Test - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "Reactors_Test - Win32 Unicode Release"
+
!ENDIF
# End Source File
diff --git a/tests/Reader_Writer_Test.dsp b/tests/Reader_Writer_Test.dsp index 727f1fd32a6..b244c11b9b7 100644 --- a/tests/Reader_Writer_Test.dsp +++ b/tests/Reader_Writer_Test.dsp @@ -5,7 +5,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-CFG=Reader_Writer_Test - Win32 Alpha Debug
+CFG=Reader_Writer_Test - Win32 Unicode Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -15,7 +15,7 @@ CFG=Reader_Writer_Test - Win32 Alpha Debug !MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "Reader_Writer_Test.mak"\
- CFG="Reader_Writer_Test - Win32 Alpha Debug"
+ CFG="Reader_Writer_Test - Win32 Unicode Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
@@ -23,6 +23,12 @@ CFG=Reader_Writer_Test - Win32 Alpha Debug "Win32 (x86) Console Application")
!MESSAGE "Reader_Writer_Test - Win32 Alpha Debug" (based on\
"Win32 (ALPHA) Console Application")
+!MESSAGE "Reader_Writer_Test - Win32 Release" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "Reader_Writer_Test - Win32 Unicode Debug" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "Reader_Writer_Test - Win32 Unicode Release" (based on\
+ "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
@@ -39,12 +45,13 @@ CFG=Reader_Writer_Test - Win32 Alpha Debug # PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "."
-# PROP Intermediate_Dir ".\Debug"
+# PROP Intermediate_Dir ".\DLL\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Reader_Writer_Test"
CPP=cl.exe
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD 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" /FD /c
+# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -70,8 +77,9 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir "Reader_Writer_Test"
CPP=cl.exe
-# ADD BASE CPP /nologo /MTd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
+# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -82,12 +90,103 @@ LINK32=link.exe # ADD BASE LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
# ADD LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
+!ELSEIF "$(CFG)" == "Reader_Writer_Test - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Reader_Writer_Test\Debug"
+# PROP BASE Intermediate_Dir "Reader_Writer_Test\Debug"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir "Reader_Writer_Test"
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\DLL\Release"
+# PROP Intermediate_Dir ".\DLL\Release"
+# 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" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /FD /c
+# SUBTRACT CPP /Z<none> /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 odbc32.lib odbccp32.lib wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
+# ADD LINK32 odbc32.lib odbccp32.lib wsock32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
+# SUBTRACT LINK32 /debug /pdbtype:<none>
+
+!ELSEIF "$(CFG)" == "Reader_Writer_Test - Win32 Unicode Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Reader_Writer_Test\Unicode Debug"
+# PROP BASE Intermediate_Dir "Reader_Writer_Test\Unicode Debug"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir "Reader_Writer_Test"
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\DLL\Unicode_Debug"
+# PROP Intermediate_Dir ".\DLL\Unicode_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" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
+# SUBTRACT CPP /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 odbc32.lib odbccp32.lib wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
+# ADD LINK32 odbc32.lib odbccp32.lib wsock32.lib aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
+
+!ELSEIF "$(CFG)" == "Reader_Writer_Test - Win32 Unicode Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Reader_Writer_Test\Unicode Release"
+# PROP BASE Intermediate_Dir "Reader_Writer_Test\Unicode Release"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir "Reader_Writer_Test"
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\DLL\Unicode_Release"
+# PROP Intermediate_Dir ".\DLL\Unicode_Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir "Reader_Writer_Test"
+CPP=cl.exe
+# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /FD /c
+# SUBTRACT BASE CPP /Z<none>
+# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
+# SUBTRACT CPP /Z<none> /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 odbc32.lib odbccp32.lib wsock32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
+# SUBTRACT BASE LINK32 /debug /pdbtype:<none>
+# ADD LINK32 odbc32.lib odbccp32.lib wsock32.lib aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
+# SUBTRACT LINK32 /debug /pdbtype:<none>
+
!ENDIF
# Begin Target
# Name "Reader_Writer_Test - Win32 Debug"
# Name "Reader_Writer_Test - Win32 Alpha Debug"
+# Name "Reader_Writer_Test - Win32 Release"
+# Name "Reader_Writer_Test - Win32 Unicode Debug"
+# Name "Reader_Writer_Test - Win32 Unicode Release"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
@@ -163,6 +262,12 @@ DEP_CPP_READE=\ ".\test_config.h"\
+!ELSEIF "$(CFG)" == "Reader_Writer_Test - Win32 Release"
+
+!ELSEIF "$(CFG)" == "Reader_Writer_Test - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "Reader_Writer_Test - Win32 Unicode Release"
+
!ENDIF
# End Source File
diff --git a/tests/Recursive_Mutex_Test.dsp b/tests/Recursive_Mutex_Test.dsp index c20f7aaf36b..f0cf77243d6 100644 --- a/tests/Recursive_Mutex_Test.dsp +++ b/tests/Recursive_Mutex_Test.dsp @@ -5,7 +5,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-CFG=Recursive_Mutex_Test - Win32 Alpha Debug
+CFG=Recursive_Mutex_Test - Win32 Unicode Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -15,7 +15,7 @@ CFG=Recursive_Mutex_Test - Win32 Alpha Debug !MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "Recursive_Mutex_Test.mak"\
- CFG="Recursive_Mutex_Test - Win32 Alpha Debug"
+ CFG="Recursive_Mutex_Test - Win32 Unicode Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
@@ -23,6 +23,12 @@ CFG=Recursive_Mutex_Test - Win32 Alpha Debug "Win32 (x86) Console Application")
!MESSAGE "Recursive_Mutex_Test - Win32 Alpha Debug" (based on\
"Win32 (ALPHA) Console Application")
+!MESSAGE "Recursive_Mutex_Test - Win32 Release" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "Recursive_Mutex_Test - Win32 Unicode Debug" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "Recursive_Mutex_Test - Win32 Unicode Release" (based on\
+ "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
@@ -39,12 +45,13 @@ CFG=Recursive_Mutex_Test - Win32 Alpha Debug # PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "."
-# PROP Intermediate_Dir ".\Debug"
+# PROP Intermediate_Dir ".\DLL\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Recursive_Mutex_Test"
CPP=cl.exe
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD 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" /FD /c
+# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -70,8 +77,9 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir "Recursive_Mutex_Test"
CPP=cl.exe
-# ADD BASE CPP /nologo /MTd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
+# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -82,12 +90,103 @@ LINK32=link.exe # ADD BASE LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
# ADD LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
+!ELSEIF "$(CFG)" == "Recursive_Mutex_Test - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Recursive_Mutex_Test\Debug"
+# PROP BASE Intermediate_Dir "Recursive_Mutex_Test\Debug"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir "Recursive_Mutex_Test"
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\DLL\Release"
+# PROP Intermediate_Dir ".\DLL\Release"
+# 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" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /FD /c
+# SUBTRACT CPP /Z<none> /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 odbc32.lib odbccp32.lib wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
+# ADD LINK32 odbc32.lib odbccp32.lib wsock32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
+# SUBTRACT LINK32 /debug /pdbtype:<none>
+
+!ELSEIF "$(CFG)" == "Recursive_Mutex_Test - Win32 Unicode Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Recursive_Mutex_Test\Unicode Debug"
+# PROP BASE Intermediate_Dir "Recursive_Mutex_Test\Unicode Debug"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir "Recursive_Mutex_Test"
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\DLL\Unicode_Debug"
+# PROP Intermediate_Dir ".\DLL\Unicode_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" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
+# SUBTRACT CPP /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 odbc32.lib odbccp32.lib wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
+# ADD LINK32 odbc32.lib odbccp32.lib wsock32.lib aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
+
+!ELSEIF "$(CFG)" == "Recursive_Mutex_Test - Win32 Unicode Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Recursive_Mutex_Test\Unicode Release"
+# PROP BASE Intermediate_Dir "Recursive_Mutex_Test\Unicode Release"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir "Recursive_Mutex_Test"
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\DLL\Unicode_Release"
+# PROP Intermediate_Dir ".\DLL\Unicode_Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir "Recursive_Mutex_Test"
+CPP=cl.exe
+# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /FD /c
+# SUBTRACT BASE CPP /Z<none>
+# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
+# SUBTRACT CPP /Z<none> /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 odbc32.lib odbccp32.lib wsock32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
+# SUBTRACT BASE LINK32 /debug /pdbtype:<none>
+# ADD LINK32 odbc32.lib odbccp32.lib wsock32.lib aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
+# SUBTRACT LINK32 /debug /pdbtype:<none>
+
!ENDIF
# Begin Target
# Name "Recursive_Mutex_Test - Win32 Debug"
# Name "Recursive_Mutex_Test - Win32 Alpha Debug"
+# Name "Recursive_Mutex_Test - Win32 Release"
+# Name "Recursive_Mutex_Test - Win32 Unicode Debug"
+# Name "Recursive_Mutex_Test - Win32 Unicode Release"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
@@ -163,6 +262,12 @@ DEP_CPP_RECUR=\ ".\test_config.h"\
+!ELSEIF "$(CFG)" == "Recursive_Mutex_Test - Win32 Release"
+
+!ELSEIF "$(CFG)" == "Recursive_Mutex_Test - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "Recursive_Mutex_Test - Win32 Unicode Release"
+
!ENDIF
# End Source File
diff --git a/tests/SOCK_Test.dsp b/tests/SOCK_Test.dsp index 1221708c90a..6afa6ae49bb 100644 --- a/tests/SOCK_Test.dsp +++ b/tests/SOCK_Test.dsp @@ -5,7 +5,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-CFG=SOCK_Test - Win32 Alpha Debug
+CFG=SOCK_Test - Win32 Unicode Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -14,13 +14,19 @@ CFG=SOCK_Test - Win32 Alpha Debug !MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "SOCK_Test.mak" CFG="SOCK_Test - Win32 Alpha Debug"
+!MESSAGE NMAKE /f "SOCK_Test.mak" CFG="SOCK_Test - Win32 Unicode Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "SOCK_Test - Win32 Debug" (based on "Win32 (x86) Console Application")
!MESSAGE "SOCK_Test - Win32 Alpha Debug" (based on\
"Win32 (ALPHA) Console Application")
+!MESSAGE "SOCK_Test - Win32 Release" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "SOCK_Test - Win32 Unicode Debug" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "SOCK_Test - Win32 Unicode Release" (based on\
+ "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
@@ -37,12 +43,13 @@ CFG=SOCK_Test - Win32 Alpha Debug # PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "."
-# PROP Intermediate_Dir ".\Debug"
+# PROP Intermediate_Dir ".\DLL\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\SOCK_Test"
CPP=cl.exe
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD 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" /FD /c
+# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -68,8 +75,9 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir "SOCK_Test"
CPP=cl.exe
-# ADD BASE CPP /nologo /MTd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
+# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -80,12 +88,103 @@ LINK32=link.exe # ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
# ADD LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
+!ELSEIF "$(CFG)" == "SOCK_Test - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "SOCK_Test\Debug"
+# PROP BASE Intermediate_Dir "SOCK_Test\Debug"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir "SOCK_Test"
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\DLL\Release"
+# PROP Intermediate_Dir ".\DLL\Release"
+# 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" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /FD /c
+# SUBTRACT CPP /Z<none> /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 odbc32.lib odbccp32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
+# ADD LINK32 odbc32.lib odbccp32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
+# SUBTRACT LINK32 /debug /pdbtype:<none>
+
+!ELSEIF "$(CFG)" == "SOCK_Test - Win32 Unicode Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "SOCK_Test\Unicode Debug"
+# PROP BASE Intermediate_Dir "SOCK_Test\Unicode Debug"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir "SOCK_Test"
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\DLL\Unicode_Debug"
+# PROP Intermediate_Dir ".\DLL\Unicode_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" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
+# SUBTRACT CPP /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 odbc32.lib odbccp32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
+# ADD LINK32 odbc32.lib odbccp32.lib aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
+
+!ELSEIF "$(CFG)" == "SOCK_Test - Win32 Unicode Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "SOCK_Test\Unicode Release"
+# PROP BASE Intermediate_Dir "SOCK_Test\Unicode Release"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir "SOCK_Test"
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\DLL\Unicode_Release"
+# PROP Intermediate_Dir ".\DLL\Unicode_Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir "SOCK_Test"
+CPP=cl.exe
+# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /FD /c
+# SUBTRACT BASE CPP /Z<none>
+# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
+# SUBTRACT CPP /Z<none> /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 odbc32.lib odbccp32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
+# SUBTRACT BASE LINK32 /debug /pdbtype:<none>
+# ADD LINK32 odbc32.lib odbccp32.lib aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
+# SUBTRACT LINK32 /debug /pdbtype:<none>
+
!ENDIF
# Begin Target
# Name "SOCK_Test - Win32 Debug"
# Name "SOCK_Test - Win32 Alpha Debug"
+# Name "SOCK_Test - Win32 Release"
+# Name "SOCK_Test - Win32 Unicode Debug"
+# Name "SOCK_Test - Win32 Unicode Release"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
@@ -178,6 +277,12 @@ DEP_CPP_SOCK_=\ ".\test_config.h"\
+!ELSEIF "$(CFG)" == "SOCK_Test - Win32 Release"
+
+!ELSEIF "$(CFG)" == "SOCK_Test - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "SOCK_Test - Win32 Unicode Release"
+
!ENDIF
# End Source File
diff --git a/tests/SPIPE_Test.dsp b/tests/SPIPE_Test.dsp index 511ff93046b..580bfc1ab9b 100644 --- a/tests/SPIPE_Test.dsp +++ b/tests/SPIPE_Test.dsp @@ -5,7 +5,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-CFG=SPIPE_Test - Win32 Alpha Debug
+CFG=SPIPE_Test - Win32 Unicode Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -14,7 +14,7 @@ CFG=SPIPE_Test - Win32 Alpha Debug !MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "SPIPE_Test.mak" CFG="SPIPE_Test - Win32 Alpha Debug"
+!MESSAGE NMAKE /f "SPIPE_Test.mak" CFG="SPIPE_Test - Win32 Unicode Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
@@ -22,6 +22,12 @@ CFG=SPIPE_Test - Win32 Alpha Debug "Win32 (x86) Console Application")
!MESSAGE "SPIPE_Test - Win32 Alpha Debug" (based on\
"Win32 (ALPHA) Console Application")
+!MESSAGE "SPIPE_Test - Win32 Release" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "SPIPE_Test - Win32 Unicode Debug" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "SPIPE_Test - Win32 Unicode Release" (based on\
+ "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
@@ -38,12 +44,13 @@ CFG=SPIPE_Test - Win32 Alpha Debug # PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "."
-# PROP Intermediate_Dir ".\Debug"
+# PROP Intermediate_Dir ".\DLL\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\SPIPE_Test"
CPP=cl.exe
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD 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" /FD /c
+# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -69,8 +76,9 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir "SPIPE_Test"
CPP=cl.exe
-# ADD BASE CPP /nologo /MTd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
+# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -81,12 +89,103 @@ LINK32=link.exe # ADD BASE LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
# ADD LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
+!ELSEIF "$(CFG)" == "SPIPE_Test - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "SPIPE_Test\Debug"
+# PROP BASE Intermediate_Dir "SPIPE_Test\Debug"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir "SPIPE_Test"
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\DLL\Release"
+# PROP Intermediate_Dir ".\DLL\Release"
+# 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" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /FD /c
+# SUBTRACT CPP /Z<none> /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 odbc32.lib odbccp32.lib wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
+# ADD LINK32 odbc32.lib odbccp32.lib wsock32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
+# SUBTRACT LINK32 /debug /pdbtype:<none>
+
+!ELSEIF "$(CFG)" == "SPIPE_Test - Win32 Unicode Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "SPIPE_Test\Unicode Debug"
+# PROP BASE Intermediate_Dir "SPIPE_Test\Unicode Debug"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir "SPIPE_Test"
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\DLL\Unicode_Debug"
+# PROP Intermediate_Dir ".\DLL\Unicode_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" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
+# SUBTRACT CPP /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 odbc32.lib odbccp32.lib wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
+# ADD LINK32 odbc32.lib odbccp32.lib wsock32.lib aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
+
+!ELSEIF "$(CFG)" == "SPIPE_Test - Win32 Unicode Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "SPIPE_Test\Unicode Release"
+# PROP BASE Intermediate_Dir "SPIPE_Test\Unicode Release"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir "SPIPE_Test"
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\DLL\Unicode_Release"
+# PROP Intermediate_Dir ".\DLL\Unicode_Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir "SPIPE_Test"
+CPP=cl.exe
+# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /FD /c
+# SUBTRACT BASE CPP /Z<none>
+# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
+# SUBTRACT CPP /Z<none> /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 odbc32.lib odbccp32.lib wsock32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
+# SUBTRACT BASE LINK32 /debug /pdbtype:<none>
+# ADD LINK32 odbc32.lib odbccp32.lib wsock32.lib aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
+# SUBTRACT LINK32 /debug /pdbtype:<none>
+
!ENDIF
# Begin Target
# Name "SPIPE_Test - Win32 Debug"
# Name "SPIPE_Test - Win32 Alpha Debug"
+# Name "SPIPE_Test - Win32 Release"
+# Name "SPIPE_Test - Win32 Unicode Debug"
+# Name "SPIPE_Test - Win32 Unicode Release"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
@@ -173,6 +272,12 @@ DEP_CPP_SPIPE=\ ".\test_config.h"\
+!ELSEIF "$(CFG)" == "SPIPE_Test - Win32 Release"
+
+!ELSEIF "$(CFG)" == "SPIPE_Test - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "SPIPE_Test - Win32 Unicode Release"
+
!ENDIF
# End Source File
diff --git a/tests/SString_Test.dsp b/tests/SString_Test.dsp index edba055af2f..f2b6bbc52b5 100644 --- a/tests/SString_Test.dsp +++ b/tests/SString_Test.dsp @@ -5,7 +5,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-CFG=SString_Test - Win32 Alpha Debug
+CFG=SString_Test - Win32 Unicode Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -14,7 +14,7 @@ CFG=SString_Test - Win32 Alpha Debug !MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "SString_Test.mak" CFG="SString_Test - Win32 Alpha Debug"
+!MESSAGE NMAKE /f "SString_Test.mak" CFG="SString_Test - Win32 Unicode Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
@@ -22,6 +22,12 @@ CFG=SString_Test - Win32 Alpha Debug "Win32 (x86) Console Application")
!MESSAGE "SString_Test - Win32 Alpha Debug" (based on\
"Win32 (ALPHA) Console Application")
+!MESSAGE "SString_Test - Win32 Release" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "SString_Test - Win32 Unicode Debug" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "SString_Test - Win32 Unicode Release" (based on\
+ "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
@@ -38,12 +44,13 @@ CFG=SString_Test - Win32 Alpha Debug # PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "."
-# PROP Intermediate_Dir ".\Debug"
+# PROP Intermediate_Dir ".\DLL\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\SString_Test"
CPP=cl.exe
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD 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" /FD /c
+# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -69,8 +76,9 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir "SString_Test"
CPP=cl.exe
-# ADD BASE CPP /nologo /MTd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
+# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -81,12 +89,103 @@ LINK32=link.exe # ADD BASE LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
# ADD LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
+!ELSEIF "$(CFG)" == "SString_Test - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "SString_Test\Debug"
+# PROP BASE Intermediate_Dir "SString_Test\Debug"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir "SString_Test"
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\DLL\Release"
+# PROP Intermediate_Dir ".\DLL\Release"
+# 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" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /FD /c
+# SUBTRACT CPP /Z<none> /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wsock32.lib odbc32.lib odbccp32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
+# ADD LINK32 wsock32.lib odbc32.lib odbccp32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
+# SUBTRACT LINK32 /debug /pdbtype:<none>
+
+!ELSEIF "$(CFG)" == "SString_Test - Win32 Unicode Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "SString_Test\Unicode Debug"
+# PROP BASE Intermediate_Dir "SString_Test\Unicode Debug"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir "SString_Test"
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\DLL\Unicode_Debug"
+# PROP Intermediate_Dir ".\DLL\Unicode_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" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
+# SUBTRACT CPP /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wsock32.lib odbc32.lib odbccp32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
+# ADD LINK32 wsock32.lib odbc32.lib odbccp32.lib aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
+
+!ELSEIF "$(CFG)" == "SString_Test - Win32 Unicode Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "SString_Test\Unicode Release"
+# PROP BASE Intermediate_Dir "SString_Test\Unicode Release"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir "SString_Test"
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\DLL\Unicode_Release"
+# PROP Intermediate_Dir ".\DLL\Unicode_Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir "SString_Test"
+CPP=cl.exe
+# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /FD /c
+# SUBTRACT BASE CPP /Z<none>
+# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
+# SUBTRACT CPP /Z<none> /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wsock32.lib odbc32.lib odbccp32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
+# SUBTRACT BASE LINK32 /debug /pdbtype:<none>
+# ADD LINK32 wsock32.lib odbc32.lib odbccp32.lib aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
+# SUBTRACT LINK32 /debug /pdbtype:<none>
+
!ENDIF
# Begin Target
# Name "SString_Test - Win32 Debug"
# Name "SString_Test - Win32 Alpha Debug"
+# Name "SString_Test - Win32 Release"
+# Name "SString_Test - Win32 Unicode Debug"
+# Name "SString_Test - Win32 Unicode Release"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
@@ -127,6 +226,12 @@ DEP_CPP_SSTRI=\ ".\test_config.h"\
+!ELSEIF "$(CFG)" == "SString_Test - Win32 Release"
+
+!ELSEIF "$(CFG)" == "SString_Test - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "SString_Test - Win32 Unicode Release"
+
!ENDIF
# End Source File
diff --git a/tests/SV_Shared_Memory_Test.dsp b/tests/SV_Shared_Memory_Test.dsp index 79a0dc2ce05..e1375fc48a4 100644 --- a/tests/SV_Shared_Memory_Test.dsp +++ b/tests/SV_Shared_Memory_Test.dsp @@ -5,7 +5,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-CFG=SV_Shared_Memory_Test - Win32 Alpha Debug
+CFG=SV_Shared_Memory_Test - Win32 Unicode Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -15,7 +15,7 @@ CFG=SV_Shared_Memory_Test - Win32 Alpha Debug !MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "SV_Shared_Memory_Test.mak"\
- CFG="SV_Shared_Memory_Test - Win32 Alpha Debug"
+ CFG="SV_Shared_Memory_Test - Win32 Unicode Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
@@ -23,6 +23,12 @@ CFG=SV_Shared_Memory_Test - Win32 Alpha Debug "Win32 (x86) Console Application")
!MESSAGE "SV_Shared_Memory_Test - Win32 Alpha Debug" (based on\
"Win32 (ALPHA) Console Application")
+!MESSAGE "SV_Shared_Memory_Test - Win32 Release" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "SV_Shared_Memory_Test - Win32 Unicode Debug" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "SV_Shared_Memory_Test - Win32 Unicode Release" (based on\
+ "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
@@ -39,12 +45,13 @@ CFG=SV_Shared_Memory_Test - Win32 Alpha Debug # PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "."
-# PROP Intermediate_Dir ".\Debug"
+# PROP Intermediate_Dir ".\DLL\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\SV_Shared_Memory_Test"
CPP=cl.exe
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD 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" /FD /c
+# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -70,8 +77,9 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir "SV_Shared_Memory_Test"
CPP=cl.exe
-# ADD BASE CPP /nologo /MTd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
+# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -82,12 +90,103 @@ LINK32=link.exe # ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
# ADD LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
+!ELSEIF "$(CFG)" == "SV_Shared_Memory_Test - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "SV_Shared_Memory_Test\Debug"
+# PROP BASE Intermediate_Dir "SV_Shared_Memory_Test\Debug"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir "SV_Shared_Memory_Test"
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\DLL\Release"
+# PROP Intermediate_Dir ".\DLL\Release"
+# 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" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /FD /c
+# SUBTRACT CPP /Z<none> /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 odbc32.lib odbccp32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
+# ADD LINK32 odbc32.lib odbccp32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
+# SUBTRACT LINK32 /debug /pdbtype:<none>
+
+!ELSEIF "$(CFG)" == "SV_Shared_Memory_Test - Win32 Unicode Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "SV_Shared_Memory_Test\Unicode Debug"
+# PROP BASE Intermediate_Dir "SV_Shared_Memory_Test\Unicode Debug"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir "SV_Shared_Memory_Test"
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\DLL\Unicode_Debug"
+# PROP Intermediate_Dir ".\DLL\Unicode_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" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
+# SUBTRACT CPP /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 odbc32.lib odbccp32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
+# ADD LINK32 odbc32.lib odbccp32.lib aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
+
+!ELSEIF "$(CFG)" == "SV_Shared_Memory_Test - Win32 Unicode Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "SV_Shared_Memory_Test\Unicode Release"
+# PROP BASE Intermediate_Dir "SV_Shared_Memory_Test\Unicode Release"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir "SV_Shared_Memory_Test"
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\DLL\Unicode_Release"
+# PROP Intermediate_Dir ".\DLL\Unicode_Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir "SV_Shared_Memory_Test"
+CPP=cl.exe
+# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /FD /c
+# SUBTRACT BASE CPP /Z<none>
+# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
+# SUBTRACT CPP /Z<none> /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 odbc32.lib odbccp32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
+# SUBTRACT BASE LINK32 /debug /pdbtype:<none>
+# ADD LINK32 odbc32.lib odbccp32.lib aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
+# SUBTRACT LINK32 /debug /pdbtype:<none>
+
!ENDIF
# Begin Target
# Name "SV_Shared_Memory_Test - Win32 Debug"
# Name "SV_Shared_Memory_Test - Win32 Alpha Debug"
+# Name "SV_Shared_Memory_Test - Win32 Release"
+# Name "SV_Shared_Memory_Test - Win32 Unicode Debug"
+# Name "SV_Shared_Memory_Test - Win32 Unicode Release"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
@@ -159,6 +258,12 @@ DEP_CPP_SV_SH=\ ".\test_config.h"\
+!ELSEIF "$(CFG)" == "SV_Shared_Memory_Test - Win32 Release"
+
+!ELSEIF "$(CFG)" == "SV_Shared_Memory_Test - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "SV_Shared_Memory_Test - Win32 Unicode Release"
+
!ENDIF
# End Source File
diff --git a/tests/Semaphore_Test.dsp b/tests/Semaphore_Test.dsp index 28548b989a5..5eece95b4e1 100644 --- a/tests/Semaphore_Test.dsp +++ b/tests/Semaphore_Test.dsp @@ -5,7 +5,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-CFG=Semaphore_Test - Win32 Alpha Debug
+CFG=Semaphore_Test - Win32 Unicode Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -14,7 +14,8 @@ CFG=Semaphore_Test - Win32 Alpha Debug !MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "Semaphore_Test.mak" CFG="Semaphore_Test - Win32 Alpha Debug"
+!MESSAGE NMAKE /f "Semaphore_Test.mak"\
+ CFG="Semaphore_Test - Win32 Unicode Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
@@ -22,6 +23,12 @@ CFG=Semaphore_Test - Win32 Alpha Debug "Win32 (x86) Console Application")
!MESSAGE "Semaphore_Test - Win32 Alpha Debug" (based on\
"Win32 (ALPHA) Console Application")
+!MESSAGE "Semaphore_Test - Win32 Release" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "Semaphore_Test - Win32 Unicode Debug" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "Semaphore_Test - Win32 Unicode Release" (based on\
+ "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
@@ -38,12 +45,13 @@ CFG=Semaphore_Test - Win32 Alpha Debug # PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir ""
-# PROP Intermediate_Dir "Debug"
+# PROP Intermediate_Dir ".\DLL\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
CPP=cl.exe
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /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 /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
+# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -69,8 +77,9 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
CPP=cl.exe
-# ADD BASE CPP /nologo /MTd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /MDd /c
+# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -81,12 +90,103 @@ LINK32=link.exe # ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept /libpath:"..\ace"
# ADD LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept /libpath:"..\ace"
+!ELSEIF "$(CFG)" == "Semaphore_Test - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Semaphor"
+# PROP BASE Intermediate_Dir "Semaphor"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\DLL\Release"
+# PROP Intermediate_Dir ".\DLL\Release"
+# 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" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /FD /c
+# SUBTRACT CPP /Z<none> /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 odbc32.lib odbccp32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"
+# ADD LINK32 odbc32.lib odbccp32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
+# SUBTRACT LINK32 /debug /pdbtype:<none>
+
+!ELSEIF "$(CFG)" == "Semaphore_Test - Win32 Unicode Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Semapho0"
+# PROP BASE Intermediate_Dir "Semapho0"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\DLL\Unicode_Debug"
+# PROP Intermediate_Dir ".\DLL\Unicode_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" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
+# SUBTRACT CPP /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 odbc32.lib odbccp32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"
+# ADD LINK32 odbc32.lib odbccp32.lib aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"
+
+!ELSEIF "$(CFG)" == "Semaphore_Test - Win32 Unicode Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Semaphor"
+# PROP BASE Intermediate_Dir "Semaphor"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\DLL\Unicode_Release"
+# PROP Intermediate_Dir ".\DLL\Unicode_Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+CPP=cl.exe
+# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /FD /c
+# SUBTRACT BASE CPP /Z<none>
+# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
+# SUBTRACT CPP /Z<none> /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 odbc32.lib odbccp32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
+# SUBTRACT BASE LINK32 /debug /pdbtype:<none>
+# ADD LINK32 odbc32.lib odbccp32.lib aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
+# SUBTRACT LINK32 /debug /pdbtype:<none>
+
!ENDIF
# Begin Target
# Name "Semaphore_Test - Win32 Debug"
# Name "Semaphore_Test - Win32 Alpha Debug"
+# Name "Semaphore_Test - Win32 Release"
+# Name "Semaphore_Test - Win32 Unicode Debug"
+# Name "Semaphore_Test - Win32 Unicode Release"
# Begin Group "Source Files"
# PROP Default_Filter "cpp"
@@ -162,6 +262,12 @@ DEP_CPP_SEMAP=\ ".\test_config.h"\
+!ELSEIF "$(CFG)" == "Semaphore_Test - Win32 Release"
+
+!ELSEIF "$(CFG)" == "Semaphore_Test - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "Semaphore_Test - Win32 Unicode Release"
+
!ENDIF
# End Source File
diff --git a/tests/Service_Config_Test.dsp b/tests/Service_Config_Test.dsp index b04ed4b532c..962c1c5c89e 100644 --- a/tests/Service_Config_Test.dsp +++ b/tests/Service_Config_Test.dsp @@ -5,7 +5,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-CFG=Service_Config_Test - Win32 Alpha Debug
+CFG=Service_Config_Test - Win32 Unicode Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -15,7 +15,7 @@ CFG=Service_Config_Test - Win32 Alpha Debug !MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "Service_Config_Test.mak"\
- CFG="Service_Config_Test - Win32 Alpha Debug"
+ CFG="Service_Config_Test - Win32 Unicode Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
@@ -23,6 +23,12 @@ CFG=Service_Config_Test - Win32 Alpha Debug "Win32 (x86) Console Application")
!MESSAGE "Service_Config_Test - Win32 Alpha Debug" (based on\
"Win32 (ALPHA) Console Application")
+!MESSAGE "Service_Config_Test - Win32 Release" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "Service_Config_Test - Win32 Unicode Debug" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "Service_Config_Test - Win32 Unicode Release" (based on\
+ "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
@@ -39,12 +45,13 @@ CFG=Service_Config_Test - Win32 Alpha Debug # PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "."
-# PROP Intermediate_Dir ".\Debug"
+# PROP Intermediate_Dir ".\DLL\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Service_Config_Test"
CPP=cl.exe
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD 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" /FD /c
+# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -70,8 +77,9 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir "Service_Config_Test"
CPP=cl.exe
-# ADD BASE CPP /nologo /MTd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
+# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -82,12 +90,103 @@ LINK32=link.exe # ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
# ADD LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
+!ELSEIF "$(CFG)" == "Service_Config_Test - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Service_Config_Test\Debug"
+# PROP BASE Intermediate_Dir "Service_Config_Test\Debug"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir "Service_Config_Test"
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\DLL\Release"
+# PROP Intermediate_Dir ".\DLL\Release"
+# 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" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /FD /c
+# SUBTRACT CPP /Z<none> /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 odbc32.lib odbccp32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
+# ADD LINK32 odbc32.lib odbccp32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
+# SUBTRACT LINK32 /debug /pdbtype:<none>
+
+!ELSEIF "$(CFG)" == "Service_Config_Test - Win32 Unicode Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Service_Config_Test\Unicode Debug"
+# PROP BASE Intermediate_Dir "Service_Config_Test\Unicode Debug"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir "Service_Config_Test"
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\DLL\Unicode_Debug"
+# PROP Intermediate_Dir ".\DLL\Unicode_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" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
+# SUBTRACT CPP /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 odbc32.lib odbccp32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
+# ADD LINK32 odbc32.lib odbccp32.lib aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
+
+!ELSEIF "$(CFG)" == "Service_Config_Test - Win32 Unicode Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Service_Config_Test\Unicode Release"
+# PROP BASE Intermediate_Dir "Service_Config_Test\Unicode Release"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir "Service_Config_Test"
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\DLL\Unicode_Release"
+# PROP Intermediate_Dir ".\DLL\Unicode_Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir "Service_Config_Test"
+CPP=cl.exe
+# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /FD /c
+# SUBTRACT BASE CPP /Z<none>
+# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
+# SUBTRACT CPP /Z<none> /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 odbc32.lib odbccp32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
+# SUBTRACT BASE LINK32 /debug /pdbtype:<none>
+# ADD LINK32 odbc32.lib odbccp32.lib aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
+# SUBTRACT LINK32 /debug /pdbtype:<none>
+
!ENDIF
# Begin Target
# Name "Service_Config_Test - Win32 Debug"
# Name "Service_Config_Test - Win32 Alpha Debug"
+# Name "Service_Config_Test - Win32 Release"
+# Name "Service_Config_Test - Win32 Unicode Debug"
+# Name "Service_Config_Test - Win32 Unicode Release"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
@@ -175,6 +274,12 @@ DEP_CPP_SERVI=\ ".\test_config.h"\
+!ELSEIF "$(CFG)" == "Service_Config_Test - Win32 Release"
+
+!ELSEIF "$(CFG)" == "Service_Config_Test - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "Service_Config_Test - Win32 Unicode Release"
+
!ENDIF
# End Source File
diff --git a/tests/Sigset_Ops_Test.dsp b/tests/Sigset_Ops_Test.dsp index 72b0e268920..6eb8876f9e9 100644 --- a/tests/Sigset_Ops_Test.dsp +++ b/tests/Sigset_Ops_Test.dsp @@ -5,7 +5,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-CFG=Sigset_Ops_Test - Win32 Alpha Debug
+CFG=Sigset_Ops_Test - Win32 Unicode Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -15,7 +15,7 @@ CFG=Sigset_Ops_Test - Win32 Alpha Debug !MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "Sigset_Ops_Test.mak"\
- CFG="Sigset_Ops_Test - Win32 Alpha Debug"
+ CFG="Sigset_Ops_Test - Win32 Unicode Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
@@ -23,6 +23,12 @@ CFG=Sigset_Ops_Test - Win32 Alpha Debug "Win32 (x86) Console Application")
!MESSAGE "Sigset_Ops_Test - Win32 Alpha Debug" (based on\
"Win32 (ALPHA) Console Application")
+!MESSAGE "Sigset_Ops_Test - Win32 Release" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "Sigset_Ops_Test - Win32 Unicode Debug" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "Sigset_Ops_Test - Win32 Unicode Release" (based on\
+ "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
@@ -39,12 +45,13 @@ CFG=Sigset_Ops_Test - Win32 Alpha Debug # PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "."
-# PROP Intermediate_Dir ".\Debug"
+# PROP Intermediate_Dir ".\DLL\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Sigset_Ops_Test"
CPP=cl.exe
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD 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" /FD /c
+# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -70,8 +77,9 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir "Sigset_Ops_Test"
CPP=cl.exe
-# ADD BASE CPP /nologo /MTd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
+# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -82,12 +90,103 @@ LINK32=link.exe # ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
# ADD LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
+!ELSEIF "$(CFG)" == "Sigset_Ops_Test - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Sigset_Ops_Test\Debug"
+# PROP BASE Intermediate_Dir "Sigset_Ops_Test\Debug"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir "Sigset_Ops_Test"
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\DLL\Release"
+# PROP Intermediate_Dir ".\DLL\Release"
+# 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" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /FD /c
+# SUBTRACT CPP /Z<none> /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 odbc32.lib odbccp32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
+# ADD LINK32 odbc32.lib odbccp32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
+# SUBTRACT LINK32 /debug /pdbtype:<none>
+
+!ELSEIF "$(CFG)" == "Sigset_Ops_Test - Win32 Unicode Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Sigset_Ops_Test\Unicode Debug"
+# PROP BASE Intermediate_Dir "Sigset_Ops_Test\Unicode Debug"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir "Sigset_Ops_Test"
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\DLL\Unicode_Debug"
+# PROP Intermediate_Dir ".\DLL\Unicode_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" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
+# SUBTRACT CPP /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 odbc32.lib odbccp32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
+# ADD LINK32 odbc32.lib odbccp32.lib aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
+
+!ELSEIF "$(CFG)" == "Sigset_Ops_Test - Win32 Unicode Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Sigset_Ops_Test\Unicode Release"
+# PROP BASE Intermediate_Dir "Sigset_Ops_Test\Unicode Release"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir "Sigset_Ops_Test"
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\DLL\Unicode_Release"
+# PROP Intermediate_Dir ".\DLL\Unicode_Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir "Sigset_Ops_Test"
+CPP=cl.exe
+# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /FD /c
+# SUBTRACT BASE CPP /Z<none>
+# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
+# SUBTRACT CPP /Z<none> /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 odbc32.lib odbccp32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
+# SUBTRACT BASE LINK32 /debug /pdbtype:<none>
+# ADD LINK32 odbc32.lib odbccp32.lib aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
+# SUBTRACT LINK32 /debug /pdbtype:<none>
+
!ENDIF
# Begin Target
# Name "Sigset_Ops_Test - Win32 Debug"
# Name "Sigset_Ops_Test - Win32 Alpha Debug"
+# Name "Sigset_Ops_Test - Win32 Release"
+# Name "Sigset_Ops_Test - Win32 Unicode Debug"
+# Name "Sigset_Ops_Test - Win32 Unicode Release"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
@@ -128,6 +227,12 @@ DEP_CPP_SIGSE=\ ".\test_config.h"\
+!ELSEIF "$(CFG)" == "Sigset_Ops_Test - Win32 Release"
+
+!ELSEIF "$(CFG)" == "Sigset_Ops_Test - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "Sigset_Ops_Test - Win32 Unicode Release"
+
!ENDIF
# End Source File
diff --git a/tests/Simple_Message_Block_Test.dsp b/tests/Simple_Message_Block_Test.dsp index bd4fcffc043..6fc36235252 100644 --- a/tests/Simple_Message_Block_Test.dsp +++ b/tests/Simple_Message_Block_Test.dsp @@ -5,7 +5,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-CFG=Simple_Message_Block_Test - Win32 Alpha Debug
+CFG=Simple_Message_Block_Test - Win32 Unicode Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -15,7 +15,7 @@ CFG=Simple_Message_Block_Test - Win32 Alpha Debug !MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "Simple_Message_Block_Test.mak"\
- CFG="Simple_Message_Block_Test - Win32 Alpha Debug"
+ CFG="Simple_Message_Block_Test - Win32 Unicode Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
@@ -23,6 +23,12 @@ CFG=Simple_Message_Block_Test - Win32 Alpha Debug "Win32 (x86) Console Application")
!MESSAGE "Simple_Message_Block_Test - Win32 Alpha Debug" (based on\
"Win32 (ALPHA) Console Application")
+!MESSAGE "Simple_Message_Block_Test - Win32 Release" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "Simple_Message_Block_Test - Win32 Unicode Debug" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "Simple_Message_Block_Test - Win32 Unicode Release" (based on\
+ "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
@@ -39,12 +45,13 @@ CFG=Simple_Message_Block_Test - Win32 Alpha Debug # PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "."
-# PROP Intermediate_Dir ".\Debug"
+# PROP Intermediate_Dir ".\DLL\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Simple_Message_Block_Test"
CPP=cl.exe
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD 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" /FD /c
+# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -70,8 +77,9 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir "Simple_Message_Block_Test"
CPP=cl.exe
-# ADD BASE CPP /nologo /MTd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
+# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -82,12 +90,103 @@ LINK32=link.exe # ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
# ADD LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
+!ELSEIF "$(CFG)" == "Simple_Message_Block_Test - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Simple_Message_Block_Test\Debug"
+# PROP BASE Intermediate_Dir "Simple_Message_Block_Test\Debug"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir "Simple_Message_Block_Test"
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\DLL\Release"
+# PROP Intermediate_Dir ".\DLL\Release"
+# 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" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /FD /c
+# SUBTRACT CPP /Z<none> /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 odbc32.lib odbccp32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
+# ADD LINK32 odbc32.lib odbccp32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
+# SUBTRACT LINK32 /debug /pdbtype:<none>
+
+!ELSEIF "$(CFG)" == "Simple_Message_Block_Test - Win32 Unicode Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Simple_Message_Block_Test\Unicode Debug"
+# PROP BASE Intermediate_Dir "Simple_Message_Block_Test\Unicode Debug"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir "Simple_Message_Block_Test"
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\DLL\Unicode_Debug"
+# PROP Intermediate_Dir ".\DLL\Unicode_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" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
+# SUBTRACT CPP /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 odbc32.lib odbccp32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
+# ADD LINK32 odbc32.lib odbccp32.lib aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
+
+!ELSEIF "$(CFG)" == "Simple_Message_Block_Test - Win32 Unicode Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Simple_Message_Block_Test\Unicode Release"
+# PROP BASE Intermediate_Dir "Simple_Message_Block_Test\Unicode Release"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir "Simple_Message_Block_Test"
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\DLL\Unicode_Release"
+# PROP Intermediate_Dir ".\DLL\Unicode_Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir "Simple_Message_Block_Test"
+CPP=cl.exe
+# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /FD /c
+# SUBTRACT BASE CPP /Z<none>
+# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
+# SUBTRACT CPP /Z<none> /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 odbc32.lib odbccp32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
+# SUBTRACT BASE LINK32 /debug /pdbtype:<none>
+# ADD LINK32 odbc32.lib odbccp32.lib aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
+# SUBTRACT LINK32 /debug /pdbtype:<none>
+
!ENDIF
# Begin Target
# Name "Simple_Message_Block_Test - Win32 Debug"
# Name "Simple_Message_Block_Test - Win32 Alpha Debug"
+# Name "Simple_Message_Block_Test - Win32 Release"
+# Name "Simple_Message_Block_Test - Win32 Unicode Debug"
+# Name "Simple_Message_Block_Test - Win32 Unicode Release"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
@@ -161,6 +260,12 @@ DEP_CPP_SIMPL=\ ".\test_config.h"\
+!ELSEIF "$(CFG)" == "Simple_Message_Block_Test - Win32 Release"
+
+!ELSEIF "$(CFG)" == "Simple_Message_Block_Test - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "Simple_Message_Block_Test - Win32 Unicode Release"
+
!ENDIF
# End Source File
diff --git a/tests/TSS_Test.dsp b/tests/TSS_Test.dsp index def51979a9d..363502c8823 100644 --- a/tests/TSS_Test.dsp +++ b/tests/TSS_Test.dsp @@ -5,7 +5,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-CFG=TSS_Test - Win32 Alpha Debug
+CFG=TSS_Test - Win32 Unicode Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -14,13 +14,19 @@ CFG=TSS_Test - Win32 Alpha Debug !MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "TSS_Test.mak" CFG="TSS_Test - Win32 Alpha Debug"
+!MESSAGE NMAKE /f "TSS_Test.mak" CFG="TSS_Test - Win32 Unicode Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "TSS_Test - Win32 Debug" (based on "Win32 (x86) Console Application")
!MESSAGE "TSS_Test - Win32 Alpha Debug" (based on\
"Win32 (ALPHA) Console Application")
+!MESSAGE "TSS_Test - Win32 Release" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "TSS_Test - Win32 Unicode Debug" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "TSS_Test - Win32 Unicode Release" (based on\
+ "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
@@ -37,12 +43,13 @@ CFG=TSS_Test - Win32 Alpha Debug # PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "."
-# PROP Intermediate_Dir ".\Debug"
+# PROP Intermediate_Dir ".\DLL\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\TSS_Test"
CPP=cl.exe
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD 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" /FD /c
+# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -68,8 +75,9 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir "TSS_Test"
CPP=cl.exe
-# ADD BASE CPP /nologo /MTd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
+# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -80,12 +88,103 @@ LINK32=link.exe # ADD BASE LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
# ADD LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
+!ELSEIF "$(CFG)" == "TSS_Test - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "TSS_Test\Debug"
+# PROP BASE Intermediate_Dir "TSS_Test\Debug"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir "TSS_Test"
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\DLL\Release"
+# PROP Intermediate_Dir ".\DLL\Release"
+# 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" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /FD /c
+# SUBTRACT CPP /Z<none> /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 odbc32.lib odbccp32.lib wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
+# ADD LINK32 odbc32.lib odbccp32.lib wsock32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
+# SUBTRACT LINK32 /debug /pdbtype:<none>
+
+!ELSEIF "$(CFG)" == "TSS_Test - Win32 Unicode Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "TSS_Test\Unicode Debug"
+# PROP BASE Intermediate_Dir "TSS_Test\Unicode Debug"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir "TSS_Test"
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\DLL\Unicode_Debug"
+# PROP Intermediate_Dir ".\DLL\Unicode_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" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
+# SUBTRACT CPP /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 odbc32.lib odbccp32.lib wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
+# ADD LINK32 odbc32.lib odbccp32.lib wsock32.lib aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
+
+!ELSEIF "$(CFG)" == "TSS_Test - Win32 Unicode Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "TSS_Test\Unicode Release"
+# PROP BASE Intermediate_Dir "TSS_Test\Unicode Release"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir "TSS_Test"
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\DLL\Unicode_Release"
+# PROP Intermediate_Dir ".\DLL\Unicode_Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir "TSS_Test"
+CPP=cl.exe
+# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /FD /c
+# SUBTRACT BASE CPP /Z<none>
+# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
+# SUBTRACT CPP /Z<none> /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 odbc32.lib odbccp32.lib wsock32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
+# SUBTRACT BASE LINK32 /debug /pdbtype:<none>
+# ADD LINK32 odbc32.lib odbccp32.lib wsock32.lib aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
+# SUBTRACT LINK32 /debug /pdbtype:<none>
+
!ENDIF
# Begin Target
# Name "TSS_Test - Win32 Debug"
# Name "TSS_Test - Win32 Alpha Debug"
+# Name "TSS_Test - Win32 Release"
+# Name "TSS_Test - Win32 Unicode Debug"
+# Name "TSS_Test - Win32 Unicode Release"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
@@ -160,6 +259,12 @@ DEP_CPP_TSS_T=\ ".\TSS_Test_Errno.h"\
+!ELSEIF "$(CFG)" == "TSS_Test - Win32 Release"
+
+!ELSEIF "$(CFG)" == "TSS_Test - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "TSS_Test - Win32 Unicode Release"
+
!ENDIF
# End Source File
diff --git a/tests/Task_Test.dsp b/tests/Task_Test.dsp index c3c4fcf8ef7..d845dd22ecc 100644 --- a/tests/Task_Test.dsp +++ b/tests/Task_Test.dsp @@ -5,7 +5,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-CFG=Task_Test - Win32 Alpha Debug
+CFG=Task_Test - Win32 Unicode Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -14,13 +14,19 @@ CFG=Task_Test - Win32 Alpha Debug !MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "Task_Test.mak" CFG="Task_Test - Win32 Alpha Debug"
+!MESSAGE NMAKE /f "Task_Test.mak" CFG="Task_Test - Win32 Unicode Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "Task_Test - Win32 Debug" (based on "Win32 (x86) Console Application")
!MESSAGE "Task_Test - Win32 Alpha Debug" (based on\
"Win32 (ALPHA) Console Application")
+!MESSAGE "Task_Test - Win32 Release" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "Task_Test - Win32 Unicode Debug" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "Task_Test - Win32 Unicode Release" (based on\
+ "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
@@ -37,12 +43,13 @@ CFG=Task_Test - Win32 Alpha Debug # PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "."
-# PROP Intermediate_Dir ".\Debug"
+# PROP Intermediate_Dir ".\DLL\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Task_Test"
CPP=cl.exe
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD 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" /FD /c
+# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -68,8 +75,9 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir "Task_Test"
CPP=cl.exe
-# ADD BASE CPP /nologo /MTd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
+# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -80,12 +88,103 @@ LINK32=link.exe # ADD BASE LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
# ADD LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
+!ELSEIF "$(CFG)" == "Task_Test - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Task_Test\Debug"
+# PROP BASE Intermediate_Dir "Task_Test\Debug"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir "Task_Test"
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\DLL\Release"
+# PROP Intermediate_Dir ".\DLL\Release"
+# 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" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /FD /c
+# SUBTRACT CPP /Z<none> /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 odbc32.lib odbccp32.lib wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
+# ADD LINK32 odbc32.lib odbccp32.lib wsock32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
+# SUBTRACT LINK32 /debug /pdbtype:<none>
+
+!ELSEIF "$(CFG)" == "Task_Test - Win32 Unicode Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Task_Test\Unicode Debug"
+# PROP BASE Intermediate_Dir "Task_Test\Unicode Debug"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir "Task_Test"
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\DLL\Unicode_Debug"
+# PROP Intermediate_Dir ".\DLL\Unicode_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" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
+# SUBTRACT CPP /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 odbc32.lib odbccp32.lib wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
+# ADD LINK32 odbc32.lib odbccp32.lib wsock32.lib aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
+
+!ELSEIF "$(CFG)" == "Task_Test - Win32 Unicode Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Task_Test\Unicode Release"
+# PROP BASE Intermediate_Dir "Task_Test\Unicode Release"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir "Task_Test"
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\DLL\Unicode_Release"
+# PROP Intermediate_Dir ".\DLL\Unicode_Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir "Task_Test"
+CPP=cl.exe
+# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /FD /c
+# SUBTRACT BASE CPP /Z<none>
+# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
+# SUBTRACT CPP /Z<none> /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 odbc32.lib odbccp32.lib wsock32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
+# SUBTRACT BASE LINK32 /debug /pdbtype:<none>
+# ADD LINK32 odbc32.lib odbccp32.lib wsock32.lib aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
+# SUBTRACT LINK32 /debug /pdbtype:<none>
+
!ENDIF
# Begin Target
# Name "Task_Test - Win32 Debug"
# Name "Task_Test - Win32 Alpha Debug"
+# Name "Task_Test - Win32 Release"
+# Name "Task_Test - Win32 Unicode Debug"
+# Name "Task_Test - Win32 Unicode Release"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
@@ -202,6 +301,12 @@ DEP_CPP_TASK_=\ ".\test_config.h"\
+!ELSEIF "$(CFG)" == "Task_Test - Win32 Release"
+
+!ELSEIF "$(CFG)" == "Task_Test - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "Task_Test - Win32 Unicode Release"
+
!ENDIF
# End Source File
diff --git a/tests/Thread_Manager_Test.dsp b/tests/Thread_Manager_Test.dsp index 3ac6203c60c..49affca9816 100644 --- a/tests/Thread_Manager_Test.dsp +++ b/tests/Thread_Manager_Test.dsp @@ -5,7 +5,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-CFG=Thread_Manager_Test - Win32 Alpha Debug
+CFG=Thread_Manager_Test - Win32 Unicode Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -15,7 +15,7 @@ CFG=Thread_Manager_Test - Win32 Alpha Debug !MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "Thread_Manager_Test.mak"\
- CFG="Thread_Manager_Test - Win32 Alpha Debug"
+ CFG="Thread_Manager_Test - Win32 Unicode Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
@@ -23,6 +23,12 @@ CFG=Thread_Manager_Test - Win32 Alpha Debug "Win32 (x86) Console Application")
!MESSAGE "Thread_Manager_Test - Win32 Alpha Debug" (based on\
"Win32 (ALPHA) Console Application")
+!MESSAGE "Thread_Manager_Test - Win32 Release" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "Thread_Manager_Test - Win32 Unicode Debug" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "Thread_Manager_Test - Win32 Unicode Release" (based on\
+ "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
@@ -39,12 +45,13 @@ CFG=Thread_Manager_Test - Win32 Alpha Debug # PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "."
-# PROP Intermediate_Dir ".\Debug"
+# PROP Intermediate_Dir ".\DLL\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Thread_Manager_Test"
CPP=cl.exe
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD 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" /FD /c
+# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -70,8 +77,9 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir "Thread_Manager_Test"
CPP=cl.exe
-# ADD BASE CPP /nologo /MTd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
+# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -82,12 +90,103 @@ LINK32=link.exe # ADD BASE LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
# ADD LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
+!ELSEIF "$(CFG)" == "Thread_Manager_Test - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Thread_Manager_Test\Debug"
+# PROP BASE Intermediate_Dir "Thread_Manager_Test\Debug"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir "Thread_Manager_Test"
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\DLL\Release"
+# PROP Intermediate_Dir ".\DLL\Release"
+# 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" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /FD /c
+# SUBTRACT CPP /Z<none> /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 odbc32.lib odbccp32.lib wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
+# ADD LINK32 odbc32.lib odbccp32.lib wsock32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
+# SUBTRACT LINK32 /debug /pdbtype:<none>
+
+!ELSEIF "$(CFG)" == "Thread_Manager_Test - Win32 Unicode Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Thread_Manager_Test\Unicode Debug"
+# PROP BASE Intermediate_Dir "Thread_Manager_Test\Unicode Debug"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir "Thread_Manager_Test"
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\DLL\Unicode_Debug"
+# PROP Intermediate_Dir ".\DLL\Unicode_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" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
+# SUBTRACT CPP /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 odbc32.lib odbccp32.lib wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
+# ADD LINK32 odbc32.lib odbccp32.lib wsock32.lib aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
+
+!ELSEIF "$(CFG)" == "Thread_Manager_Test - Win32 Unicode Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Thread_Manager_Test\Unicode Release"
+# PROP BASE Intermediate_Dir "Thread_Manager_Test\Unicode Release"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir "Thread_Manager_Test"
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\DLL\Unicode_Release"
+# PROP Intermediate_Dir ".\DLL\Unicode_Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir "Thread_Manager_Test"
+CPP=cl.exe
+# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /FD /c
+# SUBTRACT BASE CPP /Z<none>
+# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
+# SUBTRACT CPP /Z<none> /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 odbc32.lib odbccp32.lib wsock32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
+# SUBTRACT BASE LINK32 /debug /pdbtype:<none>
+# ADD LINK32 odbc32.lib odbccp32.lib wsock32.lib aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
+# SUBTRACT LINK32 /debug /pdbtype:<none>
+
!ENDIF
# Begin Target
# Name "Thread_Manager_Test - Win32 Debug"
# Name "Thread_Manager_Test - Win32 Alpha Debug"
+# Name "Thread_Manager_Test - Win32 Release"
+# Name "Thread_Manager_Test - Win32 Unicode Debug"
+# Name "Thread_Manager_Test - Win32 Unicode Release"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
@@ -161,6 +260,12 @@ DEP_CPP_THREA=\ ".\test_config.h"\
+!ELSEIF "$(CFG)" == "Thread_Manager_Test - Win32 Release"
+
+!ELSEIF "$(CFG)" == "Thread_Manager_Test - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "Thread_Manager_Test - Win32 Unicode Release"
+
!ENDIF
# End Source File
diff --git a/tests/Thread_Pool_Test.dsp b/tests/Thread_Pool_Test.dsp index ca495dd61b2..b0214b305d4 100644 --- a/tests/Thread_Pool_Test.dsp +++ b/tests/Thread_Pool_Test.dsp @@ -5,7 +5,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-CFG=Thread_Pool_Test - Win32 Alpha Debug
+CFG=Thread_Pool_Test - Win32 Unicode Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -15,7 +15,7 @@ CFG=Thread_Pool_Test - Win32 Alpha Debug !MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "Thread_Pool_Test.mak"\
- CFG="Thread_Pool_Test - Win32 Alpha Debug"
+ CFG="Thread_Pool_Test - Win32 Unicode Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
@@ -23,6 +23,12 @@ CFG=Thread_Pool_Test - Win32 Alpha Debug "Win32 (x86) Console Application")
!MESSAGE "Thread_Pool_Test - Win32 Alpha Debug" (based on\
"Win32 (ALPHA) Console Application")
+!MESSAGE "Thread_Pool_Test - Win32 Release" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "Thread_Pool_Test - Win32 Unicode Debug" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "Thread_Pool_Test - Win32 Unicode Release" (based on\
+ "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
@@ -39,12 +45,13 @@ CFG=Thread_Pool_Test - Win32 Alpha Debug # PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "."
-# PROP Intermediate_Dir ".\Debug"
+# PROP Intermediate_Dir ".\DLL\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Thread_Pool_Test"
CPP=cl.exe
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD 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" /FD /c
+# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -70,8 +77,9 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir "Thread_Pool_Test"
CPP=cl.exe
-# ADD BASE CPP /nologo /MTd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
+# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -82,12 +90,103 @@ LINK32=link.exe # ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
# ADD LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
+!ELSEIF "$(CFG)" == "Thread_Pool_Test - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Thread_Pool_Test\Debug"
+# PROP BASE Intermediate_Dir "Thread_Pool_Test\Debug"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir "Thread_Pool_Test"
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\DLL\Release"
+# PROP Intermediate_Dir ".\DLL\Release"
+# 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" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /FD /c
+# SUBTRACT CPP /Z<none> /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 odbc32.lib odbccp32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
+# ADD LINK32 odbc32.lib odbccp32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
+# SUBTRACT LINK32 /debug /pdbtype:<none>
+
+!ELSEIF "$(CFG)" == "Thread_Pool_Test - Win32 Unicode Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Thread_Pool_Test\Unicode Debug"
+# PROP BASE Intermediate_Dir "Thread_Pool_Test\Unicode Debug"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir "Thread_Pool_Test"
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\DLL\Unicode_Debug"
+# PROP Intermediate_Dir ".\DLL\Unicode_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" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
+# SUBTRACT CPP /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 odbc32.lib odbccp32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
+# ADD LINK32 odbc32.lib odbccp32.lib aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
+
+!ELSEIF "$(CFG)" == "Thread_Pool_Test - Win32 Unicode Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Thread_Pool_Test\Unicode Release"
+# PROP BASE Intermediate_Dir "Thread_Pool_Test\Unicode Release"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir "Thread_Pool_Test"
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\DLL\Unicode_Release"
+# PROP Intermediate_Dir ".\DLL\Unicode_Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir "Thread_Pool_Test"
+CPP=cl.exe
+# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /FD /c
+# SUBTRACT BASE CPP /Z<none>
+# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
+# SUBTRACT CPP /Z<none> /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 odbc32.lib odbccp32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
+# SUBTRACT BASE LINK32 /debug /pdbtype:<none>
+# ADD LINK32 odbc32.lib odbccp32.lib aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
+# SUBTRACT LINK32 /debug /pdbtype:<none>
+
!ENDIF
# Begin Target
# Name "Thread_Pool_Test - Win32 Debug"
# Name "Thread_Pool_Test - Win32 Alpha Debug"
+# Name "Thread_Pool_Test - Win32 Release"
+# Name "Thread_Pool_Test - Win32 Unicode Debug"
+# Name "Thread_Pool_Test - Win32 Unicode Release"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
@@ -204,6 +303,12 @@ DEP_CPP_THREA=\ ".\test_config.h"\
+!ELSEIF "$(CFG)" == "Thread_Pool_Test - Win32 Release"
+
+!ELSEIF "$(CFG)" == "Thread_Pool_Test - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "Thread_Pool_Test - Win32 Unicode Release"
+
!ENDIF
# End Source File
diff --git a/tests/Time_Service_Test.dsp b/tests/Time_Service_Test.dsp index 743480eb8b3..6be8a2d9cd9 100644 --- a/tests/Time_Service_Test.dsp +++ b/tests/Time_Service_Test.dsp @@ -5,7 +5,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-CFG=Time_Service_Test - Win32 Alpha Debug
+CFG=Time_Service_Test - Win32 Unicode Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -15,7 +15,7 @@ CFG=Time_Service_Test - Win32 Alpha Debug !MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "Time_Service_Test.mak"\
- CFG="Time_Service_Test - Win32 Alpha Debug"
+ CFG="Time_Service_Test - Win32 Unicode Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
@@ -23,6 +23,12 @@ CFG=Time_Service_Test - Win32 Alpha Debug "Win32 (x86) Console Application")
!MESSAGE "Time_Service_Test - Win32 Alpha Debug" (based on\
"Win32 (ALPHA) Console Application")
+!MESSAGE "Time_Service_Test - Win32 Release" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "Time_Service_Test - Win32 Unicode Debug" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "Time_Service_Test - Win32 Unicode Release" (based on\
+ "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
@@ -39,12 +45,13 @@ CFG=Time_Service_Test - Win32 Alpha Debug # PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "."
-# PROP Intermediate_Dir ".\Debug"
+# PROP Intermediate_Dir ".\DLL\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Time_Service_Test"
CPP=cl.exe
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD 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" /FD /c
+# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -70,8 +77,9 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir "Time_Service_Test"
CPP=cl.exe
-# ADD BASE CPP /nologo /MTd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
+# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -82,12 +90,103 @@ LINK32=link.exe # ADD BASE LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
# ADD LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
+!ELSEIF "$(CFG)" == "Time_Service_Test - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Time_Service_Test\Debug"
+# PROP BASE Intermediate_Dir "Time_Service_Test\Debug"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir "Time_Service_Test"
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\DLL\Release"
+# PROP Intermediate_Dir ".\DLL\Release"
+# 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" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /FD /c
+# SUBTRACT CPP /Z<none> /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 odbc32.lib odbccp32.lib wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
+# ADD LINK32 odbc32.lib odbccp32.lib wsock32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
+# SUBTRACT LINK32 /debug /pdbtype:<none>
+
+!ELSEIF "$(CFG)" == "Time_Service_Test - Win32 Unicode Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Time_Service_Test\Unicode Debug"
+# PROP BASE Intermediate_Dir "Time_Service_Test\Unicode Debug"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir "Time_Service_Test"
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\DLL\Unicode_Debug"
+# PROP Intermediate_Dir ".\DLL\Unicode_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" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
+# SUBTRACT CPP /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 odbc32.lib odbccp32.lib wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
+# ADD LINK32 odbc32.lib odbccp32.lib wsock32.lib aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
+
+!ELSEIF "$(CFG)" == "Time_Service_Test - Win32 Unicode Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Time_Service_Test\Unicode Release"
+# PROP BASE Intermediate_Dir "Time_Service_Test\Unicode Release"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir "Time_Service_Test"
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\DLL\Unicode_Release"
+# PROP Intermediate_Dir ".\DLL\Unicode_Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir "Time_Service_Test"
+CPP=cl.exe
+# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /FD /c
+# SUBTRACT BASE CPP /Z<none>
+# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
+# SUBTRACT CPP /Z<none> /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 odbc32.lib odbccp32.lib wsock32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
+# SUBTRACT BASE LINK32 /debug /pdbtype:<none>
+# ADD LINK32 odbc32.lib odbccp32.lib wsock32.lib aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
+# SUBTRACT LINK32 /debug /pdbtype:<none>
+
!ENDIF
# Begin Target
# Name "Time_Service_Test - Win32 Debug"
# Name "Time_Service_Test - Win32 Alpha Debug"
+# Name "Time_Service_Test - Win32 Release"
+# Name "Time_Service_Test - Win32 Unicode Debug"
+# Name "Time_Service_Test - Win32 Unicode Release"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
@@ -130,6 +229,12 @@ DEP_CPP_TIME_=\ ".\test_config.h"\
+!ELSEIF "$(CFG)" == "Time_Service_Test - Win32 Release"
+
+!ELSEIF "$(CFG)" == "Time_Service_Test - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "Time_Service_Test - Win32 Unicode Release"
+
!ENDIF
# End Source File
diff --git a/tests/Time_Value_Test.dsp b/tests/Time_Value_Test.dsp index 7bb0aba22f6..27071426279 100644 --- a/tests/Time_Value_Test.dsp +++ b/tests/Time_Value_Test.dsp @@ -5,7 +5,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-CFG=Time_Value_Test - Win32 Alpha Debug
+CFG=Time_Value_Test - Win32 Unicode Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -15,7 +15,7 @@ CFG=Time_Value_Test - Win32 Alpha Debug !MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "Time_Value_Test.mak"\
- CFG="Time_Value_Test - Win32 Alpha Debug"
+ CFG="Time_Value_Test - Win32 Unicode Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
@@ -23,6 +23,12 @@ CFG=Time_Value_Test - Win32 Alpha Debug "Win32 (x86) Console Application")
!MESSAGE "Time_Value_Test - Win32 Alpha Debug" (based on\
"Win32 (ALPHA) Console Application")
+!MESSAGE "Time_Value_Test - Win32 Release" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "Time_Value_Test - Win32 Unicode Debug" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "Time_Value_Test - Win32 Unicode Release" (based on\
+ "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
@@ -39,12 +45,13 @@ CFG=Time_Value_Test - Win32 Alpha Debug # PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "."
-# PROP Intermediate_Dir ".\Debug"
+# PROP Intermediate_Dir ".\DLL\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Time_Value_Test"
CPP=cl.exe
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD 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" /FD /c
+# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -70,8 +77,9 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir "Time_Value_Test"
CPP=cl.exe
-# ADD BASE CPP /nologo /MTd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
+# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -82,12 +90,103 @@ LINK32=link.exe # ADD BASE LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
# ADD LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
+!ELSEIF "$(CFG)" == "Time_Value_Test - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Time_Value_Test\Debug"
+# PROP BASE Intermediate_Dir "Time_Value_Test\Debug"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir "Time_Value_Test"
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\DLL\Release"
+# PROP Intermediate_Dir ".\DLL\Release"
+# 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" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /FD /c
+# SUBTRACT CPP /Z<none> /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wsock32.lib odbc32.lib odbccp32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
+# ADD LINK32 wsock32.lib odbc32.lib odbccp32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
+# SUBTRACT LINK32 /debug /pdbtype:<none>
+
+!ELSEIF "$(CFG)" == "Time_Value_Test - Win32 Unicode Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Time_Value_Test\Unicode Debug"
+# PROP BASE Intermediate_Dir "Time_Value_Test\Unicode Debug"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir "Time_Value_Test"
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\DLL\Unicode_Debug"
+# PROP Intermediate_Dir ".\DLL\Unicode_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" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
+# SUBTRACT CPP /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wsock32.lib odbc32.lib odbccp32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
+# ADD LINK32 wsock32.lib odbc32.lib odbccp32.lib aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
+
+!ELSEIF "$(CFG)" == "Time_Value_Test - Win32 Unicode Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Time_Value_Test\Unicode Release"
+# PROP BASE Intermediate_Dir "Time_Value_Test\Unicode Release"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir "Time_Value_Test"
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\DLL\Unicode_Release"
+# PROP Intermediate_Dir ".\DLL\Unicode_Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir "Time_Value_Test"
+CPP=cl.exe
+# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /FD /c
+# SUBTRACT BASE CPP /Z<none>
+# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
+# SUBTRACT CPP /Z<none> /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wsock32.lib odbc32.lib odbccp32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
+# SUBTRACT BASE LINK32 /debug /pdbtype:<none>
+# ADD LINK32 wsock32.lib odbc32.lib odbccp32.lib aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
+# SUBTRACT LINK32 /debug /pdbtype:<none>
+
!ENDIF
# Begin Target
# Name "Time_Value_Test - Win32 Debug"
# Name "Time_Value_Test - Win32 Alpha Debug"
+# Name "Time_Value_Test - Win32 Release"
+# Name "Time_Value_Test - Win32 Unicode Debug"
+# Name "Time_Value_Test - Win32 Unicode Release"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
@@ -128,6 +227,12 @@ DEP_CPP_TIME_=\ ".\test_config.h"\
+!ELSEIF "$(CFG)" == "Time_Value_Test - Win32 Release"
+
+!ELSEIF "$(CFG)" == "Time_Value_Test - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "Time_Value_Test - Win32 Unicode Release"
+
!ENDIF
# End Source File
diff --git a/tests/Timer_Queue_Test.dsp b/tests/Timer_Queue_Test.dsp index 3fe500215d9..fa95fd990c5 100644 --- a/tests/Timer_Queue_Test.dsp +++ b/tests/Timer_Queue_Test.dsp @@ -5,7 +5,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-CFG=Timer_Queue_Test - Win32 Alpha Debug
+CFG=Timer_Queue_Test - Win32 Unicode Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -15,7 +15,7 @@ CFG=Timer_Queue_Test - Win32 Alpha Debug !MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "Timer_Queue_Test.mak"\
- CFG="Timer_Queue_Test - Win32 Alpha Debug"
+ CFG="Timer_Queue_Test - Win32 Unicode Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
@@ -23,6 +23,12 @@ CFG=Timer_Queue_Test - Win32 Alpha Debug "Win32 (x86) Console Application")
!MESSAGE "Timer_Queue_Test - Win32 Alpha Debug" (based on\
"Win32 (ALPHA) Console Application")
+!MESSAGE "Timer_Queue_Test - Win32 Release" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "Timer_Queue_Test - Win32 Unicode Debug" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "Timer_Queue_Test - Win32 Unicode Release" (based on\
+ "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
@@ -39,12 +45,13 @@ CFG=Timer_Queue_Test - Win32 Alpha Debug # PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "."
-# PROP Intermediate_Dir ".\Debug"
+# PROP Intermediate_Dir ".\DLL\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Timer_Queue_Test"
CPP=cl.exe
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD 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" /FD /c
+# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -70,8 +77,9 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir "Timer_Queue_Test"
CPP=cl.exe
-# ADD BASE CPP /nologo /MTd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
+# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -82,12 +90,103 @@ LINK32=link.exe # ADD BASE LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
# ADD LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
+!ELSEIF "$(CFG)" == "Timer_Queue_Test - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Timer_Queue_Test\Debug"
+# PROP BASE Intermediate_Dir "Timer_Queue_Test\Debug"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir "Timer_Queue_Test"
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\DLL\Release"
+# PROP Intermediate_Dir ".\DLL\Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir "Timer_Queue_Test"
+CPP=cl.exe
+# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /FD /c
+# SUBTRACT CPP /Z<none> /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wsock32.lib odbc32.lib odbccp32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
+# ADD LINK32 wsock32.lib odbc32.lib odbccp32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
+# SUBTRACT LINK32 /debug /pdbtype:<none>
+
+!ELSEIF "$(CFG)" == "Timer_Queue_Test - Win32 Unicode Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Timer_Queue_Test\Unicode Debug"
+# PROP BASE Intermediate_Dir "Timer_Queue_Test\Unicode Debug"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir "Timer_Queue_Test"
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\DLL\Unicode_Debug"
+# PROP Intermediate_Dir ".\DLL\Unicode_Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir "Timer_Queue_Test"
+CPP=cl.exe
+# ADD BASE CPP /nologo /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" /D "UNICODE" /FD /c
+# SUBTRACT CPP /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wsock32.lib odbc32.lib odbccp32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
+# ADD LINK32 wsock32.lib odbc32.lib odbccp32.lib aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
+
+!ELSEIF "$(CFG)" == "Timer_Queue_Test - Win32 Unicode Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Timer_Queue_Test\Unicode Release"
+# PROP BASE Intermediate_Dir "Timer_Queue_Test\Unicode Release"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir "Timer_Queue_Test"
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\DLL\Unicode_Release"
+# PROP Intermediate_Dir ".\DLL\Unicode_Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir "Timer_Queue_Test"
+CPP=cl.exe
+# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /FD /c
+# SUBTRACT BASE CPP /Z<none>
+# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
+# SUBTRACT CPP /Z<none> /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wsock32.lib odbc32.lib odbccp32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
+# SUBTRACT BASE LINK32 /debug /pdbtype:<none>
+# ADD LINK32 wsock32.lib odbc32.lib odbccp32.lib aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
+# SUBTRACT LINK32 /debug /pdbtype:<none>
+
!ENDIF
# Begin Target
# Name "Timer_Queue_Test - Win32 Debug"
# Name "Timer_Queue_Test - Win32 Alpha Debug"
+# Name "Timer_Queue_Test - Win32 Release"
+# Name "Timer_Queue_Test - Win32 Unicode Debug"
+# Name "Timer_Queue_Test - Win32 Unicode Release"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
@@ -180,6 +279,12 @@ DEP_CPP_TIMER=\ ".\test_config.h"\
+!ELSEIF "$(CFG)" == "Timer_Queue_Test - Win32 Release"
+
+!ELSEIF "$(CFG)" == "Timer_Queue_Test - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "Timer_Queue_Test - Win32 Unicode Release"
+
!ENDIF
# End Source File
diff --git a/tests/Tokens_Test.dsp b/tests/Tokens_Test.dsp index 92aaadda544..a65368f5cc2 100644 --- a/tests/Tokens_Test.dsp +++ b/tests/Tokens_Test.dsp @@ -5,7 +5,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-CFG=Tokens_Test - Win32 Alpha Debug
+CFG=Tokens_Test - Win32 Unicode Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -14,7 +14,7 @@ CFG=Tokens_Test - Win32 Alpha Debug !MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "Tokens_Test.mak" CFG="Tokens_Test - Win32 Alpha Debug"
+!MESSAGE NMAKE /f "Tokens_Test.mak" CFG="Tokens_Test - Win32 Unicode Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
@@ -22,6 +22,12 @@ CFG=Tokens_Test - Win32 Alpha Debug "Win32 (x86) Console Application")
!MESSAGE "Tokens_Test - Win32 Alpha Debug" (based on\
"Win32 (ALPHA) Console Application")
+!MESSAGE "Tokens_Test - Win32 Release" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "Tokens_Test - Win32 Unicode Debug" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "Tokens_Test - Win32 Unicode Release" (based on\
+ "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
@@ -38,12 +44,13 @@ CFG=Tokens_Test - Win32 Alpha Debug # PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "."
-# PROP Intermediate_Dir ".\Debug"
+# PROP Intermediate_Dir ".\DLL\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Tokens_Test"
CPP=cl.exe
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD 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" /FD /c
+# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -69,8 +76,9 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir "Tokens_Test"
CPP=cl.exe
-# ADD BASE CPP /nologo /MTd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
+# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -81,12 +89,103 @@ LINK32=link.exe # ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
# ADD LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
+!ELSEIF "$(CFG)" == "Tokens_Test - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Tokens_Test\Debug"
+# PROP BASE Intermediate_Dir "Tokens_Test\Debug"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir "Tokens_Test"
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\DLL\Release"
+# PROP Intermediate_Dir ".\DLL\Release"
+# 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" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /FD /c
+# SUBTRACT CPP /Z<none> /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
+# ADD LINK32 ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
+# SUBTRACT LINK32 /debug /pdbtype:<none>
+
+!ELSEIF "$(CFG)" == "Tokens_Test - Win32 Unicode Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Tokens_Test\Unicode Debug"
+# PROP BASE Intermediate_Dir "Tokens_Test\Unicode Debug"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir "Tokens_Test"
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\DLL\Unicode_Debug"
+# PROP Intermediate_Dir ".\DLL\Unicode_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" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
+# SUBTRACT CPP /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
+# ADD LINK32 aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
+
+!ELSEIF "$(CFG)" == "Tokens_Test - Win32 Unicode Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Tokens_Test\Unicode Release"
+# PROP BASE Intermediate_Dir "Tokens_Test\Unicode Release"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir "Tokens_Test"
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\DLL\Unicode_Release"
+# PROP Intermediate_Dir ".\DLL\Unicode_Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir "Tokens_Test"
+CPP=cl.exe
+# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /FD /c
+# SUBTRACT BASE CPP /Z<none>
+# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
+# SUBTRACT CPP /Z<none> /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
+# SUBTRACT BASE LINK32 /debug /pdbtype:<none>
+# ADD LINK32 aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
+# SUBTRACT LINK32 /debug /pdbtype:<none>
+
!ENDIF
# Begin Target
# Name "Tokens_Test - Win32 Debug"
# Name "Tokens_Test - Win32 Alpha Debug"
+# Name "Tokens_Test - Win32 Release"
+# Name "Tokens_Test - Win32 Unicode Debug"
+# Name "Tokens_Test - Win32 Unicode Release"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
@@ -209,6 +308,12 @@ DEP_CPP_TOKEN=\ ".\test_config.h"\
+!ELSEIF "$(CFG)" == "Tokens_Test - Win32 Release"
+
+!ELSEIF "$(CFG)" == "Tokens_Test - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "Tokens_Test - Win32 Unicode Release"
+
!ENDIF
# End Source File
diff --git a/tests/UPIPE_SAP_Test.dsp b/tests/UPIPE_SAP_Test.dsp index 27a89bd3437..187f2a3ad65 100644 --- a/tests/UPIPE_SAP_Test.dsp +++ b/tests/UPIPE_SAP_Test.dsp @@ -5,7 +5,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-CFG=UPIPE_SAP_Test - Win32 Alpha Debug
+CFG=UPIPE_SAP_Test - Win32 Unicode Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -14,7 +14,8 @@ CFG=UPIPE_SAP_Test - Win32 Alpha Debug !MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "UPIPE_SAP_Test.mak" CFG="UPIPE_SAP_Test - Win32 Alpha Debug"
+!MESSAGE NMAKE /f "UPIPE_SAP_Test.mak"\
+ CFG="UPIPE_SAP_Test - Win32 Unicode Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
@@ -22,6 +23,12 @@ CFG=UPIPE_SAP_Test - Win32 Alpha Debug "Win32 (x86) Console Application")
!MESSAGE "UPIPE_SAP_Test - Win32 Alpha Debug" (based on\
"Win32 (ALPHA) Console Application")
+!MESSAGE "UPIPE_SAP_Test - Win32 Release" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "UPIPE_SAP_Test - Win32 Unicode Debug" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "UPIPE_SAP_Test - Win32 Unicode Release" (based on\
+ "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
@@ -38,12 +45,13 @@ CFG=UPIPE_SAP_Test - Win32 Alpha Debug # PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "."
-# PROP Intermediate_Dir ".\Debug"
+# PROP Intermediate_Dir ".\DLL\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\UPIPE_SAP_Test"
CPP=cl.exe
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD 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" /FD /c
+# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -69,8 +77,9 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir "UPIPE_SAP_Test"
CPP=cl.exe
-# ADD BASE CPP /nologo /MTd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
+# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -81,12 +90,103 @@ LINK32=link.exe # ADD BASE LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
# ADD LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
+!ELSEIF "$(CFG)" == "UPIPE_SAP_Test - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "UPIPE_SAP_Test\Debug"
+# PROP BASE Intermediate_Dir "UPIPE_SAP_Test\Debug"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir "UPIPE_SAP_Test"
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\DLL\Release"
+# PROP Intermediate_Dir ".\DLL\Release"
+# 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" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /FD /c
+# SUBTRACT CPP /Z<none> /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wsock32.lib odbc32.lib odbccp32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
+# ADD LINK32 wsock32.lib odbc32.lib odbccp32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
+# SUBTRACT LINK32 /debug /pdbtype:<none>
+
+!ELSEIF "$(CFG)" == "UPIPE_SAP_Test - Win32 Unicode Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "UPIPE_SAP_Test\Unicode Debug"
+# PROP BASE Intermediate_Dir "UPIPE_SAP_Test\Unicode Debug"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir "UPIPE_SAP_Test"
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\DLL\Unicode_Debug"
+# PROP Intermediate_Dir ".\DLL\Unicode_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" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
+# SUBTRACT CPP /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wsock32.lib odbc32.lib odbccp32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
+# ADD LINK32 wsock32.lib odbc32.lib odbccp32.lib aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
+
+!ELSEIF "$(CFG)" == "UPIPE_SAP_Test - Win32 Unicode Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "UPIPE_SAP_Test\Unicode Release"
+# PROP BASE Intermediate_Dir "UPIPE_SAP_Test\Unicode Release"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir "UPIPE_SAP_Test"
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\DLL\Unicode_Release"
+# PROP Intermediate_Dir ".\DLL\Unicode_Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir "UPIPE_SAP_Test"
+CPP=cl.exe
+# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /FD /c
+# SUBTRACT BASE CPP /Z<none>
+# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
+# SUBTRACT CPP /Z<none> /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wsock32.lib odbc32.lib odbccp32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
+# SUBTRACT BASE LINK32 /debug /pdbtype:<none>
+# ADD LINK32 wsock32.lib odbc32.lib odbccp32.lib aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
+# SUBTRACT LINK32 /debug /pdbtype:<none>
+
!ENDIF
# Begin Target
# Name "UPIPE_SAP_Test - Win32 Debug"
# Name "UPIPE_SAP_Test - Win32 Alpha Debug"
+# Name "UPIPE_SAP_Test - Win32 Release"
+# Name "UPIPE_SAP_Test - Win32 Unicode Debug"
+# Name "UPIPE_SAP_Test - Win32 Unicode Release"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
@@ -225,6 +325,12 @@ DEP_CPP_UPIPE=\ ".\test_config.h"\
+!ELSEIF "$(CFG)" == "UPIPE_SAP_Test - Win32 Release"
+
+!ELSEIF "$(CFG)" == "UPIPE_SAP_Test - Win32 Unicode Debug"
+
+!ELSEIF "$(CFG)" == "UPIPE_SAP_Test - Win32 Unicode Release"
+
!ENDIF
# End Source File
|