ChangeLogTag:Thu Apr 20 18:11:48 2000 Darrell Brunsch <brunsch@uci.edu>

4 files changed, 36 insertions, 32 deletions

diff --git a/examples/Timer_Queue/Async_Timer_Queue_Test.dsp b/examples/Timer_Queue/Async_Timer_Queue_Test.dsp
index fd9c3ff06b8..42da5be4585 100644
--- a/examples/Timer_Queue/Async_Timer_Queue_Test.dsp
+++ b/examples/Timer_Queue/Async_Timer_Queue_Test.dsp
@@ -13,18 +13,16 @@ CFG=Async_Timer_Queue_Test - Win32 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 "Async_Timer_Queue_Test.mak"\

- CFG="Async_Timer_Queue_Test - Win32 Debug"

+!MESSAGE NMAKE /f "Async_Timer_Queue_Test.mak" CFG="Async_Timer_Queue_Test - Win32 Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Async_Timer_Queue_Test - Win32 Release" (based on\

- "Win32 (x86) Console Application")

-!MESSAGE "Async_Timer_Queue_Test - Win32 Debug" (based on\

- "Win32 (x86) Console Application")

+!MESSAGE "Async_Timer_Queue_Test - Win32 Release" (based on "Win32 (x86) Console Application")

+!MESSAGE "Async_Timer_Queue_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

 !MESSAGE 

 

 # Begin Project

+# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

 CPP=cl.exe

@@ -43,7 +41,7 @@ RSC=rc.exe
 # PROP Intermediate_Dir "Release"

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

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

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

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

 BSC32=bscmake.exe

@@ -51,7 +49,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

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

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

+# ADD LINK32 ace.lib /nologo /subsystem:console /machine:I386 /libpath:"../../ace"

 

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

 

@@ -67,7 +65,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # 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" /YX /FD /c

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

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

 BSC32=bscmake.exe

@@ -75,7 +73,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

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

-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\ace"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"../../ace"

 

 !ENDIF 

 

@@ -91,8 +89,6 @@ SOURCE=.\Async_Timer_Queue_Test.cpp
 

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

 

-# ADD CPP /I "..\.."

-

 !ENDIF 

 

 # End Source File

diff --git a/examples/Timer_Queue/Reactor_Timer_Queue_Test.dsp b/examples/Timer_Queue/Reactor_Timer_Queue_Test.dsp
index b3d17953d34..c840f1e2d85 100644
--- a/examples/Timer_Queue/Reactor_Timer_Queue_Test.dsp
+++ b/examples/Timer_Queue/Reactor_Timer_Queue_Test.dsp
@@ -13,18 +13,16 @@ CFG=Reactor_Timer_Queue_Test - Win32 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 "Reactor_Timer_Queue_Test.mak"\

- CFG="Reactor_Timer_Queue_Test - Win32 Debug"

+!MESSAGE NMAKE /f "Reactor_Timer_Queue_Test.mak" CFG="Reactor_Timer_Queue_Test - Win32 Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Reactor_Timer_Queue_Test - Win32 Release" (based on\

- "Win32 (x86) Console Application")

-!MESSAGE "Reactor_Timer_Queue_Test - Win32 Debug" (based on\

- "Win32 (x86) Console Application")

+!MESSAGE "Reactor_Timer_Queue_Test - Win32 Release" (based on "Win32 (x86) Console Application")

+!MESSAGE "Reactor_Timer_Queue_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

 !MESSAGE 

 

 # Begin Project

+# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

 CPP=cl.exe

@@ -43,7 +41,7 @@ RSC=rc.exe
 # PROP Intermediate_Dir "Release"

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

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

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

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

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

 BSC32=bscmake.exe

@@ -51,7 +49,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

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

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

+# ADD LINK32 ace.lib /nologo /subsystem:console /machine:I386 /libpath:"../../ace"

 

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

 

@@ -67,7 +65,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # 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" /YX /FD /c

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

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

 BSC32=bscmake.exe

@@ -75,7 +73,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

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

-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\ace"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"../../ace"

 

 !ENDIF 

 

diff --git a/examples/Timer_Queue/Thread_Timer_Queue_Test.dsp b/examples/Timer_Queue/Thread_Timer_Queue_Test.dsp
index 2908183f97c..5b6301810d7 100644
--- a/examples/Timer_Queue/Thread_Timer_Queue_Test.dsp
+++ b/examples/Timer_Queue/Thread_Timer_Queue_Test.dsp
@@ -13,18 +13,16 @@ CFG=Thread_Timer_Queue_Test - Win32 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 "Thread_Timer_Queue_Test.mak"\

- CFG="Thread_Timer_Queue_Test - Win32 Debug"

+!MESSAGE NMAKE /f "Thread_Timer_Queue_Test.mak" CFG="Thread_Timer_Queue_Test - Win32 Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Thread_Timer_Queue_Test - Win32 Release" (based on\

- "Win32 (x86) Console Application")

-!MESSAGE "Thread_Timer_Queue_Test - Win32 Debug" (based on\

- "Win32 (x86) Console Application")

+!MESSAGE "Thread_Timer_Queue_Test - Win32 Release" (based on "Win32 (x86) Console Application")

+!MESSAGE "Thread_Timer_Queue_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

 !MESSAGE 

 

 # Begin Project

+# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

 CPP=cl.exe

@@ -44,7 +42,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

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

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

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

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

 BSC32=bscmake.exe

@@ -52,7 +50,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

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

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

+# ADD LINK32 ace.lib /nologo /subsystem:console /machine:I386 /libpath:"../../ace"

 

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

 

@@ -68,7 +66,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # 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" /YX /FD /c

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

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

 BSC32=bscmake.exe

@@ -76,7 +74,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

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

-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\ace\\"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"../../ace"

 

 !ENDIF 

 

diff --git a/examples/Timer_Queue/Timer_Queue.dsw b/examples/Timer_Queue/Timer_Queue.dsw
index 4e46db747d4..f78bd52ee47 100644
--- a/examples/Timer_Queue/Timer_Queue.dsw
+++ b/examples/Timer_Queue/Timer_Queue.dsw
@@ -3,6 +3,18 @@ Microsoft Developer Studio Workspace File, Format Version 6.00
 

 ###############################################################################

 

+Project: "Async_Timer_Queue_Test"=.\Async_Timer_Queue_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

 Project: "Reactor_Timer_Queue_Test"=.\Reactor_Timer_Queue_Test.dsp - Package Owner=<4>

 

 Package=<5>