From e5db6cf4cfd6a7401a880d95740b5882e7380e11 Mon Sep 17 00:00:00 2001 From: brunsch Date: Thu, 28 Jan 1999 21:40:35 +0000 Subject: Changed to work with Bala's changes. --- TAO/examples/Simple/grid/client.dsp | 14 ++++++---- TAO/examples/Simple/grid/server.dsp | 16 ++++++------ TAO/examples/Simple/time/client.dsp | 26 +++++++++---------- TAO/examples/Simple/time/client_static.dsp | 18 ++++++------- TAO/examples/Simple/time/server.dsp | 41 ++++++++---------------------- TAO/examples/Simple/time/server_static.dsp | 18 ++++++------- 6 files changed, 57 insertions(+), 76 deletions(-) diff --git a/TAO/examples/Simple/grid/client.dsp b/TAO/examples/Simple/grid/client.dsp index e94c7978a77..5aa6033a4da 100644 --- a/TAO/examples/Simple/grid/client.dsp +++ b/TAO/examples/Simple/grid/client.dsp @@ -42,7 +42,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir ".\client" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\\" /I "..\..\..\..\\" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\\" /I "..\..\..\..\\" /I "..\..\..\orbsvcs" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c # SUBTRACT CPP /YX # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" @@ -51,7 +51,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 TAO.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" +# ADD LINK32 ace.lib TAO.lib orbsvcs.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" /libpath:"..\..\..\orbsvcs\orbsvcs" !ELSEIF "$(CFG)" == "Simple Grid Client - Win32 Debug" @@ -67,7 +67,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir ".\client" # 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 "..\..\..\\" /I "..\..\..\..\\" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /FD /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\\" /I "..\..\..\..\\" /I "..\..\..\orbsvcs" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /FD /c # SUBTRACT CPP /YX # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" @@ -76,7 +76,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 -# ADD LINK32 aced.lib TAOd.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" +# ADD LINK32 aced.lib TAOd.lib orbsvcsd.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" /libpath:"..\..\..\orbsvcs\orbsvcs" !ENDIF @@ -93,7 +93,7 @@ SOURCE=.\client.cpp # End Source File # Begin Source File -SOURCE=.\Client_i.cpp +SOURCE=.\Grid_Client_i.cpp # End Source File # Begin Source File @@ -111,6 +111,10 @@ SOURCE=.\GridS.cpp SOURCE=.\Client_i.h # End Source File +# Begin Source File + +SOURCE=.\Grid_Client_i.h +# End Source File # End Group # Begin Group "IDL Files" diff --git a/TAO/examples/Simple/grid/server.dsp b/TAO/examples/Simple/grid/server.dsp index fb15ebf4d5b..2f5ecf13099 100644 --- a/TAO/examples/Simple/grid/server.dsp +++ b/TAO/examples/Simple/grid/server.dsp @@ -42,7 +42,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir ".\server" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\\" /I "..\..\..\..\\" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\\" /I "..\..\..\..\\" /I "..\..\..\orbsvcs" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c # SUBTRACT CPP /YX # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" @@ -51,7 +51,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 TAO.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" +# ADD LINK32 ace.lib TAO.lib orbsvcs.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" /libpath:"..\..\..\orbsvcs\orbsvcs" !ELSEIF "$(CFG)" == "Simple Grid Server - Win32 Debug" @@ -67,7 +67,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir ".\server" # 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 "..\..\..\\" /I "..\..\..\..\\" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /FD /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\\" /I "..\..\..\..\\" /I "..\..\..\orbsvcs" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /FD /c # SUBTRACT CPP /YX # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" @@ -76,7 +76,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 -# ADD LINK32 aced.lib TAOd.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" +# ADD LINK32 aced.lib TAOd.lib orbsvcsd.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" /libpath:"..\..\..\orbsvcs\orbsvcs" !ENDIF @@ -103,16 +103,16 @@ SOURCE=.\GridS.cpp SOURCE=.\server.cpp # End Source File -# Begin Source File - -SOURCE=.\Server_i.cpp -# End Source File # End Group # Begin Group "Header Files" # PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd" # Begin Source File +SOURCE=.\Grid_i.h +# End Source File +# Begin Source File + SOURCE=.\Server_i.h # End Source File # End Group diff --git a/TAO/examples/Simple/time/client.dsp b/TAO/examples/Simple/time/client.dsp index 5a19d25c333..0b822d36001 100644 --- a/TAO/examples/Simple/time/client.dsp +++ b/TAO/examples/Simple/time/client.dsp @@ -44,7 +44,7 @@ CFG=Simple Time Client - Win32 Alpha Debug # PROP Target_Dir ".\client" CPP=cl.exe # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\\" /I "..\..\..\..\\" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\\" /I "..\..\..\..\\" /I "..\..\..\orbsvcs" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c # SUBTRACT CPP /YX RSC=rc.exe # ADD BASE RSC /l 0x409 /d "NDEBUG" @@ -54,7 +54,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 TAO.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" +# ADD LINK32 ace.lib TAO.lib orbsvcs.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" /libpath:"..\..\..\orbsvcs\orbsvcs" !ELSEIF "$(CFG)" == "Simple Time Client - Win32 Debug" @@ -71,7 +71,7 @@ LINK32=link.exe # PROP Target_Dir ".\client" 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 "..\..\..\\" /I "..\..\..\..\\" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /FD /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\\" /I "..\..\..\..\\" /I "..\..\..\orbsvcs" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /FD /c # SUBTRACT CPP /YX RSC=rc.exe # ADD BASE RSC /l 0x409 /d "_DEBUG" @@ -81,7 +81,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 -# ADD LINK32 aced.lib TAOd.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" +# ADD LINK32 aced.lib TAOd.lib orbsvcsd.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" /libpath:"..\..\..\orbsvcs\orbsvcs" !ELSEIF "$(CFG)" == "Simple Time Client - Win32 Alpha Debug" @@ -98,9 +98,9 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "client" CPP=cl.exe -# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\..\\ /I "..\..\..\..\\ /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c +# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\..\\ /I " ..\..\..\..\\ /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c # SUBTRACT BASE CPP /YX -# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\..\\ /I "..\..\..\..\\ /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /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" @@ -127,9 +127,9 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "client" CPP=cl.exe -# ADD BASE CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\..\\ /I "..\..\..\..\\ /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c +# ADD BASE CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\..\\ /I " ..\..\..\..\\ /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c # SUBTRACT BASE CPP /YX -# ADD CPP /nologo /MD /Gt0 /W3 /GX /O2 /I "..\..\..\\ /I "..\..\..\..\\ /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c +# ADD CPP /nologo /MD /Gt0 /W3 /GX /O2 /I "..\..\..\\ /I " ..\..\..\..\\ /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c # SUBTRACT CPP /YX RSC=rc.exe # ADD BASE RSC /l 0x409 /d "NDEBUG" @@ -352,7 +352,6 @@ DEP_CPP_CLIEN=\ "..\..\..\tao\Object.i"\ "..\..\..\tao\Object_KeyC.h"\ "..\..\..\tao\Object_KeyC.i"\ - "..\..\..\tao\Object_Table.h"\ "..\..\..\tao\Operation_Table.h"\ "..\..\..\tao\ORB.h"\ "..\..\..\tao\ORB.i"\ @@ -399,6 +398,7 @@ DEP_CPP_CLIEN=\ NODEP_CPP_CLIEN=\ "..\..\..\..\ace\sys_conf.h"\ + "..\..\..\tao\Object_Table.h"\ ".\Client_impl.h"\ ".\TimeC.h"\ @@ -410,7 +410,7 @@ NODEP_CPP_CLIEN=\ # End Source File # Begin Source File -SOURCE=.\Client_i.cpp +SOURCE=.\Time_Client_i.cpp !IF "$(CFG)" == "Simple Time Client - Win32 Release" @@ -623,7 +623,6 @@ DEP_CPP_TIMEC=\ "..\..\..\tao\Object.i"\ "..\..\..\tao\Object_KeyC.h"\ "..\..\..\tao\Object_KeyC.i"\ - "..\..\..\tao\Object_Table.h"\ "..\..\..\tao\Operation_Table.h"\ "..\..\..\tao\ORB.h"\ "..\..\..\tao\ORB.i"\ @@ -670,6 +669,7 @@ DEP_CPP_TIMEC=\ NODEP_CPP_TIMEC=\ "..\..\..\..\ace\sys_conf.h"\ + "..\..\..\tao\Object_Table.h"\ ".\TimeC.h"\ ".\TimeC.i"\ ".\TimeS.h"\ @@ -884,7 +884,6 @@ DEP_CPP_TIMES=\ "..\..\..\tao\Object.i"\ "..\..\..\tao\Object_KeyC.h"\ "..\..\..\tao\Object_KeyC.i"\ - "..\..\..\tao\Object_Table.h"\ "..\..\..\tao\Operation_Table.h"\ "..\..\..\tao\ORB.h"\ "..\..\..\tao\ORB.i"\ @@ -931,6 +930,7 @@ DEP_CPP_TIMES=\ NODEP_CPP_TIMES=\ "..\..\..\..\ace\sys_conf.h"\ + "..\..\..\tao\Object_Table.h"\ ".\TimeC.h"\ ".\TimeC.i"\ ".\TimeS.h"\ @@ -951,7 +951,7 @@ NODEP_CPP_TIMES=\ # PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd" # Begin Source File -SOURCE=.\Client_i.h +SOURCE=.\Time_Client_i.h # End Source File # End Group # Begin Group "IDL Files" diff --git a/TAO/examples/Simple/time/client_static.dsp b/TAO/examples/Simple/time/client_static.dsp index 943f98f5918..aadb5bf2e30 100644 --- a/TAO/examples/Simple/time/client_static.dsp +++ b/TAO/examples/Simple/time/client_static.dsp @@ -13,18 +13,16 @@ CFG=Simple Time Client Static - 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 "client_static.mak"\ - CFG="Simple Time Client Static - Win32 Debug" +!MESSAGE NMAKE /f "client_static.mak" CFG="Simple Time Client Static - Win32 Debug" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE -!MESSAGE "Simple Time Client Static - Win32 Debug" (based on\ - "Win32 (x86) Console Application") -!MESSAGE "Simple Time Client Static - Win32 Release" (based on\ - "Win32 (x86) Console Application") +!MESSAGE "Simple Time Client Static - Win32 Debug" (based on "Win32 (x86) Console Application") +!MESSAGE "Simple Time Client Static - Win32 Release" (based on "Win32 (x86) Console Application") !MESSAGE # Begin Project +# PROP AllowPerConfigDependencies 0 # PROP Scc_ProjName "" # PROP Scc_LocalPath "" CPP=cl.exe @@ -46,7 +44,7 @@ RSC=rc.exe # PROP Target_Dir "client" # ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /I "..\..\..\\" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /FD /c # SUBTRACT BASE CPP /YX -# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\..\..\\" /I "..\..\..\..\\" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D TAO_HAS_DLL=0 /D __ACE_INLINE__=0 /D ACE_HAS_DLL=0 /FD /c +# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\..\..\\" /I "..\..\..\..\\" /I "..\..\..\orbsvcs" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D TAO_HAS_DLL=0 /D __ACE_INLINE__=0 /D ACE_HAS_DLL=0 /FD /c # SUBTRACT CPP /YX # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" @@ -55,7 +53,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 aced.lib TAOd.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\tao" /libpath:"..\..\..\ace" -# ADD LINK32 acesd.lib TAOsd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" +# ADD LINK32 acesd.lib TAOsd.lib orbsvcssd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" /libpath:"..\..\..\orbsvcs\orbsvcs" !ELSEIF "$(CFG)" == "Simple Time Client Static - Win32 Release" @@ -73,7 +71,7 @@ LINK32=link.exe # PROP Target_Dir "client" # ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /I "..\..\..\\" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c # SUBTRACT BASE CPP /YX -# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\..\\" /I "..\..\..\..\\" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D ACE_HAS_DLL=0 /D TAO_HAS_DLL=0 /D __ACE_INLINE__=0 /FD /c +# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\..\\" /I "..\..\..\..\\" /I "..\..\..\orbsvcs" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D ACE_HAS_DLL=0 /D TAO_HAS_DLL=0 /D __ACE_INLINE__=0 /FD /c # SUBTRACT CPP /YX # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" @@ -82,7 +80,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 ace.lib TAO.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\tao" /libpath:"..\..\..\ace" -# ADD LINK32 aces.lib TAOs.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" +# ADD LINK32 aces.lib TAOs.lib orbsvcss.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" /libpath:"..\..\..\orbsvcs\orbsvcs" !ENDIF diff --git a/TAO/examples/Simple/time/server.dsp b/TAO/examples/Simple/time/server.dsp index 1837e2ba829..fa0d30a9fdc 100644 --- a/TAO/examples/Simple/time/server.dsp +++ b/TAO/examples/Simple/time/server.dsp @@ -44,7 +44,7 @@ CFG=Simple Time Server - Win32 Alpha Debug # PROP Target_Dir ".\server" CPP=cl.exe # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\\" /I "..\..\..\..\\" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\\" /I "..\..\..\..\\" /I "..\..\..\orbsvcs" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c # SUBTRACT CPP /YX RSC=rc.exe # ADD BASE RSC /l 0x409 /d "NDEBUG" @@ -54,7 +54,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 TAO.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" +# ADD LINK32 ace.lib TAO.lib orbsvcs.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" /libpath:"..\..\..\orbsvcs\orbsvcs" !ELSEIF "$(CFG)" == "Simple Time Server - Win32 Debug" @@ -71,7 +71,7 @@ LINK32=link.exe # PROP Target_Dir ".\server" 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 "..\..\..\\" /I "..\..\..\..\\" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /FD /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\\" /I "..\..\..\..\\" /I "..\..\..\orbsvcs" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /FD /c # SUBTRACT CPP /YX RSC=rc.exe # ADD BASE RSC /l 0x409 /d "_DEBUG" @@ -81,7 +81,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 -# ADD LINK32 aced.lib TAOd.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" +# ADD LINK32 aced.lib TAOd.lib orbsvcsd.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" /libpath:"..\..\..\orbsvcs\orbsvcs" !ELSEIF "$(CFG)" == "Simple Time Server - Win32 Alpha Debug" @@ -98,9 +98,9 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "server" CPP=cl.exe -# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\..\\ /I "..\..\..\..\\ /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c +# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\..\\ /I " ..\..\..\..\\ /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c # SUBTRACT BASE CPP /YX -# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\..\\ /I "..\..\..\..\\ /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /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" @@ -127,9 +127,9 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "server" CPP=cl.exe -# ADD BASE CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\..\\ /I "..\..\..\..\\ /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c +# ADD BASE CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\..\\ /I " ..\..\..\..\\ /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c # SUBTRACT BASE CPP /YX -# ADD CPP /nologo /MD /Gt0 /W3 /GX /O2 /I "..\..\..\\ /I "..\..\..\..\\ /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c +# ADD CPP /nologo /MD /Gt0 /W3 /GX /O2 /I "..\..\..\\ /I " ..\..\..\..\\ /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c # SUBTRACT CPP /YX RSC=rc.exe # ADD BASE RSC /l 0x409 /d "NDEBUG" @@ -352,7 +352,6 @@ DEP_CPP_SERVE=\ "..\..\..\tao\Object.i"\ "..\..\..\tao\Object_KeyC.h"\ "..\..\..\tao\Object_KeyC.i"\ - "..\..\..\tao\Object_Table.h"\ "..\..\..\tao\Operation_Table.h"\ "..\..\..\tao\ORB.h"\ "..\..\..\tao\ORB.i"\ @@ -400,6 +399,7 @@ DEP_CPP_SERVE=\ NODEP_CPP_SERVE=\ "..\..\..\..\ace\sys_conf.h"\ + "..\..\..\tao\Object_Table.h"\ ".\Server_impl.h"\ ".\Time_impl.h"\ ".\TimeC.h"\ @@ -411,21 +411,6 @@ NODEP_CPP_SERVE=\ ".\TimeS_T.i"\ -!ELSEIF "$(CFG)" == "Simple Time Server - Win32 Alpha Release" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\Server_i.cpp - -!IF "$(CFG)" == "Simple Time Server - Win32 Release" - -!ELSEIF "$(CFG)" == "Simple Time Server - Win32 Debug" - -!ELSEIF "$(CFG)" == "Simple Time Server - Win32 Alpha Debug" - !ELSEIF "$(CFG)" == "Simple Time Server - Win32 Alpha Release" !ENDIF @@ -646,7 +631,6 @@ DEP_CPP_TIMEC=\ "..\..\..\tao\Object.i"\ "..\..\..\tao\Object_KeyC.h"\ "..\..\..\tao\Object_KeyC.i"\ - "..\..\..\tao\Object_Table.h"\ "..\..\..\tao\Operation_Table.h"\ "..\..\..\tao\ORB.h"\ "..\..\..\tao\ORB.i"\ @@ -693,6 +677,7 @@ DEP_CPP_TIMEC=\ NODEP_CPP_TIMEC=\ "..\..\..\..\ace\sys_conf.h"\ + "..\..\..\tao\Object_Table.h"\ ".\TimeC.h"\ ".\TimeC.i"\ ".\TimeS.h"\ @@ -907,7 +892,6 @@ DEP_CPP_TIMES=\ "..\..\..\tao\Object.i"\ "..\..\..\tao\Object_KeyC.h"\ "..\..\..\tao\Object_KeyC.i"\ - "..\..\..\tao\Object_Table.h"\ "..\..\..\tao\Operation_Table.h"\ "..\..\..\tao\ORB.h"\ "..\..\..\tao\ORB.i"\ @@ -954,6 +938,7 @@ DEP_CPP_TIMES=\ NODEP_CPP_TIMES=\ "..\..\..\..\ace\sys_conf.h"\ + "..\..\..\tao\Object_Table.h"\ ".\TimeC.h"\ ".\TimeC.i"\ ".\TimeS.h"\ @@ -974,10 +959,6 @@ NODEP_CPP_TIMES=\ # PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd" # Begin Source File -SOURCE=.\Server_i.h -# End Source File -# Begin Source File - SOURCE=.\Time_i.h # End Source File # End Group diff --git a/TAO/examples/Simple/time/server_static.dsp b/TAO/examples/Simple/time/server_static.dsp index 1902de5ece2..919165ee41b 100644 --- a/TAO/examples/Simple/time/server_static.dsp +++ b/TAO/examples/Simple/time/server_static.dsp @@ -13,18 +13,16 @@ CFG=Simple Time Server Static - 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 "server_static.mak"\ - CFG="Simple Time Server Static - Win32 Debug" +!MESSAGE NMAKE /f "server_static.mak" CFG="Simple Time Server Static - Win32 Debug" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE -!MESSAGE "Simple Time Server Static - Win32 Debug" (based on\ - "Win32 (x86) Console Application") -!MESSAGE "Simple Time Server Static - Win32 Release" (based on\ - "Win32 (x86) Console Application") +!MESSAGE "Simple Time Server Static - Win32 Debug" (based on "Win32 (x86) Console Application") +!MESSAGE "Simple Time Server Static - Win32 Release" (based on "Win32 (x86) Console Application") !MESSAGE # Begin Project +# PROP AllowPerConfigDependencies 0 # PROP Scc_ProjName "" # PROP Scc_LocalPath "" CPP=cl.exe @@ -46,7 +44,7 @@ RSC=rc.exe # PROP Target_Dir "server" # ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /I "..\..\..\\" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /FD /c # SUBTRACT BASE CPP /YX -# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\..\..\\" /I "..\..\..\..\\" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D ACE_HAS_DLL=0 /D TAO_HAS_DLL=0 /D __ACE_INLINE__=0 /FD /c +# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\..\..\\" /I "..\..\..\..\\" /I "..\..\..\orbsvcs" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D ACE_HAS_DLL=0 /D TAO_HAS_DLL=0 /D __ACE_INLINE__=0 /FD /c # SUBTRACT CPP /YX # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" @@ -55,7 +53,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 aced.lib TAOd.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\tao" /libpath:"..\..\..\ace" -# ADD LINK32 acesd.lib TAOsd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" +# ADD LINK32 acesd.lib TAOsd.lib orbsvcssd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" /libpath:"..\..\..\orbsvcs\orbsvcs" !ELSEIF "$(CFG)" == "Simple Time Server Static - Win32 Release" @@ -73,7 +71,7 @@ LINK32=link.exe # PROP Target_Dir "server" # ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /I "..\..\..\\" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c # SUBTRACT BASE CPP /YX -# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\..\\" /I "..\..\..\..\\" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D TAO_HAS_DLL=0 /D __ACE_INLINE__=0 /D ACE_HAS_DLL=0 /FD /c +# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\..\\" /I "..\..\..\..\\" /I "..\..\..\orbsvcs" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D TAO_HAS_DLL=0 /D __ACE_INLINE__=0 /D ACE_HAS_DLL=0 /FD /c # SUBTRACT CPP /YX # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" @@ -82,7 +80,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 ace.lib TAO.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\tao" /libpath:"..\..\..\ace" -# ADD LINK32 aces.lib TAOs.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" +# ADD LINK32 aces.lib TAOs.lib orbsvcss.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" /libpath:"..\..\..\orbsvcs\orbsvcs" !ENDIF -- cgit v1.2.1