ChangeLogTag:Tue Sep 12 01:58:59 2000 Nanbor Wang <nanbor@cs.wustl.edu>

3 files changed, 12 insertions, 11 deletions

diff --git a/TAO/examples/mfc/client.cpp b/TAO/examples/mfc/client.cpp
index 5c6f054154d..8c7ad923928 100644
--- a/TAO/examples/mfc/client.cpp
+++ b/TAO/examples/mfc/client.cpp
@@ -2,6 +2,7 @@
 
 #include "tao\corba.h"
 #include "W32_TestC.h"
+#include "tao\PortableServer\POA.h"
 
 int
 main (int argc, char *argv[])
@@ -31,7 +32,7 @@ main (int argc, char *argv[])
 
   cout << "Narrowing the IOR!" << endl;
 
-  W32_Test_Interface_var mycall = 
+  W32_Test_Interface_var mycall =
     W32_Test_Interface::_narrow (orb_obj.in ());
 
   cout << "Sending the Request!" << endl;
diff --git a/TAO/examples/mfc/client.dsp b/TAO/examples/mfc/client.dsp
index 09fd5a7e3e4..c69032858a9 100644
--- a/TAO/examples/mfc/client.dsp
+++ b/TAO/examples/mfc/client.dsp
@@ -2,7 +2,7 @@
 # Microsoft Developer Studio Generated Build File, Format Version 6.00

 # ** DO NOT EDIT **

 

-# TARGTYPE "Win32 MFC (x86) Console Application" 0x0103

+# TARGTYPE "Win32 (x86) Console Application" 0x0103

 

 CFG=client - Win32 MFC Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

@@ -17,8 +17,8 @@ CFG=client - Win32 MFC Debug
 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "client - Win32 MFC Release" (based on "Win32 MFC (x86) Console Application")

-!MESSAGE "client - Win32 MFC Debug" (based on "Win32 MFC (x86) Console Application")

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

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

 !MESSAGE 

 

 # Begin Project

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

 LINK32=link.exe

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

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

+# 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 acemfc.lib TAOmfc.lib TAO_CosNamingmfc.lib TAO_PortableServermfc.lib /nologo /subsystem:console /machine:I386 /libpath:"../../../ace" /libpath:"../../tao" /libpath:"../../orbsvcs/orbsvcs" /libpath:"../../tao/PortableServer"

 

 !ELSEIF  "$(CFG)" == "client - Win32 MFC Debug"

 

@@ -75,7 +75,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 acemfcd.lib TAOmfcd.lib TAO_CosNamingd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"../../../ace" /libpath:"../../tao" /libpath:"../../orbsvcs/orbsvcs"

+# ADD LINK32 acemfcd.lib TAOmfcd.lib TAO_CosNamingmfcd.lib TAO_PortableServermfcd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"../../../ace" /libpath:"../../tao" /libpath:"../../orbsvcs/orbsvcs" /libpath:"../../tao/PortableServer"

 

 !ENDIF 

 

diff --git a/TAO/examples/mfc/server.dsp b/TAO/examples/mfc/server.dsp
index 3ad8249d64e..d8d1fb88412 100644
--- a/TAO/examples/mfc/server.dsp
+++ b/TAO/examples/mfc/server.dsp
@@ -2,7 +2,7 @@
 # Microsoft Developer Studio Generated Build File, Format Version 6.00

 # ** DO NOT EDIT **

 

-# TARGTYPE "Win32 MFC (x86) Application" 0x0101

+# TARGTYPE "Win32 (x86) Application" 0x0101

 

 CFG=server - Win32 MFC Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

@@ -17,8 +17,8 @@ CFG=server - Win32 MFC Debug
 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "server - Win32 MFC Release" (based on "Win32 MFC (x86) Application")

-!MESSAGE "server - Win32 MFC Debug" (based on "Win32 MFC (x86) Application")

+!MESSAGE "server - Win32 MFC Release" (based on "Win32 (x86) Application")

+!MESSAGE "server - Win32 MFC Debug" (based on "Win32 (x86) Application")

 !MESSAGE 

 

 # Begin Project

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

 LINK32=link.exe

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

-# ADD LINK32 acemfc.lib TAOmfc.lib TAO_CosNaming.lib /nologo /subsystem:windows /machine:I386 /libpath:"../../../ace" /libpath:"../../tao" /libpath:"../../orbsvcs/orbsvcs"

+# ADD LINK32 acemfc.lib TAOmfc.lib TAO_CosNamingmfc.lib TAO_PortableServermfc.lib /nologo /subsystem:windows /machine:I386 /libpath:"../../../ace" /libpath:"../../tao" /libpath:"../../orbsvcs/orbsvcs" /libpath:"../../tao/PortableServer"

 

 !ELSEIF  "$(CFG)" == "server - Win32 MFC Debug"

 

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

 LINK32=link.exe

 # ADD BASE LINK32 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 acemfcd.lib TAOmfcd.lib TAO_CosNamingd.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept /libpath:"../../../ace" /libpath:"../../tao" /libpath:"../../orbsvcs/orbsvcs"

+# ADD LINK32 acemfcd.lib TAOmfcd.lib TAO_CosNamingmfcd.lib TAO_PortableServermfcd.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept /libpath:"../../../ace" /libpath:"../../tao" /libpath:"../../orbsvcs/orbsvcs" /libpath:"../../tao/PortableServer"

 

 !ENDIF