summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Huston <shuston@riverace.com>2001-09-07 16:18:51 +0000
committerSteve Huston <shuston@riverace.com>2001-09-07 16:18:51 +0000
commit288a871cc12299bdca76b88b498cb9ff1309c59d (patch)
tree7b429358b9f99ea129a947c4470d78c3cb3d5d92
parent640073cc7ba68e3fe8ec898728dde7653f8a46b1 (diff)
downloadATCD-288a871cc12299bdca76b88b498cb9ff1309c59d.tar.gz
ChangeLogTag:Fri Sep 07 12:12:39 2001 Steve Huston <shuston@riverace.com>
-rw-r--r--ChangeLog16
-rw-r--r--ChangeLogs/ChangeLog-02a16
-rw-r--r--ChangeLogs/ChangeLog-03a16
-rw-r--r--examples/C++NPv1/Iterative_Logging_Server.dsp9
-rw-r--r--examples/C++NPv1/Logging_Client.cpp2
-rw-r--r--examples/C++NPv1/Logging_Client.dsp6
-rw-r--r--examples/C++NPv1/Process_Per_Connection_Logging_Server.dsp6
-rw-r--r--examples/C++NPv1/RT_Thread_Per_Connection_Logging_Server.dsp8
-rw-r--r--examples/C++NPv1/Reactive_Logging_Server.dsp8
-rw-r--r--examples/C++NPv1/Reactive_Logging_Server_Ex.dsp9
-rw-r--r--examples/C++NPv1/Thread_Per_Connection_Logging_Server.dsp9
11 files changed, 78 insertions, 27 deletions
diff --git a/ChangeLog b/ChangeLog
index ea7f2cdaca6..ff8e9289739 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+Fri Sep 07 12:12:39 2001 Steve Huston <shuston@riverace.com>
+
+ * examples/C++NPv1/Iterative_Logging_Server.dsp:
+ * examples/C++NPv1/Logging_Client.dsp:
+ * examples/C++NPv1/Process_Per_Connection_Logging_Server.dsp:
+ * examples/C++NPv1/RT_Thread_Per_Connection_Logging_Server.dsp:
+ * examples/C++NPv1/Reactive_Logging_Server.dsp:
+ * examples/C++NPv1/Reactive_Logging_Server_Ex.dsp:
+ * examples/C++NPv1/Thread_Per_Connection_Logging_Server.dsp:
+ Use relative paths to include and library files rather than
+ $(ACE_ROOT). Makes it easier to use in place regardless of
+ ACE version.
+
+ * examples/C++NPv1/Logging_Client.cpp: Fixed scoping of the getline()
+ method call.
+
Thu Sep 6 21:14:05 2001 Balachandran Natarajan <bala@cs.wustl.edu>
* tests/Logging_Strategy_Test.cpp: Changed the usage of auto_ptr
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index ea7f2cdaca6..ff8e9289739 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,19 @@
+Fri Sep 07 12:12:39 2001 Steve Huston <shuston@riverace.com>
+
+ * examples/C++NPv1/Iterative_Logging_Server.dsp:
+ * examples/C++NPv1/Logging_Client.dsp:
+ * examples/C++NPv1/Process_Per_Connection_Logging_Server.dsp:
+ * examples/C++NPv1/RT_Thread_Per_Connection_Logging_Server.dsp:
+ * examples/C++NPv1/Reactive_Logging_Server.dsp:
+ * examples/C++NPv1/Reactive_Logging_Server_Ex.dsp:
+ * examples/C++NPv1/Thread_Per_Connection_Logging_Server.dsp:
+ Use relative paths to include and library files rather than
+ $(ACE_ROOT). Makes it easier to use in place regardless of
+ ACE version.
+
+ * examples/C++NPv1/Logging_Client.cpp: Fixed scoping of the getline()
+ method call.
+
Thu Sep 6 21:14:05 2001 Balachandran Natarajan <bala@cs.wustl.edu>
* tests/Logging_Strategy_Test.cpp: Changed the usage of auto_ptr
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index ea7f2cdaca6..ff8e9289739 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,19 @@
+Fri Sep 07 12:12:39 2001 Steve Huston <shuston@riverace.com>
+
+ * examples/C++NPv1/Iterative_Logging_Server.dsp:
+ * examples/C++NPv1/Logging_Client.dsp:
+ * examples/C++NPv1/Process_Per_Connection_Logging_Server.dsp:
+ * examples/C++NPv1/RT_Thread_Per_Connection_Logging_Server.dsp:
+ * examples/C++NPv1/Reactive_Logging_Server.dsp:
+ * examples/C++NPv1/Reactive_Logging_Server_Ex.dsp:
+ * examples/C++NPv1/Thread_Per_Connection_Logging_Server.dsp:
+ Use relative paths to include and library files rather than
+ $(ACE_ROOT). Makes it easier to use in place regardless of
+ ACE version.
+
+ * examples/C++NPv1/Logging_Client.cpp: Fixed scoping of the getline()
+ method call.
+
Thu Sep 6 21:14:05 2001 Balachandran Natarajan <bala@cs.wustl.edu>
* tests/Logging_Strategy_Test.cpp: Changed the usage of auto_ptr
diff --git a/examples/C++NPv1/Iterative_Logging_Server.dsp b/examples/C++NPv1/Iterative_Logging_Server.dsp
index 20a9b0f931b..84a78603b99 100644
--- a/examples/C++NPv1/Iterative_Logging_Server.dsp
+++ b/examples/C++NPv1/Iterative_Logging_Server.dsp
@@ -35,9 +35,10 @@ RSC=rc.exe
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "Iterative_Logging_Server/Debug"
# PROP Intermediate_Dir "Iterative_Logging_Server/Debug"
+# 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 "$(ACE_ROOT)" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# 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" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -45,8 +46,8 @@ BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"$(ACE_ROOT)/ace"
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"../../ace"
# Begin Target
# Name "Iterative_Logging_Server - Win32 Debug"
diff --git a/examples/C++NPv1/Logging_Client.cpp b/examples/C++NPv1/Logging_Client.cpp
index 39767a2f837..fc14388e0e6 100644
--- a/examples/C++NPv1/Logging_Client.cpp
+++ b/examples/C++NPv1/Logging_Client.cpp
@@ -111,7 +111,7 @@ int main (int argc, char *argv[])
for (;;) {
std::string user_input;
- getline (cin, user_input, '\n');
+ std::getline (cin, user_input, '\n');
if (!cin || cin.eof ()) break;
diff --git a/examples/C++NPv1/Logging_Client.dsp b/examples/C++NPv1/Logging_Client.dsp
index f7b2f906f8f..9085115469c 100644
--- a/examples/C++NPv1/Logging_Client.dsp
+++ b/examples/C++NPv1/Logging_Client.dsp
@@ -37,8 +37,8 @@ RSC=rc.exe
# PROP Intermediate_Dir "Logging_Client/Debug"
# 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 "$(ACE_ROOT)" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# 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" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -47,7 +47,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"$(ACE_ROOT)/ace"
+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"../../ace"
# Begin Target
# Name "Logging_Client - Win32 Debug"
diff --git a/examples/C++NPv1/Process_Per_Connection_Logging_Server.dsp b/examples/C++NPv1/Process_Per_Connection_Logging_Server.dsp
index 66e004c3fee..09c95b6564f 100644
--- a/examples/C++NPv1/Process_Per_Connection_Logging_Server.dsp
+++ b/examples/C++NPv1/Process_Per_Connection_Logging_Server.dsp
@@ -37,8 +37,8 @@ RSC=rc.exe
# PROP Intermediate_Dir "Process_Per_Connection_Logging_Server/Debug"
# 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 "$(ACE_ROOT)" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# 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" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -47,7 +47,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"$(ACE_ROOT)/ace"
+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"../../ace"
# Begin Target
# Name "Process_Per_Connection_Logging_Server - Win32 Debug"
diff --git a/examples/C++NPv1/RT_Thread_Per_Connection_Logging_Server.dsp b/examples/C++NPv1/RT_Thread_Per_Connection_Logging_Server.dsp
index a1e022a50d9..703ab8f4972 100644
--- a/examples/C++NPv1/RT_Thread_Per_Connection_Logging_Server.dsp
+++ b/examples/C++NPv1/RT_Thread_Per_Connection_Logging_Server.dsp
@@ -37,8 +37,8 @@ RSC=rc.exe
# PROP Intermediate_Dir "RT_Thread_Per_Connection_Logging_Server/Debug"
# 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 "$(ACE_ROOT)" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# 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" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -46,8 +46,8 @@ BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"$(ACE_ROOT)/ace"
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"../../ace"
# Begin Target
# Name "RT_Thread_Per_Connection_Logging_Server - Win32 Debug"
diff --git a/examples/C++NPv1/Reactive_Logging_Server.dsp b/examples/C++NPv1/Reactive_Logging_Server.dsp
index 4a4ab22df6d..3ea2ee54ff7 100644
--- a/examples/C++NPv1/Reactive_Logging_Server.dsp
+++ b/examples/C++NPv1/Reactive_Logging_Server.dsp
@@ -37,8 +37,8 @@ RSC=rc.exe
# PROP Intermediate_Dir "Reactive_Logging_Server/Debug"
# 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 "$(ACE_ROOT)" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# 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" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -46,8 +46,8 @@ BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"$(ACE_ROOT)/ace"
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"../../ace"
# Begin Target
# Name "Reactive_Logging_Server - Win32 Debug"
diff --git a/examples/C++NPv1/Reactive_Logging_Server_Ex.dsp b/examples/C++NPv1/Reactive_Logging_Server_Ex.dsp
index dd19d3d6e6c..18b5f486e8f 100644
--- a/examples/C++NPv1/Reactive_Logging_Server_Ex.dsp
+++ b/examples/C++NPv1/Reactive_Logging_Server_Ex.dsp
@@ -35,9 +35,10 @@ RSC=rc.exe
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "Reactive_Logging_Server_Ex/Debug"
# PROP Intermediate_Dir "Reactive_Logging_Server_Ex/Debug"
+# 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 "$(ACE_ROOT)" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# 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" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -45,8 +46,8 @@ BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"$(ACE_ROOT)/ace"
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"../../ace"
# Begin Target
# Name "Reactive_Logging_Server_Ex - Win32 Debug"
diff --git a/examples/C++NPv1/Thread_Per_Connection_Logging_Server.dsp b/examples/C++NPv1/Thread_Per_Connection_Logging_Server.dsp
index 79e98e20487..7e44bce30c4 100644
--- a/examples/C++NPv1/Thread_Per_Connection_Logging_Server.dsp
+++ b/examples/C++NPv1/Thread_Per_Connection_Logging_Server.dsp
@@ -35,9 +35,10 @@ RSC=rc.exe
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "Thread_Per_Connection_Logging_Server/Debug"
# PROP Intermediate_Dir "Thread_Per_Connection_Logging_Server/Debug"
+# 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 "$(ACE_ROOT)" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# 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" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -45,8 +46,8 @@ BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"$(ACE_ROOT)/ace"
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"../../ace"
# Begin Target
# Name "Thread_Per_Connection_Logging_Server - Win32 Debug"