summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2000-07-14 16:42:38 +0000
committernanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2000-07-14 16:42:38 +0000
commit915a2d0f1788483a2dfa347a96e52c5162bf2362 (patch)
treeb5ef44101300acf5037e2d2219ce28d3a2cdbb84
parent9acc9aaaf3d38601f193a939b7aa998aba1b0821 (diff)
downloadATCD-915a2d0f1788483a2dfa347a96e52c5162bf2362.tar.gz
ChangeLogTag:Fri Jul 14 11:38:30 2000 Nanbor Wang <nanbor@cs.wustl.edu>
-rw-r--r--TAO/ChangeLogs/ChangeLog-02a55
-rw-r--r--TAO/orbsvcs/orbsvcs/AV.dsp192
-rw-r--r--TAO/orbsvcs/orbsvcs/CosConcurrency.dsp114
-rw-r--r--TAO/orbsvcs/orbsvcs/CosLifeCycle.dsp142
-rw-r--r--TAO/orbsvcs/orbsvcs/CosNaming.dsp299
-rw-r--r--TAO/orbsvcs/orbsvcs/CosProperty.dsp259
-rw-r--r--TAO/orbsvcs/orbsvcs/CosTime.dsp114
-rw-r--r--TAO/orbsvcs/orbsvcs/DsLogAdmin.dsp114
-rw-r--r--TAO/orbsvcs/orbsvcs/LoadBalancing.dsp110
-rw-r--r--TAO/orbsvcs/orbsvcs/RTEvent.dsp186
-rw-r--r--TAO/orbsvcs/orbsvcs/RTOLDEvent.dsp82
-rw-r--r--TAO/orbsvcs/orbsvcs/RTSched.dsp224
-rw-r--r--TAO/orbsvcs/orbsvcs/RTSchedEvent.dsp82
-rw-r--r--TAO/orbsvcs/orbsvcs/Svc_Utils.dsp212
14 files changed, 2046 insertions, 139 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index 34fac4a84f9..276e7c45259 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,10 +1,31 @@
+Fri Jul 14 11:38:30 2000 Nanbor Wang <nanbor@cs.wustl.edu>
+
+ * orbsvcs/orbsvcs/AV.dsp:
+ * orbsvcs/orbsvcs/CosConcurrency.dsp:
+ * orbsvcs/orbsvcs/CosEvent.dsp:
+ * orbsvcs/orbsvcs/CosLifeCycle.dsp:
+ * orbsvcs/orbsvcs/CosNaming.dsp:
+ * orbsvcs/orbsvcs/CosNotification.dsp:
+ * orbsvcs/orbsvcs/CosProperty.dsp:
+ * orbsvcs/orbsvcs/CosTime.dsp:
+ * orbsvcs/orbsvcs/CosTrading.dsp:
+ * orbsvcs/orbsvcs/DsLogAdmin.dsp:
+ * orbsvcs/orbsvcs/LoadBalancing.dsp:
+ * orbsvcs/orbsvcs/RTEvent.dsp:
+ * orbsvcs/orbsvcs/RTOLDEvent.dsp:
+ * orbsvcs/orbsvcs/RTSched.dsp:
+ * orbsvcs/orbsvcs/RTSchedEvent.dsp:
+ * orbsvcs/orbsvcs/Svc_Utils.dsp: Added MFC configurations. Thanks
+ to Jochen Linkohr <jochen.linkohr@daimlerchrysler.com> for
+ contributing the patches.
+
Fri Jul 14 06:50:57 2000 Irfan Pyarali <irfan@cs.wustl.edu>
* tao/PolicyS.cpp (_dispatch): Replaced with new dispatch code.
* tao/PolicyC.cpp (_unchecked_narrow): Removed call to Smart
Proxy.
-
+
* tao/PortableServerC.h (ThreadPolicyValue and
ImplicitActivationPolicyValue): These two enums should be
outside the minimum POA scope.
@@ -19,7 +40,7 @@ Fri Jul 14 06:50:57 2000 Irfan Pyarali <irfan@cs.wustl.edu>
- PortableServerC.h.diff
* Updated throw specs in the following files:
-
+
- examples/POA/Adapter_Activator/server.cpp
- examples/POA/Forwarding/Servant_Locator.cpp
- examples/POA/Forwarding/Servant_Locator.h
@@ -59,7 +80,7 @@ Thu Jul 13 17:45:07 2000 Jeff Parsons <parsons@cs.wustl.edu>
* tests/IDL_Test/reopen_include2.idl:
New idl files included in reopened_modules.idl, to
- test use cases where modules are reopened in
+ test use cases where modules are reopened in
several files.
* namespace_check.cpp:
@@ -94,9 +115,9 @@ Thu Jul 13 06:29:01 2000 Irfan Pyarali <irfan@cs.wustl.edu>
* tao: Updated Makefile dependencies.
- * orbsvcs/tests/CosEC_Basic/CosEC_Basic.cpp:
- * orbsvcs/IFR_Service/Servant_Factory.h:
- * orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.cpp:
+ * orbsvcs/tests/CosEC_Basic/CosEC_Basic.cpp:
+ * orbsvcs/IFR_Service/Servant_Factory.h:
+ * orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.cpp:
Fixed incorrect includes.
@@ -114,7 +135,7 @@ Thu Jul 13 02:50:26 2000 Irfan Pyarali <irfan@cs.wustl.edu>
* tao/Current.pidl: Made CORBA::Current interface local per CCM
spec. Generated diff files. CurrentS.cpp is no longer needed.
-
+
* tao/Policy.pidl: Marked Current, Policy_Manager, and
Policy_Current to be local.
@@ -124,10 +145,10 @@ Thu Jul 13 02:50:26 2000 Irfan Pyarali <irfan@cs.wustl.edu>
are made local. Generated diff files. POAS.* files are no
longer needed.
- * tao/POA:
+ * tao/POA:
- All interfaces in the PortableServer module were made local.
-
+
- All policy classes now inherit from
TAO_Local_RefCounted_Object instead of RefCountServantBase.
@@ -157,8 +178,8 @@ Thu Jul 13 02:50:26 2000 Irfan Pyarali <irfan@cs.wustl.edu>
instead of "delete this" because of the change in what
TAO_POA_Manager inherits from.
- * tao/LocalObject:
-
+ * tao/LocalObject:
+
- Fixed signature of copy constructor and asssignment operator.
- Added a new class TAO_Local_RefCounted_Object. This class
@@ -167,7 +188,7 @@ Thu Jul 13 02:50:26 2000 Irfan Pyarali <irfan@cs.wustl.edu>
* tao: Changed inheritance from CORBA::LocalObject to
TAO_Buffering_Constraint_Policy. This way we can remove
_add_ref() and _remove_ref() for the following classes:
-
+
- TAO_Buffering_Constraint_Policy
- TAO_Client_Priority_Policy
- TAO_RelativeRoundtripTimeoutPolicy
@@ -185,12 +206,12 @@ Thu Jul 13 02:50:26 2000 Irfan Pyarali <irfan@cs.wustl.edu>
* tao: Made the following local interfaces inherit from
TAO_Local_RefCounted_Object to get the proper reference
counting:
-
+
- TAO_POA_Manager
- TAO_POA_Current
- TAO_Policy_Manager
- - TAO_Policy_Current
-
+ - TAO_Policy_Current
+
* tao/POA_CORBA.h (POA_CORBA): Skeletons for Current,
Policy_Manager, and Policy_Current were removed since these
interfaces are local.
@@ -209,7 +230,7 @@ Thu Jul 13 02:50:26 2000 Irfan Pyarali <irfan@cs.wustl.edu>
PortableServer::Current rather than inherit from
POA_PortableServer::Current.
- * tao/orbconf.h:
+ * tao/orbconf.h:
- Since all locality constraint policies were removed, all the
#defines related to remote and locality constraint policies were
@@ -227,7 +248,7 @@ Thu Jul 13 02:50:26 2000 Irfan Pyarali <irfan@cs.wustl.edu>
TAO_Locality_Constrained_ServantBase anymore and it was removed
from TAO.
- * tao/ORB_Core:
+ * tao/ORB_Core:
- Since TAO_POA is a subclass of the reference, there is no need
to keep a separate POA_var variable.
diff --git a/TAO/orbsvcs/orbsvcs/AV.dsp b/TAO/orbsvcs/orbsvcs/AV.dsp
index f7475cff0f4..1eecbf2cee0 100644
--- a/TAO/orbsvcs/orbsvcs/AV.dsp
+++ b/TAO/orbsvcs/orbsvcs/AV.dsp
@@ -1,24 +1,26 @@
# Microsoft Developer Studio Project File - Name="AV" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
+# ** NICHT BEARBEITEN **
# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-CFG=AV - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
+CFG=AV - Win32 MFC Debug
+!MESSAGE Dies ist kein gültiges Makefile. Zum Erstellen dieses Projekts mit NMAKE
+!MESSAGE verwenden Sie den Befehl "Makefile exportieren" und führen Sie den Befehl
!MESSAGE
!MESSAGE NMAKE /f "AV.mak".
!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE Sie können beim Ausführen von NMAKE eine Konfiguration angeben
+!MESSAGE durch Definieren des Makros CFG in der Befehlszeile. Zum Beispiel:
!MESSAGE
-!MESSAGE NMAKE /f "AV.mak" CFG="AV - Win32 Debug"
+!MESSAGE NMAKE /f "AV.mak" CFG="AV - Win32 MFC Debug"
!MESSAGE
-!MESSAGE Possible choices for configuration are:
+!MESSAGE Für die Konfiguration stehen zur Auswahl:
!MESSAGE
-!MESSAGE "AV - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "AV - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "AV - Win32 Release" (basierend auf "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "AV - Win32 Debug" (basierend auf "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "AV - Win32 MFC Debug" (basierend auf "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "AV - Win32 MFC Release" (basierend auf "Win32 (x86) Dynamic-Link Library")
!MESSAGE
# Begin Project
@@ -83,12 +85,72 @@ 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 /dll /debug /machine:I386 /pdbtype:sept
# ADD LINK32 TAOd.lib aced.lib TAO_CosNamingd.lib TAO_CosTradingd.lib TAO_CosPropertyd.lib /nologo /dll /debug /machine:I386 /out:"..\..\..\bin\TAO_AVd.dll" /pdbtype:sept /libpath:"..\..\tao" /libpath:"..\..\..\ace"
+!ELSEIF "$(CFG)" == "AV - Win32 MFC Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "AV___Win32_MFC_Debug"
+# PROP BASE Intermediate_Dir "AV___Win32_MFC_Debug"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ""
+# PROP Intermediate_Dir "DLL\Debug\AVMFC"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TAO_AV_BUILD_DLL" /D "TAO_ORBSVCS_HAS_Trader" /FD /c
+# SUBTRACT BASE CPP /YX
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TAO_AV_BUILD_DLL" /D "TAO_ORBSVCS_HAS_Trader" /D ACE_HAS_MFC=1 /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# 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 TAOd.lib aced.lib TAO_CosNamingd.lib TAO_CosTradingd.lib TAO_CosPropertyd.lib /nologo /dll /debug /machine:I386 /out:"..\..\..\bin\TAO_AVd.dll" /pdbtype:sept /libpath:"..\..\tao" /libpath:"..\..\..\ace"
+# ADD LINK32 TAOmfcd.lib acemfcd.lib TAO_CosNamingmfcd.lib TAO_CosTradingmfcd.lib TAO_CosPropertymfcd.lib /nologo /dll /debug /machine:I386 /out:"..\..\..\bin\TAO_AVmfcd.dll" /pdbtype:sept /libpath:"..\..\tao" /libpath:"..\..\..\ace"
+
+!ELSEIF "$(CFG)" == "AV - Win32 MFC Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "AV___Win32_MFC_Release"
+# PROP BASE Intermediate_Dir "AV___Win32_MFC_Release"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir ""
+# PROP Intermediate_Dir "DLL\Release\AVMFC"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "../" /I "../../" /I "../../../" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TAO_AV_BUILD_DLL" /D "TAO_ORBSVCS_HAS_Trader" /FD /c
+# SUBTRACT BASE CPP /YX
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /I "../../" /I "../../../" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TAO_AV_BUILD_DLL" /D "TAO_ORBSVCS_HAS_Trader" /D ACE_HAS_MFC=1 /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# 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 TAO.lib TAO_CosNaming.lib TAO_CosTrading.lib TAO_CosProperty.lib /nologo /dll /machine:I386 /out:"..\..\..\bin\TAO_AV.dll" /libpath:"..\..\tao" /libpath:"..\..\..\ace"
+# ADD LINK32 acemfc.lib TAOmfc.lib TAO_CosNamingmfc.lib TAO_CosTradingmfc.lib TAO_CosPropertymfc.lib /nologo /dll /machine:I386 /out:"..\..\..\bin\TAO_AVmfc.dll" /libpath:"..\..\tao" /libpath:"..\..\..\ace"
+
!ENDIF
# Begin Target
# Name "AV - Win32 Release"
# Name "AV - Win32 Debug"
+# Name "AV - Win32 MFC Debug"
+# Name "AV - Win32 MFC Release"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
@@ -366,6 +428,16 @@ BuildCmds= \
$(BuildCmds)
# End Custom Build
+!ELSEIF "$(CFG)" == "AV - Win32 MFC Debug"
+
+# PROP BASE Ignore_Default_Tool 1
+# PROP Ignore_Default_Tool 1
+
+!ELSEIF "$(CFG)" == "AV - Win32 MFC Release"
+
+# PROP BASE Ignore_Default_Tool 1
+# PROP Ignore_Default_Tool 1
+
!ENDIF
# End Source File
@@ -451,6 +523,16 @@ BuildCmds= \
$(BuildCmds)
# End Custom Build
+!ELSEIF "$(CFG)" == "AV - Win32 MFC Debug"
+
+# PROP BASE Ignore_Default_Tool 1
+# PROP Ignore_Default_Tool 1
+
+!ELSEIF "$(CFG)" == "AV - Win32 MFC Release"
+
+# PROP BASE Ignore_Default_Tool 1
+# PROP Ignore_Default_Tool 1
+
!ENDIF
# End Source File
@@ -536,6 +618,16 @@ BuildCmds= \
$(BuildCmds)
# End Custom Build
+!ELSEIF "$(CFG)" == "AV - Win32 MFC Debug"
+
+# PROP BASE Ignore_Default_Tool 1
+# PROP Ignore_Default_Tool 1
+
+!ELSEIF "$(CFG)" == "AV - Win32 MFC Release"
+
+# PROP BASE Ignore_Default_Tool 1
+# PROP Ignore_Default_Tool 1
+
!ENDIF
# End Source File
@@ -614,22 +706,102 @@ SOURCE=.\AV\UDP.i
# Begin Source File
SOURCE=.\AVStreamsS_T.cpp
+
+!IF "$(CFG)" == "AV - Win32 Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "AV - Win32 Debug"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "AV - Win32 MFC Debug"
+
+# PROP BASE Exclude_From_Build 1
# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "AV - Win32 MFC Release"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\AV\Endpoint_Strategy_T.cpp
+
+!IF "$(CFG)" == "AV - Win32 Release"
+
# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "AV - Win32 Debug"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "AV - Win32 MFC Debug"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "AV - Win32 MFC Release"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\AV\Flows_T.cpp
+
+!IF "$(CFG)" == "AV - Win32 Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "AV - Win32 Debug"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "AV - Win32 MFC Debug"
+
+# PROP BASE Exclude_From_Build 1
# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "AV - Win32 MFC Release"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\Null_MediaCtrlS_T.cpp
+
+!IF "$(CFG)" == "AV - Win32 Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "AV - Win32 Debug"
+
# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "AV - Win32 MFC Debug"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "AV - Win32 MFC Release"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ENDIF
+
# End Source File
# End Group
# End Target
diff --git a/TAO/orbsvcs/orbsvcs/CosConcurrency.dsp b/TAO/orbsvcs/orbsvcs/CosConcurrency.dsp
index 0835c15e8bd..2ae7de51d6b 100644
--- a/TAO/orbsvcs/orbsvcs/CosConcurrency.dsp
+++ b/TAO/orbsvcs/orbsvcs/CosConcurrency.dsp
@@ -1,24 +1,26 @@
# Microsoft Developer Studio Project File - Name="CosConcurrency" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
+# ** NICHT BEARBEITEN **
# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-CFG=CosConcurrency - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
+CFG=CosConcurrency - Win32 MFC Debug
+!MESSAGE Dies ist kein gültiges Makefile. Zum Erstellen dieses Projekts mit NMAKE
+!MESSAGE verwenden Sie den Befehl "Makefile exportieren" und führen Sie den Befehl
!MESSAGE
!MESSAGE NMAKE /f "CosConcurrency.mak".
!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE Sie können beim Ausführen von NMAKE eine Konfiguration angeben
+!MESSAGE durch Definieren des Makros CFG in der Befehlszeile. Zum Beispiel:
!MESSAGE
-!MESSAGE NMAKE /f "CosConcurrency.mak" CFG="CosConcurrency - Win32 Debug"
+!MESSAGE NMAKE /f "CosConcurrency.mak" CFG="CosConcurrency - Win32 MFC Debug"
!MESSAGE
-!MESSAGE Possible choices for configuration are:
+!MESSAGE Für die Konfiguration stehen zur Auswahl:
!MESSAGE
-!MESSAGE "CosConcurrency - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "CosConcurrency - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "CosConcurrency - Win32 Release" (basierend auf "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "CosConcurrency - Win32 Debug" (basierend auf "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "CosConcurrency - Win32 MFC Debug" (basierend auf "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "CosConcurrency - Win32 MFC Release" (basierend auf "Win32 (x86) Dynamic-Link Library")
!MESSAGE
# Begin Project
@@ -84,12 +86,74 @@ LINK32=link.exe
# ADD LINK32 TAOd.lib aced.lib /nologo /dll /debug /machine:I386 /out:"..\..\..\bin\TAO_CosConcurrencyd.dll" /pdbtype:sept /libpath:"..\..\tao" /libpath:"..\..\..\ace"
# SUBTRACT LINK32 /profile
+!ELSEIF "$(CFG)" == "CosConcurrency - Win32 MFC Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "CosConcurrency___Win32_MFC_Debug"
+# PROP BASE Intermediate_Dir "CosConcurrency___Win32_MFC_Debug"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ""
+# PROP Intermediate_Dir "DLL\Debug\CosConcurrencyMFC"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "_DEBUG" /D "_MBCS" /D "_USRDLL" /D "TAO_ORBSVCS_HAS_NAMING" /D "WIN32" /D "_WINDOWS" /D "TAO_CONCURRENCY_BUILD_DLL" /FD /c
+# SUBTRACT BASE CPP /YX
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "_DEBUG" /D "_MBCS" /D "_USRDLL" /D "TAO_ORBSVCS_HAS_NAMING" /D "WIN32" /D "_WINDOWS" /D "TAO_CONCURRENCY_BUILD_DLL" /D ACE_HAS_MFC=1 /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# 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 TAOd.lib aced.lib /nologo /dll /debug /machine:I386 /out:"..\..\..\bin\TAO_CosConcurrencyd.dll" /pdbtype:sept /libpath:"..\..\tao" /libpath:"..\..\..\ace"
+# SUBTRACT BASE LINK32 /profile
+# ADD LINK32 TAOmfcd.lib acemfcd.lib /nologo /dll /debug /machine:I386 /out:"..\..\..\bin\TAO_CosConcurrencymfcd.dll" /pdbtype:sept /libpath:"..\..\tao" /libpath:"..\..\..\ace"
+# SUBTRACT LINK32 /profile
+
+!ELSEIF "$(CFG)" == "CosConcurrency - Win32 MFC Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "CosConcurrency___Win32_MFC_Release"
+# PROP BASE Intermediate_Dir "CosConcurrency___Win32_MFC_Release"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir ""
+# PROP Intermediate_Dir "DLL\Release\CosConcurrencyMFC"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "../" /I "../../" /I "../../../" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "TAO_CONCURRENCY_BUILD_DLL" /FD /c
+# SUBTRACT BASE CPP /YX
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /I "../../" /I "../../../" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "TAO_CONCURRENCY_BUILD_DLL" /D ACE_HAS_MFC=1 /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# 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 TAO.lib /nologo /dll /machine:I386 /out:"..\..\..\bin\TAO_CosConcurrency.dll" /libpath:"..\..\tao" /libpath:"..\..\..\ace"
+# ADD LINK32 acemfc.lib TAOmfc.lib /nologo /dll /machine:I386 /out:"..\..\..\bin\TAO_CosConcurrencymfc.dll" /libpath:"..\..\tao" /libpath:"..\..\..\ace"
+
!ENDIF
# Begin Target
# Name "CosConcurrency - Win32 Release"
# Name "CosConcurrency - Win32 Debug"
+# Name "CosConcurrency - Win32 MFC Debug"
+# Name "CosConcurrency - Win32 MFC Release"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
@@ -239,6 +303,16 @@ BuildCmds= \
$(BuildCmds)
# End Custom Build
+!ELSEIF "$(CFG)" == "CosConcurrency - Win32 MFC Debug"
+
+# PROP BASE Ignore_Default_Tool 1
+# PROP Ignore_Default_Tool 1
+
+!ELSEIF "$(CFG)" == "CosConcurrency - Win32 MFC Release"
+
+# PROP BASE Ignore_Default_Tool 1
+# PROP Ignore_Default_Tool 1
+
!ENDIF
# End Source File
@@ -265,7 +339,27 @@ SOURCE=.\CosConcurrencyControlS_T.i
# Begin Source File
SOURCE=.\CosConcurrencyControlS_T.cpp
+
+!IF "$(CFG)" == "CosConcurrency - Win32 Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "CosConcurrency - Win32 Debug"
+
# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "CosConcurrency - Win32 MFC Debug"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "CosConcurrency - Win32 MFC Release"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ENDIF
+
# End Source File
# End Group
# End Target
diff --git a/TAO/orbsvcs/orbsvcs/CosLifeCycle.dsp b/TAO/orbsvcs/orbsvcs/CosLifeCycle.dsp
index 43443cfea8e..1e674398ad2 100644
--- a/TAO/orbsvcs/orbsvcs/CosLifeCycle.dsp
+++ b/TAO/orbsvcs/orbsvcs/CosLifeCycle.dsp
@@ -1,24 +1,26 @@
# Microsoft Developer Studio Project File - Name="CosLifeCycle" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
+# ** NICHT BEARBEITEN **
# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-CFG=CosLifeCycle - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
+CFG=CosLifeCycle - Win32 MFC Debug
+!MESSAGE Dies ist kein gültiges Makefile. Zum Erstellen dieses Projekts mit NMAKE
+!MESSAGE verwenden Sie den Befehl "Makefile exportieren" und führen Sie den Befehl
!MESSAGE
!MESSAGE NMAKE /f "CosLifeCycle.mak".
!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE Sie können beim Ausführen von NMAKE eine Konfiguration angeben
+!MESSAGE durch Definieren des Makros CFG in der Befehlszeile. Zum Beispiel:
!MESSAGE
-!MESSAGE NMAKE /f "CosLifeCycle.mak" CFG="CosLifeCycle - Win32 Debug"
+!MESSAGE NMAKE /f "CosLifeCycle.mak" CFG="CosLifeCycle - Win32 MFC Debug"
!MESSAGE
-!MESSAGE Possible choices for configuration are:
+!MESSAGE Für die Konfiguration stehen zur Auswahl:
!MESSAGE
-!MESSAGE "CosLifeCycle - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "CosLifeCycle - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "CosLifeCycle - Win32 Release" (basierend auf "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "CosLifeCycle - Win32 Debug" (basierend auf "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "CosLifeCycle - Win32 MFC Debug" (basierend auf "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "CosLifeCycle - Win32 MFC Release" (basierend auf "Win32 (x86) Dynamic-Link Library")
!MESSAGE
# Begin Project
@@ -83,12 +85,72 @@ 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 /dll /debug /machine:I386 /pdbtype:sept
# ADD LINK32 TAOd.lib aced.lib TAO_CosNamingd.lib /nologo /dll /debug /machine:I386 /out:"..\..\..\bin\TAO_CosLifeCycled.dll" /pdbtype:sept /libpath:"..\..\tao" /libpath:"..\..\..\ace"
+!ELSEIF "$(CFG)" == "CosLifeCycle - Win32 MFC Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "CosLifeCycle___Win32_MFC_Debug"
+# PROP BASE Intermediate_Dir "CosLifeCycle___Win32_MFC_Debug"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ""
+# PROP Intermediate_Dir "DLL\Debug\LifeCycleMFC"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "TAO_LIFECYCLE_BUILD_DLL" /D "TAO_ORBSVCS_HAS_LIFECYCLE" /FD /c
+# SUBTRACT BASE CPP /YX
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "TAO_LIFECYCLE_BUILD_DLL" /D "TAO_ORBSVCS_HAS_LIFECYCLE" /D ACE_HAS_MFC=1 /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# 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 TAOd.lib aced.lib TAO_CosNamingd.lib /nologo /dll /debug /machine:I386 /out:"..\..\..\bin\TAO_CosLifeCycled.dll" /pdbtype:sept /libpath:"..\..\tao" /libpath:"..\..\..\ace"
+# ADD LINK32 TAOmfcd.lib acemfcd.lib TAO_CosNamingmfcd.lib /nologo /dll /debug /machine:I386 /out:"..\..\..\bin\TAO_CosLifeCyclemfcd.dll" /pdbtype:sept /libpath:"..\..\tao" /libpath:"..\..\..\ace"
+
+!ELSEIF "$(CFG)" == "CosLifeCycle - Win32 MFC Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "CosLifeCycle___Win32_MFC_Release"
+# PROP BASE Intermediate_Dir "CosLifeCycle___Win32_MFC_Release"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir ""
+# PROP Intermediate_Dir "DLL\Release\LifeCycleMFC"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "../" /I "../../" /I "../../../" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "TAO_LIFECYCLE_BUILD_DLL" /D "TAO_ORBSVCS_HAS_LIFECYCLE" /FD /c
+# SUBTRACT BASE CPP /YX
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /I "../../" /I "../../../" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "TAO_LIFECYCLE_BUILD_DLL" /D "TAO_ORBSVCS_HAS_LIFECYCLE" /D ACE_HAS_MFC=1 /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# 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 TAO.lib TAO_CosNaming.lib /nologo /dll /machine:I386 /out:"..\..\..\bin\TAO_CosLifeCycle.dll" /libpath:"..\..\tao" /libpath:"..\..\..\ace"
+# ADD LINK32 acemfc.lib TAOmfc.lib TAO_CosNamingmfc.lib /nologo /dll /machine:I386 /out:"..\..\..\bin\TAO_CosLifeCyclemfc.dll" /libpath:"..\..\tao" /libpath:"..\..\..\ace"
+
!ENDIF
# Begin Target
# Name "CosLifeCycle - Win32 Release"
# Name "CosLifeCycle - Win32 Debug"
+# Name "CosLifeCycle - Win32 MFC Debug"
+# Name "CosLifeCycle - Win32 MFC Release"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
@@ -250,6 +312,16 @@ BuildCmds= \
$(BuildCmds)
# End Custom Build
+!ELSEIF "$(CFG)" == "CosLifeCycle - Win32 MFC Debug"
+
+# PROP BASE Ignore_Default_Tool 1
+# PROP Ignore_Default_Tool 1
+
+!ELSEIF "$(CFG)" == "CosLifeCycle - Win32 MFC Release"
+
+# PROP BASE Ignore_Default_Tool 1
+# PROP Ignore_Default_Tool 1
+
!ENDIF
# End Source File
@@ -335,6 +407,16 @@ BuildCmds= \
$(BuildCmds)
# End Custom Build
+!ELSEIF "$(CFG)" == "CosLifeCycle - Win32 MFC Debug"
+
+# PROP BASE Ignore_Default_Tool 1
+# PROP Ignore_Default_Tool 1
+
+!ELSEIF "$(CFG)" == "CosLifeCycle - Win32 MFC Release"
+
+# PROP BASE Ignore_Default_Tool 1
+# PROP Ignore_Default_Tool 1
+
!ENDIF
# End Source File
@@ -345,12 +427,52 @@ BuildCmds= \
# Begin Source File
SOURCE=.\CosLifeCycleS_T.cpp
+
+!IF "$(CFG)" == "CosLifeCycle - Win32 Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "CosLifeCycle - Win32 Debug"
+
# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "CosLifeCycle - Win32 MFC Debug"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "CosLifeCycle - Win32 MFC Release"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\LifeCycleServiceS_T.cpp
+
+!IF "$(CFG)" == "CosLifeCycle - Win32 Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "CosLifeCycle - Win32 Debug"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "CosLifeCycle - Win32 MFC Debug"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "CosLifeCycle - Win32 MFC Release"
+
+# PROP BASE Exclude_From_Build 1
# PROP Exclude_From_Build 1
+
+!ENDIF
+
# End Source File
# End Group
# End Target
diff --git a/TAO/orbsvcs/orbsvcs/CosNaming.dsp b/TAO/orbsvcs/orbsvcs/CosNaming.dsp
index 84565e5c7f9..c3171a9e14f 100644
--- a/TAO/orbsvcs/orbsvcs/CosNaming.dsp
+++ b/TAO/orbsvcs/orbsvcs/CosNaming.dsp
@@ -1,24 +1,26 @@
# Microsoft Developer Studio Project File - Name="CosNaming" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
+# ** NICHT BEARBEITEN **
# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-CFG=CosNaming - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
+CFG=CosNaming - Win32 mfc Debug
+!MESSAGE Dies ist kein gültiges Makefile. Zum Erstellen dieses Projekts mit NMAKE
+!MESSAGE verwenden Sie den Befehl "Makefile exportieren" und führen Sie den Befehl
!MESSAGE
!MESSAGE NMAKE /f "CosNaming.mak".
!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE Sie können beim Ausführen von NMAKE eine Konfiguration angeben
+!MESSAGE durch Definieren des Makros CFG in der Befehlszeile. Zum Beispiel:
!MESSAGE
-!MESSAGE NMAKE /f "CosNaming.mak" CFG="CosNaming - Win32 Debug"
+!MESSAGE NMAKE /f "CosNaming.mak" CFG="CosNaming - Win32 mfc Debug"
!MESSAGE
-!MESSAGE Possible choices for configuration are:
+!MESSAGE Für die Konfiguration stehen zur Auswahl:
!MESSAGE
-!MESSAGE "CosNaming - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "CosNaming - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "CosNaming - Win32 Release" (basierend auf "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "CosNaming - Win32 Debug" (basierend auf "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "CosNaming - Win32 mfc Release" (basierend auf "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "CosNaming - Win32 mfc Debug" (basierend auf "Win32 (x86) Dynamic-Link Library")
!MESSAGE
# Begin Project
@@ -84,54 +86,246 @@ LINK32=link.exe
# ADD LINK32 TAOd.lib aced.lib TAO_Svc_Utilsd.lib /nologo /dll /debug /machine:I386 /out:"..\..\..\bin\TAO_CosNamingd.dll" /pdbtype:sept /libpath:"..\..\tao" /libpath:"..\..\..\ace"
# SUBTRACT LINK32 /profile
+!ELSEIF "$(CFG)" == "CosNaming - Win32 mfc Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "CosNaming___Win32_mfc_Release"
+# PROP BASE Intermediate_Dir "CosNaming___Win32_mfc_Release"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir ""
+# PROP Intermediate_Dir "DLL\Release\CosNamingMFC"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "../" /I "../../" /I "../../../" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "TAO_NAMING_BUILD_DLL" /FD /c
+# SUBTRACT BASE CPP /YX
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /I "../../" /I "../../../" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "TAO_NAMING_BUILD_DLL" /D ACE_HAS_MFC=1 /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# 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 TAO.lib TAO_Svc_Utils.lib /nologo /dll /machine:I386 /out:"..\..\..\bin\TAO_CosNaming.dll" /libpath:"..\..\tao" /libpath:"..\..\..\ace"
+# ADD LINK32 acemfc.lib TAOmfc.lib TAO_Svc_Utilsmfc.lib /nologo /dll /machine:I386 /out:"..\..\..\bin\TAO_CosNamingmfc.dll" /libpath:"..\..\tao" /libpath:"..\..\..\ace"
+
+!ELSEIF "$(CFG)" == "CosNaming - Win32 mfc Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "CosNaming___Win32_mfc_Debug"
+# PROP BASE Intermediate_Dir "CosNaming___Win32_mfc_Debug"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ""
+# PROP Intermediate_Dir "DLL\Debug\CosNaming"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TAO_NAMING_BUILD_DLL" /D "TAO_ORBSVCS_HAS_NAMING" /FD /c
+# SUBTRACT BASE CPP /YX
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TAO_NAMING_BUILD_DLL" /D "TAO_ORBSVCS_HAS_NAMING" /D ACE_HAS_MFC=1 /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# 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 TAOd.lib aced.lib TAO_Svc_Utilsd.lib /nologo /dll /debug /machine:I386 /out:"..\..\..\bin\TAO_CosNamingd.dll" /pdbtype:sept /libpath:"..\..\tao" /libpath:"..\..\..\ace"
+# SUBTRACT BASE LINK32 /profile
+# ADD LINK32 TAOmfcd.lib acemfcd.lib TAO_Svc_Utilsmfcd.lib /nologo /dll /debug /machine:I386 /out:"..\..\..\bin\TAO_CosNamingmfcd.dll" /pdbtype:sept /libpath:"..\..\tao" /libpath:"..\..\..\ace"
+# SUBTRACT LINK32 /profile
+
!ENDIF
# Begin Target
# Name "CosNaming - Win32 Release"
# Name "CosNaming - Win32 Debug"
+# Name "CosNaming - Win32 mfc Release"
+# Name "CosNaming - Win32 mfc Debug"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
# Begin Source File
SOURCE=.\CosNamingC.cpp
+
+!IF "$(CFG)" == "CosNaming - Win32 Release"
+
+!ELSEIF "$(CFG)" == "CosNaming - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "CosNaming - Win32 mfc Release"
+
+!ELSEIF "$(CFG)" == "CosNaming - Win32 mfc Debug"
+
+# ADD CPP /D ACE_HAS_MFC=1
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\CosNamingS.cpp
+
+!IF "$(CFG)" == "CosNaming - Win32 Release"
+
+!ELSEIF "$(CFG)" == "CosNaming - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "CosNaming - Win32 mfc Release"
+
+!ELSEIF "$(CFG)" == "CosNaming - Win32 mfc Debug"
+
+# ADD CPP /D ACE_HAS_MFC=1
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\Naming\Entries.cpp
+
+!IF "$(CFG)" == "CosNaming - Win32 Release"
+
+!ELSEIF "$(CFG)" == "CosNaming - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "CosNaming - Win32 mfc Release"
+
+!ELSEIF "$(CFG)" == "CosNaming - Win32 mfc Debug"
+
+# ADD CPP /D ACE_HAS_MFC=1
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\Naming\Hash_Naming_Context.cpp
+
+!IF "$(CFG)" == "CosNaming - Win32 Release"
+
+!ELSEIF "$(CFG)" == "CosNaming - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "CosNaming - Win32 mfc Release"
+
+!ELSEIF "$(CFG)" == "CosNaming - Win32 mfc Debug"
+
+# ADD CPP /D ACE_HAS_MFC=1
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\Naming\Naming_Context_Interface.cpp
+
+!IF "$(CFG)" == "CosNaming - Win32 Release"
+
+!ELSEIF "$(CFG)" == "CosNaming - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "CosNaming - Win32 mfc Release"
+
+!ELSEIF "$(CFG)" == "CosNaming - Win32 mfc Debug"
+
+# ADD CPP /D ACE_HAS_MFC=1
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\Naming\Naming_Utils.cpp
+
+!IF "$(CFG)" == "CosNaming - Win32 Release"
+
+!ELSEIF "$(CFG)" == "CosNaming - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "CosNaming - Win32 mfc Release"
+
+!ELSEIF "$(CFG)" == "CosNaming - Win32 mfc Debug"
+
+# ADD CPP /D ACE_HAS_MFC=1
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\Naming\Persistent_Context_Index.cpp
+
+!IF "$(CFG)" == "CosNaming - Win32 Release"
+
+!ELSEIF "$(CFG)" == "CosNaming - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "CosNaming - Win32 mfc Release"
+
+!ELSEIF "$(CFG)" == "CosNaming - Win32 mfc Debug"
+
+# ADD CPP /D ACE_HAS_MFC=1
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\Naming\Persistent_Entries.cpp
+
+!IF "$(CFG)" == "CosNaming - Win32 Release"
+
+!ELSEIF "$(CFG)" == "CosNaming - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "CosNaming - Win32 mfc Release"
+
+!ELSEIF "$(CFG)" == "CosNaming - Win32 mfc Debug"
+
+# ADD CPP /D ACE_HAS_MFC=1
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\Naming\Persistent_Naming_Context.cpp
+
+!IF "$(CFG)" == "CosNaming - Win32 Release"
+
+!ELSEIF "$(CFG)" == "CosNaming - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "CosNaming - Win32 mfc Release"
+
+!ELSEIF "$(CFG)" == "CosNaming - Win32 mfc Debug"
+
+# ADD CPP /D ACE_HAS_MFC=1
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\Naming\Transient_Naming_Context.cpp
+
+!IF "$(CFG)" == "CosNaming - Win32 Release"
+
+!ELSEIF "$(CFG)" == "CosNaming - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "CosNaming - Win32 mfc Release"
+
+!ELSEIF "$(CFG)" == "CosNaming - Win32 mfc Debug"
+
+# ADD CPP /D ACE_HAS_MFC=1
+
+!ENDIF
+
# End Source File
# End Group
# Begin Group "Header Files"
@@ -267,6 +461,51 @@ BuildCmds= \
$(BuildCmds)
# End Custom Build
+!ELSEIF "$(CFG)" == "CosNaming - Win32 mfc Release"
+
+# PROP BASE Ignore_Default_Tool 1
+# PROP Ignore_Default_Tool 1
+USERDEP__COSNA="..\..\..\bin\Release\tao_idl.exe"
+# Begin Custom Build - Invoking TAO_IDL Compiler on $(InputName)
+InputPath=.\CosNaming.idl
+InputName=CosNaming
+
+BuildCmds= \
+ ..\..\..\bin\Release\tao_idl -Ge 1 -I../../ -I../../tao -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_Naming_Export -Wb,export_include=Naming\naming_export.h $(InputName).idl
+
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "CosNaming - Win32 mfc Debug"
+
+# PROP BASE Ignore_Default_Tool 1
+# PROP Ignore_Default_Tool 1
+
!ENDIF
# End Source File
@@ -289,12 +528,52 @@ SOURCE=.\CosNamingS.i
# Begin Source File
SOURCE=.\Naming\Bindings_Iterator_T.cpp
+
+!IF "$(CFG)" == "CosNaming - Win32 Release"
+
# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "CosNaming - Win32 Debug"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "CosNaming - Win32 mfc Release"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "CosNaming - Win32 mfc Debug"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\CosNamingS_T.cpp
+
+!IF "$(CFG)" == "CosNaming - Win32 Release"
+
# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "CosNaming - Win32 Debug"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "CosNaming - Win32 mfc Release"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "CosNaming - Win32 mfc Debug"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ENDIF
+
# End Source File
# End Group
# End Target
diff --git a/TAO/orbsvcs/orbsvcs/CosProperty.dsp b/TAO/orbsvcs/orbsvcs/CosProperty.dsp
index 8e1d8f861ac..0ba9d132229 100644
--- a/TAO/orbsvcs/orbsvcs/CosProperty.dsp
+++ b/TAO/orbsvcs/orbsvcs/CosProperty.dsp
@@ -1,24 +1,26 @@
# Microsoft Developer Studio Project File - Name="CosProperty" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
+# ** NICHT BEARBEITEN **
# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-CFG=CosProperty - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
+CFG=CosProperty - Win32 MFC Debug
+!MESSAGE Dies ist kein gültiges Makefile. Zum Erstellen dieses Projekts mit NMAKE
+!MESSAGE verwenden Sie den Befehl "Makefile exportieren" und führen Sie den Befehl
!MESSAGE
!MESSAGE NMAKE /f "CosProperty.mak".
!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE Sie können beim Ausführen von NMAKE eine Konfiguration angeben
+!MESSAGE durch Definieren des Makros CFG in der Befehlszeile. Zum Beispiel:
!MESSAGE
-!MESSAGE NMAKE /f "CosProperty.mak" CFG="CosProperty - Win32 Debug"
+!MESSAGE NMAKE /f "CosProperty.mak" CFG="CosProperty - Win32 MFC Debug"
!MESSAGE
-!MESSAGE Possible choices for configuration are:
+!MESSAGE Für die Konfiguration stehen zur Auswahl:
!MESSAGE
-!MESSAGE "CosProperty - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "CosProperty - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "CosProperty - Win32 Release" (basierend auf "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "CosProperty - Win32 Debug" (basierend auf "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "CosProperty - Win32 MFC Debug" (basierend auf "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "CosProperty - Win32 MFC Release" (basierend auf "Win32 (x86) Dynamic-Link Library")
!MESSAGE
# Begin Project
@@ -84,12 +86,74 @@ LINK32=link.exe
# ADD LINK32 TAOd.lib aced.lib /nologo /dll /debug /machine:I386 /out:"..\..\..\bin\TAO_CosPropertyd.dll" /pdbtype:sept /libpath:"..\..\tao" /libpath:"..\..\..\ace"
# SUBTRACT LINK32 /profile
+!ELSEIF "$(CFG)" == "CosProperty - Win32 MFC Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "CosProperty___Win32_MFC_Debug"
+# PROP BASE Intermediate_Dir "CosProperty___Win32_MFC_Debug"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ""
+# PROP Intermediate_Dir "DLL\Debug\CosPropertyMFC"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "_DEBUG" /D "_MBCS" /D "_USRDLL" /D "TAO_ORBSVCS_HAS_NAMING" /D "WIN32" /D "_WINDOWS" /D "TAO_PROPERTY_BUILD_DLL" /FD /c
+# SUBTRACT BASE CPP /YX
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "_DEBUG" /D "_MBCS" /D "_USRDLL" /D "TAO_ORBSVCS_HAS_NAMING" /D "WIN32" /D "_WINDOWS" /D "TAO_PROPERTY_BUILD_DLL" /D ACE_HAS_MFC=1 /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# 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 TAOd.lib aced.lib /nologo /dll /debug /machine:I386 /out:"..\..\..\bin\TAO_CosPropertyd.dll" /pdbtype:sept /libpath:"..\..\tao" /libpath:"..\..\..\ace"
+# SUBTRACT BASE LINK32 /profile
+# ADD LINK32 TAOmfcd.lib acemfcd.lib /nologo /dll /debug /machine:I386 /out:"..\..\..\bin\TAO_CosPropertymfcd.dll" /pdbtype:sept /libpath:"..\..\tao" /libpath:"..\..\..\ace"
+# SUBTRACT LINK32 /profile
+
+!ELSEIF "$(CFG)" == "CosProperty - Win32 MFC Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "CosProperty___Win32_MFC_Release"
+# PROP BASE Intermediate_Dir "CosProperty___Win32_MFC_Release"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir ""
+# PROP Intermediate_Dir "DLL\Release\CosPropertyMFC"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "../" /I "../../" /I "../../../" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "TAO_PROPERTY_BUILD_DLL" /FD /c
+# SUBTRACT BASE CPP /YX
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /I "../../" /I "../../../" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "TAO_PROPERTY_BUILD_DLL" /D ACE_HAS_MFC=1 /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# 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 TAO.lib /nologo /dll /machine:I386 /out:"..\..\..\bin\TAO_CosProperty.dll" /libpath:"..\..\tao" /libpath:"..\..\..\ace"
+# ADD LINK32 acemfc.lib TAOmfc.lib /nologo /dll /machine:I386 /out:"..\..\..\bin\TAO_CosPropertymfc.dll" /libpath:"..\..\tao" /libpath:"..\..\..\ace"
+
!ENDIF
# Begin Target
# Name "CosProperty - Win32 Release"
# Name "CosProperty - Win32 Debug"
+# Name "CosProperty - Win32 MFC Debug"
+# Name "CosProperty - Win32 MFC Release"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
@@ -112,22 +176,97 @@ SOURCE=.\CosPropertyServiceS.cpp
# Begin Source File
SOURCE=.\Property\CosPropertyService_i.h
+
+!IF "$(CFG)" == "CosProperty - Win32 Release"
+
+!ELSEIF "$(CFG)" == "CosProperty - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "CosProperty - Win32 MFC Debug"
+
+# PROP Ignore_Default_Tool 1
+
+!ELSEIF "$(CFG)" == "CosProperty - Win32 MFC Release"
+
+# PROP Ignore_Default_Tool 1
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\CosPropertyServiceC.h
+
+!IF "$(CFG)" == "CosProperty - Win32 Release"
+
+!ELSEIF "$(CFG)" == "CosProperty - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "CosProperty - Win32 MFC Debug"
+
+# PROP Ignore_Default_Tool 1
+
+!ELSEIF "$(CFG)" == "CosProperty - Win32 MFC Release"
+
+# PROP Ignore_Default_Tool 1
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\CosPropertyServiceS.h
+
+!IF "$(CFG)" == "CosProperty - Win32 Release"
+
+!ELSEIF "$(CFG)" == "CosProperty - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "CosProperty - Win32 MFC Debug"
+
+# PROP Ignore_Default_Tool 1
+
+!ELSEIF "$(CFG)" == "CosProperty - Win32 MFC Release"
+
+# PROP Ignore_Default_Tool 1
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\CosPropertyServiceS_T.h
+
+!IF "$(CFG)" == "CosProperty - Win32 Release"
+
+!ELSEIF "$(CFG)" == "CosProperty - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "CosProperty - Win32 MFC Debug"
+
+# PROP Ignore_Default_Tool 1
+
+!ELSEIF "$(CFG)" == "CosProperty - Win32 MFC Release"
+
+# PROP Ignore_Default_Tool 1
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\Property\property_export.h
+
+!IF "$(CFG)" == "CosProperty - Win32 Release"
+
+!ELSEIF "$(CFG)" == "CosProperty - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "CosProperty - Win32 MFC Debug"
+
+# PROP Ignore_Default_Tool 1
+
+!ELSEIF "$(CFG)" == "CosProperty - Win32 MFC Release"
+
+# PROP Ignore_Default_Tool 1
+
+!ENDIF
+
# End Source File
# End Group
# Begin Group "IDL Files"
@@ -215,6 +354,86 @@ BuildCmds= \
$(BuildCmds)
# End Custom Build
+!ELSEIF "$(CFG)" == "CosProperty - Win32 MFC Debug"
+
+# PROP BASE Ignore_Default_Tool 1
+# PROP Ignore_Default_Tool 1
+USERDEP__COSPR="..\..\..\bin\tao_idl.exe"
+# Begin Custom Build - Invoking TAO_IDL Compiler on $(InputName)
+InputPath=.\CosPropertyService.idl
+InputName=CosPropertyService
+
+BuildCmds= \
+ ..\..\..\bin\tao_idl -Ge 1 -I../../ -I../../tao -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_Property_Export -Wb,export_include=Property\property_export.h $(InputName).idl
+
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "CosProperty - Win32 MFC Release"
+
+# PROP BASE Ignore_Default_Tool 1
+# PROP Ignore_Default_Tool 1
+USERDEP__COSPR="..\..\..\bin\Release\tao_idl.exe"
+# Begin Custom Build - Invoking TAO_IDL Compiler on $(InputName)
+InputPath=.\CosPropertyService.idl
+InputName=CosPropertyService
+
+BuildCmds= \
+ ..\..\..\bin\Release\tao_idl -Ge 1 -I../../ -I../../tao -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_Property_Export -Wb,export_include=Property\property_export.h $(InputName).idl
+
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+# End Custom Build
+
!ENDIF
# End Source File
@@ -241,7 +460,27 @@ SOURCE=.\CosPropertyServiceS_T.i
# Begin Source File
SOURCE=.\CosPropertyServiceS_T.cpp
+
+!IF "$(CFG)" == "CosProperty - Win32 Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "CosProperty - Win32 Debug"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "CosProperty - Win32 MFC Debug"
+
+# PROP BASE Exclude_From_Build 1
# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "CosProperty - Win32 MFC Release"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ENDIF
+
# End Source File
# End Group
# End Target
diff --git a/TAO/orbsvcs/orbsvcs/CosTime.dsp b/TAO/orbsvcs/orbsvcs/CosTime.dsp
index bbe7dcfbd4e..da44fad338b 100644
--- a/TAO/orbsvcs/orbsvcs/CosTime.dsp
+++ b/TAO/orbsvcs/orbsvcs/CosTime.dsp
@@ -1,24 +1,26 @@
# Microsoft Developer Studio Project File - Name="CosTime" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
+# ** NICHT BEARBEITEN **
# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-CFG=CosTime - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
+CFG=CosTime - Win32 MFC Debug
+!MESSAGE Dies ist kein gültiges Makefile. Zum Erstellen dieses Projekts mit NMAKE
+!MESSAGE verwenden Sie den Befehl "Makefile exportieren" und führen Sie den Befehl
!MESSAGE
!MESSAGE NMAKE /f "CosTime.mak".
!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE Sie können beim Ausführen von NMAKE eine Konfiguration angeben
+!MESSAGE durch Definieren des Makros CFG in der Befehlszeile. Zum Beispiel:
!MESSAGE
-!MESSAGE NMAKE /f "CosTime.mak" CFG="CosTime - Win32 Debug"
+!MESSAGE NMAKE /f "CosTime.mak" CFG="CosTime - Win32 MFC Debug"
!MESSAGE
-!MESSAGE Possible choices for configuration are:
+!MESSAGE Für die Konfiguration stehen zur Auswahl:
!MESSAGE
-!MESSAGE "CosTime - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "CosTime - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "CosTime - Win32 Release" (basierend auf "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "CosTime - Win32 Debug" (basierend auf "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "CosTime - Win32 MFC Debug" (basierend auf "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "CosTime - Win32 MFC Release" (basierend auf "Win32 (x86) Dynamic-Link Library")
!MESSAGE
# Begin Project
@@ -84,12 +86,74 @@ LINK32=link.exe
# ADD LINK32 TAOd.lib aced.lib TAO_CosNamingd.lib /nologo /dll /debug /machine:I386 /out:"..\..\..\bin\TAO_CosTimed.dll" /pdbtype:sept /libpath:"..\..\tao" /libpath:"..\..\..\ace"
# SUBTRACT LINK32 /profile
+!ELSEIF "$(CFG)" == "CosTime - Win32 MFC Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "CosTime___Win32_MFC_Debug"
+# PROP BASE Intermediate_Dir "CosTime___Win32_MFC_Debug"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ""
+# PROP Intermediate_Dir "DLL\Debug\CosTimeMFC"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "TAO_TIME_BUILD_DLL" /FD /c
+# SUBTRACT BASE CPP /YX
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "TAO_TIME_BUILD_DLL" /D ACE_HAS_MFC=1 /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# 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 TAOd.lib aced.lib TAO_CosNamingd.lib /nologo /dll /debug /machine:I386 /out:"..\..\..\bin\TAO_CosTimed.dll" /pdbtype:sept /libpath:"..\..\tao" /libpath:"..\..\..\ace"
+# SUBTRACT BASE LINK32 /profile
+# ADD LINK32 TAOmfcd.lib acemfcd.lib TAO_CosNamingmfcd.lib /nologo /dll /debug /machine:I386 /out:"..\..\..\bin\TAO_CosTimemfcd.dll" /pdbtype:sept /libpath:"..\..\tao" /libpath:"..\..\..\ace"
+# SUBTRACT LINK32 /profile
+
+!ELSEIF "$(CFG)" == "CosTime - Win32 MFC Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "CosTime___Win32_MFC_Release"
+# PROP BASE Intermediate_Dir "CosTime___Win32_MFC_Release"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir ""
+# PROP Intermediate_Dir "DLL\Release\CosTimeMFC"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "../" /I "../../" /I "../../../" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "TAO_TIME_BUILD_DLL" /FD /c
+# SUBTRACT BASE CPP /YX
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /I "../../" /I "../../../" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "TAO_TIME_BUILD_DLL" /D ACE_HAS_MFC=1 /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# 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 TAO.lib TAO_CosNaming.lib /nologo /dll /machine:I386 /out:"..\..\..\bin\TAO_CosTime.dll" /libpath:"..\..\tao" /libpath:"..\..\..\ace"
+# ADD LINK32 acemfc.lib TAOmfc.lib TAO_CosNamingmfc.lib /nologo /dll /machine:I386 /out:"..\..\..\bin\TAO_CosTimemfc.dll" /libpath:"..\..\tao" /libpath:"..\..\..\ace"
+
!ENDIF
# Begin Target
# Name "CosTime - Win32 Release"
# Name "CosTime - Win32 Debug"
+# Name "CosTime - Win32 MFC Debug"
+# Name "CosTime - Win32 MFC Release"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
@@ -247,6 +311,16 @@ BuildCmds= \
$(BuildCmds)
# End Custom Build
+!ELSEIF "$(CFG)" == "CosTime - Win32 MFC Debug"
+
+# PROP BASE Ignore_Default_Tool 1
+# PROP Ignore_Default_Tool 1
+
+!ELSEIF "$(CFG)" == "CosTime - Win32 MFC Release"
+
+# PROP BASE Ignore_Default_Tool 1
+# PROP Ignore_Default_Tool 1
+
!ENDIF
# End Source File
@@ -273,7 +347,27 @@ SOURCE=.\TimeServiceS_T.i
# Begin Source File
SOURCE=.\TimeServiceS_T.cpp
+
+!IF "$(CFG)" == "CosTime - Win32 Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "CosTime - Win32 Debug"
+
# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "CosTime - Win32 MFC Debug"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "CosTime - Win32 MFC Release"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ENDIF
+
# End Source File
# End Group
# End Target
diff --git a/TAO/orbsvcs/orbsvcs/DsLogAdmin.dsp b/TAO/orbsvcs/orbsvcs/DsLogAdmin.dsp
index bdf8040a8aa..0d57c2572d7 100644
--- a/TAO/orbsvcs/orbsvcs/DsLogAdmin.dsp
+++ b/TAO/orbsvcs/orbsvcs/DsLogAdmin.dsp
@@ -1,24 +1,26 @@
# Microsoft Developer Studio Project File - Name="DsLogAdmin" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
+# ** NICHT BEARBEITEN **
# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-CFG=DsLogAdmin - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
+CFG=DsLogAdmin - Win32 MFC Debug
+!MESSAGE Dies ist kein gültiges Makefile. Zum Erstellen dieses Projekts mit NMAKE
+!MESSAGE verwenden Sie den Befehl "Makefile exportieren" und führen Sie den Befehl
!MESSAGE
!MESSAGE NMAKE /f "DsLogAdmin.mak".
!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE Sie können beim Ausführen von NMAKE eine Konfiguration angeben
+!MESSAGE durch Definieren des Makros CFG in der Befehlszeile. Zum Beispiel:
!MESSAGE
-!MESSAGE NMAKE /f "DsLogAdmin.mak" CFG="DsLogAdmin - Win32 Debug"
+!MESSAGE NMAKE /f "DsLogAdmin.mak" CFG="DsLogAdmin - Win32 MFC Debug"
!MESSAGE
-!MESSAGE Possible choices for configuration are:
+!MESSAGE Für die Konfiguration stehen zur Auswahl:
!MESSAGE
-!MESSAGE "DsLogAdmin - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "DsLogAdmin - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "DsLogAdmin - Win32 Release" (basierend auf "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "DsLogAdmin - Win32 Debug" (basierend auf "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "DsLogAdmin - Win32 MFC Debug" (basierend auf "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "DsLogAdmin - Win32 MFC Release" (basierend auf "Win32 (x86) Dynamic-Link Library")
!MESSAGE
# Begin Project
@@ -84,12 +86,74 @@ LINK32=link.exe
# ADD LINK32 TAOd.lib aced.lib TAO_CosTradingd.lib TAO_Svc_Utilsd.lib /nologo /dll /debug /machine:I386 /out:"..\..\..\bin\TAO_DsLogAdmind.dll" /pdbtype:sept /libpath:"..\..\tao" /libpath:"..\..\..\ace"
# SUBTRACT LINK32 /profile
+!ELSEIF "$(CFG)" == "DsLogAdmin - Win32 MFC Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "DsLogAdmin___Win32_MFC_Debug"
+# PROP BASE Intermediate_Dir "DsLogAdmin___Win32_MFC_Debug"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ""
+# PROP Intermediate_Dir "DLL\Debug\DsLogAdminMFC"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "_DEBUG" /D "_MBCS" /D "_USRDLL" /D "TAO_ORBSVCS_HAS_NAMING" /D "WIN32" /D "_WINDOWS" /D "TAO_LOG_BUILD_DLL" /FD /c
+# SUBTRACT BASE CPP /YX
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "_DEBUG" /D "_MBCS" /D "_USRDLL" /D "TAO_ORBSVCS_HAS_NAMING" /D "WIN32" /D "_WINDOWS" /D "TAO_LOG_BUILD_DLL" /D ACE_HAS_MFC=1 /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# 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 TAOd.lib aced.lib TAO_CosTradingd.lib TAO_Svc_Utilsd.lib /nologo /dll /debug /machine:I386 /out:"..\..\..\bin\TAO_DsLogAdmind.dll" /pdbtype:sept /libpath:"..\..\tao" /libpath:"..\..\..\ace"
+# SUBTRACT BASE LINK32 /profile
+# ADD LINK32 TAOmfcd.lib acemfcd.lib TAO_CosTradingmfcd.lib TAO_Svc_Utilsmfcd.lib /nologo /dll /debug /machine:I386 /out:"..\..\..\bin\TAO_DsLogAdminmfcd.dll" /pdbtype:sept /libpath:"..\..\tao" /libpath:"..\..\..\ace"
+# SUBTRACT LINK32 /profile
+
+!ELSEIF "$(CFG)" == "DsLogAdmin - Win32 MFC Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "DsLogAdmin___Win32_MFC_Release"
+# PROP BASE Intermediate_Dir "DsLogAdmin___Win32_MFC_Release"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir ""
+# PROP Intermediate_Dir "DLL\Release\DsLogAdminMFC"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "../" /I "../../" /I "../../../" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "TAO_LOG_BUILD_DLL" /FD /c
+# SUBTRACT BASE CPP /YX
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /I "../../" /I "../../../" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "TAO_LOG_BUILD_DLL" /D ACE_HAS_MFC=1 /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# 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 TAO.lib TAO_CosTrading.lib TAO_Svc_Utils.lib /nologo /dll /machine:I386 /out:"..\..\..\bin\TAO_DsLogAdmin.dll" /libpath:"..\..\tao" /libpath:"..\..\..\ace"
+# ADD LINK32 acemfc.lib TAOmfc.lib TAO_CosTradingmfc.lib TAO_Svc_Utilsmfc.lib /nologo /dll /machine:I386 /out:"..\..\..\bin\TAO_DsLogAdminmfc.dll" /libpath:"..\..\tao" /libpath:"..\..\..\ace"
+
!ENDIF
# Begin Target
# Name "DsLogAdmin - Win32 Release"
# Name "DsLogAdmin - Win32 Debug"
+# Name "DsLogAdmin - Win32 MFC Debug"
+# Name "DsLogAdmin - Win32 MFC Release"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
@@ -271,6 +335,16 @@ BuildCmds= \
$(BuildCmds)
# End Custom Build
+!ELSEIF "$(CFG)" == "DsLogAdmin - Win32 MFC Debug"
+
+# PROP BASE Ignore_Default_Tool 1
+# PROP Ignore_Default_Tool 1
+
+!ELSEIF "$(CFG)" == "DsLogAdmin - Win32 MFC Release"
+
+# PROP BASE Ignore_Default_Tool 1
+# PROP Ignore_Default_Tool 1
+
!ENDIF
# End Source File
@@ -297,7 +371,27 @@ SOURCE=.\DsLogAdminS_T.i
# Begin Source File
SOURCE=.\DsLogAdminS_T.cpp
+
+!IF "$(CFG)" == "DsLogAdmin - Win32 Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "DsLogAdmin - Win32 Debug"
+
# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "DsLogAdmin - Win32 MFC Debug"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "DsLogAdmin - Win32 MFC Release"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ENDIF
+
# End Source File
# End Group
# End Target
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing.dsp b/TAO/orbsvcs/orbsvcs/LoadBalancing.dsp
index 4fba54c6c08..35341dc1f27 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing.dsp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing.dsp
@@ -4,7 +4,7 @@
# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-CFG=LoadBalancing - Win32 Debug
+CFG=LoadBalancing - Win32 MFC Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -13,12 +13,14 @@ CFG=LoadBalancing - 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 "LoadBalancing.mak" CFG="LoadBalancing - Win32 Debug"
+!MESSAGE NMAKE /f "LoadBalancing.mak" CFG="LoadBalancing - Win32 MFC Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "LoadBalancing - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "LoadBalancing - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "LoadBalancing - Win32 MFC Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "LoadBalancing - Win32 MFC Release" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE
# Begin Project
@@ -82,21 +84,75 @@ LINK32=link.exe
# ADD LINK32 TAOd.lib aced.lib /nologo /dll /debug /machine:I386 /out:"..\..\..\bin\TAO_LoadBalancingd.dll" /pdbtype:sept /libpath:"..\..\tao" /libpath:"..\..\..\ace"
# SUBTRACT LINK32 /profile
+!ELSEIF "$(CFG)" == "LoadBalancing - Win32 MFC Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "LoadBalancing___Win32_MFC_Debug"
+# PROP BASE Intermediate_Dir "LoadBalancing___Win32_MFC_Debug"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ""
+# PROP Intermediate_Dir "DLL\Debug\LoadBalancing"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TAO_LOADBALANCING_BUILD_DLL" /D "TAO_ORBSVCS_HAS_LOADBALANCING" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TAO_LOADBALANCING_BUILD_DLL" /D "TAO_ORBSVCS_HAS_LOADBALANCING" /D ACE_HAS_MFC=1 /YX /FD /c
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# 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 TAOd.lib aced.lib /nologo /dll /debug /machine:I386 /out:"..\..\..\bin\TAO_LoadBalancingd.dll" /pdbtype:sept /libpath:"..\..\tao" /libpath:"..\..\..\ace"
+# SUBTRACT BASE LINK32 /profile
+# ADD LINK32 TAOd.lib aced.lib /nologo /dll /debug /machine:I386 /out:"..\..\..\bin\TAO_LoadBalancingmfcd.dll" /pdbtype:sept /libpath:"..\..\tao" /libpath:"..\..\..\ace"
+# SUBTRACT LINK32 /profile
+
+!ELSEIF "$(CFG)" == "LoadBalancing - Win32 MFC Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "LoadBalancing___Win32_MFC_Release"
+# PROP BASE Intermediate_Dir "LoadBalancing___Win32_MFC_Release"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir ""
+# PROP Intermediate_Dir "DLL\Release\LoadBalancingMFC"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "../" /I "../../" /I "../../../" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "TAO_LOADBALANCING_BUILD_DLL" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /I "../../" /I "../../../" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "TAO_LOADBALANCING_BUILD_DLL" /D ACE_HAS_MFC=1 /YX /FD /c
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# 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 TAO.lib /nologo /dll /machine:I386 /out:"..\..\..\bin\TAO_LoadBalancing.dll" /libpath:"..\..\tao" /libpath:"..\..\..\ace"
+# ADD LINK32 ace.lib TAO.lib /nologo /dll /machine:I386 /out:"..\..\..\bin\TAO_LoadBalancingmfc.dll" /libpath:"..\..\tao" /libpath:"..\..\..\ace"
+
!ENDIF
# Begin Target
# Name "LoadBalancing - Win32 Release"
# Name "LoadBalancing - Win32 Debug"
+# Name "LoadBalancing - Win32 MFC Debug"
+# Name "LoadBalancing - Win32 MFC Release"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
# Begin Source File
-SOURCE=.\LoadBalancing\ReplicaLocator.cpp
-# End Source File
-# Begin Source File
-
SOURCE=.\LoadBalancing\LoadBalancer_i.cpp
# End Source File
# Begin Source File
@@ -117,6 +173,10 @@ SOURCE=.\LoadBalancing\Minimum_Dispersion.cpp
# End Source File
# Begin Source File
+SOURCE=.\LoadBalancing\ReplicaLocator.cpp
+# End Source File
+# Begin Source File
+
SOURCE=.\LoadBalancing\ReplicaProxy.cpp
# End Source File
# Begin Source File
@@ -129,10 +189,6 @@ SOURCE=.\LoadBalancing\Round_Robin_Strategy.cpp
# PROP Default_Filter "h;hpp;hxx;hm;inl"
# Begin Source File
-SOURCE=.\LoadBalancing\ReplicaLocator.h
-# End Source File
-# Begin Source File
-
SOURCE=.\LoadBalancing\LoadBalancer_i.h
# End Source File
# Begin Source File
@@ -157,6 +213,10 @@ SOURCE=.\LoadBalancing\Minimum_Dispersion.h
# End Source File
# Begin Source File
+SOURCE=.\LoadBalancing\ReplicaLocator.h
+# End Source File
+# Begin Source File
+
SOURCE=.\LoadBalancing\ReplicaProxy.h
# End Source File
# Begin Source File
@@ -249,6 +309,16 @@ BuildCmds= \
$(BuildCmds)
# End Custom Build
+!ELSEIF "$(CFG)" == "LoadBalancing - Win32 MFC Debug"
+
+# PROP BASE Ignore_Default_Tool 1
+# PROP Ignore_Default_Tool 1
+
+!ELSEIF "$(CFG)" == "LoadBalancing - Win32 MFC Release"
+
+# PROP BASE Ignore_Default_Tool 1
+# PROP Ignore_Default_Tool 1
+
!ENDIF
# End Source File
@@ -279,7 +349,27 @@ SOURCE=.\LoadBalancingS.i
# Begin Source File
SOURCE=.\LoadBalancingS_T.cpp
+
+!IF "$(CFG)" == "LoadBalancing - Win32 Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "LoadBalancing - Win32 Debug"
+
# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "LoadBalancing - Win32 MFC Debug"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "LoadBalancing - Win32 MFC Release"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ENDIF
+
# End Source File
# End Group
# End Target
diff --git a/TAO/orbsvcs/orbsvcs/RTEvent.dsp b/TAO/orbsvcs/orbsvcs/RTEvent.dsp
index 27ba665fe24..1707d3a9d59 100644
--- a/TAO/orbsvcs/orbsvcs/RTEvent.dsp
+++ b/TAO/orbsvcs/orbsvcs/RTEvent.dsp
@@ -4,7 +4,7 @@
# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-CFG=RTEvent - Win32 Debug
+CFG=RTEvent - Win32 MFC Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -13,12 +13,14 @@ CFG=RTEvent - 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 "RTEvent.mak" CFG="RTEvent - Win32 Debug"
+!MESSAGE NMAKE /f "RTEvent.mak" CFG="RTEvent - Win32 MFC Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "RTEvent - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "RTEvent - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "RTEvent - Win32 MFC Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "RTEvent - Win32 MFC Release" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE
# Begin Project
@@ -83,12 +85,72 @@ 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 /dll /debug /machine:I386 /pdbtype:sept
# ADD LINK32 TAOd.lib aced.lib TAO_Svc_Utilsd.lib /nologo /dll /debug /machine:I386 /out:"..\..\..\bin\TAO_RTEventd.dll" /pdbtype:sept /libpath:"..\..\tao" /libpath:"..\..\..\ace"
+!ELSEIF "$(CFG)" == "RTEvent - Win32 MFC Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "RTEvent___Win32_MFC_Debug"
+# PROP BASE Intermediate_Dir "RTEvent___Win32_MFC_Debug"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ""
+# PROP Intermediate_Dir "DLL\Debug\RTEventMFC"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "TAO_RTEVENT_BUILD_DLL" /FD /c
+# SUBTRACT BASE CPP /YX
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "TAO_RTEVENT_BUILD_DLL" /D ACE_HAS_MFC=1 /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# 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 TAOd.lib aced.lib TAO_Svc_Utilsd.lib /nologo /dll /debug /machine:I386 /out:"..\..\..\bin\TAO_RTEventd.dll" /pdbtype:sept /libpath:"..\..\tao" /libpath:"..\..\..\ace"
+# ADD LINK32 TAOmfcd.lib acemfcd.lib TAO_Svc_Utilsmfcd.lib /nologo /dll /debug /machine:I386 /out:"..\..\..\bin\TAO_RTEventmfcd.dll" /pdbtype:sept /libpath:"..\..\tao" /libpath:"..\..\..\ace"
+
+!ELSEIF "$(CFG)" == "RTEvent - Win32 MFC Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "RTEvent___Win32_MFC_Release"
+# PROP BASE Intermediate_Dir "RTEvent___Win32_MFC_Release"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir ""
+# PROP Intermediate_Dir "DLL\Release\RTEventMFC"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "../" /I "../../" /I "../../../" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "TAO_RTEVENT_BUILD_DLL" /FD /c
+# SUBTRACT BASE CPP /YX
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /I "../../" /I "../../../" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "TAO_RTEVENT_BUILD_DLL" /D ACE_HAS_MFC=1 /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# 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 TAO.lib TAO_Svc_Utils.lib /nologo /dll /machine:I386 /out:"..\..\..\bin\TAO_RTEvent.dll" /libpath:"..\..\tao" /libpath:"..\..\..\ace"
+# ADD LINK32 acemfc.lib TAOmfc.lib TAO_Svc_Utilsmfc.lib /nologo /dll /machine:I386 /out:"..\..\..\bin\TAO_RTEventmfc.dll" /libpath:"..\..\tao" /libpath:"..\..\..\ace"
+
!ENDIF
# Begin Target
# Name "RTEvent - Win32 Release"
# Name "RTEvent - Win32 Debug"
+# Name "RTEvent - Win32 MFC Debug"
+# Name "RTEvent - Win32 MFC Release"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
@@ -618,6 +680,16 @@ BuildCmds= \
$(BuildCmds)
# End Custom Build
+!ELSEIF "$(CFG)" == "RTEvent - Win32 MFC Debug"
+
+# PROP BASE Ignore_Default_Tool 1
+# PROP Ignore_Default_Tool 1
+
+!ELSEIF "$(CFG)" == "RTEvent - Win32 MFC Release"
+
+# PROP BASE Ignore_Default_Tool 1
+# PROP Ignore_Default_Tool 1
+
!ENDIF
# End Source File
@@ -703,6 +775,16 @@ BuildCmds= \
$(BuildCmds)
# End Custom Build
+!ELSEIF "$(CFG)" == "RTEvent - Win32 MFC Debug"
+
+# PROP BASE Ignore_Default_Tool 1
+# PROP Ignore_Default_Tool 1
+
+!ELSEIF "$(CFG)" == "RTEvent - Win32 MFC Release"
+
+# PROP BASE Ignore_Default_Tool 1
+# PROP Ignore_Default_Tool 1
+
!ENDIF
# End Source File
@@ -788,6 +870,16 @@ BuildCmds= \
$(BuildCmds)
# End Custom Build
+!ELSEIF "$(CFG)" == "RTEvent - Win32 MFC Debug"
+
+# PROP BASE Ignore_Default_Tool 1
+# PROP Ignore_Default_Tool 1
+
+!ELSEIF "$(CFG)" == "RTEvent - Win32 MFC Release"
+
+# PROP BASE Ignore_Default_Tool 1
+# PROP Ignore_Default_Tool 1
+
!ENDIF
# End Source File
@@ -873,6 +965,16 @@ BuildCmds= \
$(BuildCmds)
# End Custom Build
+!ELSEIF "$(CFG)" == "RTEvent - Win32 MFC Debug"
+
+# PROP BASE Ignore_Default_Tool 1
+# PROP Ignore_Default_Tool 1
+
+!ELSEIF "$(CFG)" == "RTEvent - Win32 MFC Release"
+
+# PROP BASE Ignore_Default_Tool 1
+# PROP Ignore_Default_Tool 1
+
!ENDIF
# End Source File
@@ -1099,22 +1201,102 @@ SOURCE=.\RtecUDPAdminS_T.i
# Begin Source File
SOURCE=.\RtecDefaultEventDataS_T.cpp
+
+!IF "$(CFG)" == "RTEvent - Win32 Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "RTEvent - Win32 Debug"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "RTEvent - Win32 MFC Debug"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "RTEvent - Win32 MFC Release"
+
+# PROP BASE Exclude_From_Build 1
# PROP Exclude_From_Build 1
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\RtecEventChannelAdminS_T.cpp
+
+!IF "$(CFG)" == "RTEvent - Win32 Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "RTEvent - Win32 Debug"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "RTEvent - Win32 MFC Debug"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "RTEvent - Win32 MFC Release"
+
+# PROP BASE Exclude_From_Build 1
# PROP Exclude_From_Build 1
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\RtecEventCommS_T.cpp
+
+!IF "$(CFG)" == "RTEvent - Win32 Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "RTEvent - Win32 Debug"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "RTEvent - Win32 MFC Debug"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "RTEvent - Win32 MFC Release"
+
+# PROP BASE Exclude_From_Build 1
# PROP Exclude_From_Build 1
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\RtecUDPAdminS_T.cpp
+
+!IF "$(CFG)" == "RTEvent - Win32 Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "RTEvent - Win32 Debug"
+
# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "RTEvent - Win32 MFC Debug"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "RTEvent - Win32 MFC Release"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ENDIF
+
# End Source File
# End Group
# End Target
diff --git a/TAO/orbsvcs/orbsvcs/RTOLDEvent.dsp b/TAO/orbsvcs/orbsvcs/RTOLDEvent.dsp
index 72be414c212..ce5f77ae3c2 100644
--- a/TAO/orbsvcs/orbsvcs/RTOLDEvent.dsp
+++ b/TAO/orbsvcs/orbsvcs/RTOLDEvent.dsp
@@ -1,24 +1,26 @@
# Microsoft Developer Studio Project File - Name="RTOLDEvent" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
+# ** NICHT BEARBEITEN **
# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-CFG=RTOLDEvent - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
+CFG=RTOLDEvent - Win32 MFC Debug
+!MESSAGE Dies ist kein gültiges Makefile. Zum Erstellen dieses Projekts mit NMAKE
+!MESSAGE verwenden Sie den Befehl "Makefile exportieren" und führen Sie den Befehl
!MESSAGE
!MESSAGE NMAKE /f "RTOLDEvent.mak".
!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE Sie können beim Ausführen von NMAKE eine Konfiguration angeben
+!MESSAGE durch Definieren des Makros CFG in der Befehlszeile. Zum Beispiel:
!MESSAGE
-!MESSAGE NMAKE /f "RTOLDEvent.mak" CFG="RTOLDEvent - Win32 Debug"
+!MESSAGE NMAKE /f "RTOLDEvent.mak" CFG="RTOLDEvent - Win32 MFC Debug"
!MESSAGE
-!MESSAGE Possible choices for configuration are:
+!MESSAGE Für die Konfiguration stehen zur Auswahl:
!MESSAGE
-!MESSAGE "RTOLDEvent - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "RTOLDEvent - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "RTOLDEvent - Win32 Release" (basierend auf "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "RTOLDEvent - Win32 Debug" (basierend auf "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "RTOLDEvent - Win32 MFC Debug" (basierend auf "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "RTOLDEvent - Win32 MFC Release" (basierend auf "Win32 (x86) Dynamic-Link Library")
!MESSAGE
# Begin Project
@@ -83,12 +85,72 @@ 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 /dll /debug /machine:I386 /pdbtype:sept
# ADD LINK32 TAOd.lib aced.lib TAO_Svc_Utilsd.lib TAO_CosNamingd.lib TAO_RTSchedd.lib TAO_RTEventd.lib /nologo /dll /debug /machine:I386 /out:"..\..\..\bin\TAO_RTOLDEventd.dll" /pdbtype:sept /libpath:"..\..\tao" /libpath:"..\..\..\ace"
+!ELSEIF "$(CFG)" == "RTOLDEvent - Win32 MFC Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "RTOLDEvent___Win32_MFC_Debug"
+# PROP BASE Intermediate_Dir "RTOLDEvent___Win32_MFC_Debug"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ""
+# PROP Intermediate_Dir "DLL\Debug\RTOLDEventMFC"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "TAO_RTOLDEVENT_BUILD_DLL" /FD /c
+# SUBTRACT BASE CPP /YX
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "TAO_RTOLDEVENT_BUILD_DLL" /D ACE_HAS_MFC=1 /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# 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 TAOd.lib aced.lib TAO_Svc_Utilsd.lib TAO_CosNamingd.lib TAO_RTSchedd.lib TAO_RTEventd.lib /nologo /dll /debug /machine:I386 /out:"..\..\..\bin\TAO_RTOLDEventd.dll" /pdbtype:sept /libpath:"..\..\tao" /libpath:"..\..\..\ace"
+# ADD LINK32 TAOmfcd.lib acemfcd.lib TAO_Svc_Utilsmfcd.lib TAO_CosNamingmfcd.lib TAO_RTSchedmfcd.lib TAO_RTEventmfcd.lib /nologo /dll /debug /machine:I386 /out:"..\..\..\bin\TAO_RTOLDEventmfcd.dll" /pdbtype:sept /libpath:"..\..\tao" /libpath:"..\..\..\ace"
+
+!ELSEIF "$(CFG)" == "RTOLDEvent - Win32 MFC Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "RTOLDEvent___Win32_MFC_Release"
+# PROP BASE Intermediate_Dir "RTOLDEvent___Win32_MFC_Release"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir ""
+# PROP Intermediate_Dir "DLL\Release\RTOLDEventMFC"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "../" /I "../../" /I "../../../" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "TAO_RTOLDEVENT_BUILD_DLL" /FD /c
+# SUBTRACT BASE CPP /YX
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /I "../../" /I "../../../" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "TAO_RTOLDEVENT_BUILD_DLL" /D ACE_HAS_MFC=1 /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# 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 TAO.lib TAO_Svc_Utils.lib TAO_CosNaming.lib TAO_RTSched.lib TAO_RTEvent.lib /nologo /dll /machine:I386 /out:"..\..\..\bin\TAO_RTOLDEvent.dll" /libpath:"..\..\tao" /libpath:"..\..\..\ace"
+# ADD LINK32 acemfc.lib TAOmfc.lib TAO_Svc_Utilsmfc.lib TAO_CosNamingmfc.lib TAO_RTSched.lib TAO_RTEventmfc.lib /nologo /dll /machine:I386 /out:"..\..\..\bin\TAO_RTOLDEventmfc.dll" /libpath:"..\..\tao" /libpath:"..\..\..\ace"
+
!ENDIF
# Begin Target
# Name "RTOLDEvent - Win32 Release"
# Name "RTOLDEvent - Win32 Debug"
+# Name "RTOLDEvent - Win32 MFC Debug"
+# Name "RTOLDEvent - Win32 MFC Release"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
diff --git a/TAO/orbsvcs/orbsvcs/RTSched.dsp b/TAO/orbsvcs/orbsvcs/RTSched.dsp
index f1a9f295a4c..0400c827450 100644
--- a/TAO/orbsvcs/orbsvcs/RTSched.dsp
+++ b/TAO/orbsvcs/orbsvcs/RTSched.dsp
@@ -1,24 +1,26 @@
# Microsoft Developer Studio Project File - Name="RTSched" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
+# ** NICHT BEARBEITEN **
# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-CFG=RTSched - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
+CFG=RTSched - Win32 MFC Debug
+!MESSAGE Dies ist kein gültiges Makefile. Zum Erstellen dieses Projekts mit NMAKE
+!MESSAGE verwenden Sie den Befehl "Makefile exportieren" und führen Sie den Befehl
!MESSAGE
!MESSAGE NMAKE /f "RTSched.mak".
!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE Sie können beim Ausführen von NMAKE eine Konfiguration angeben
+!MESSAGE durch Definieren des Makros CFG in der Befehlszeile. Zum Beispiel:
!MESSAGE
-!MESSAGE NMAKE /f "RTSched.mak" CFG="RTSched - Win32 Debug"
+!MESSAGE NMAKE /f "RTSched.mak" CFG="RTSched - Win32 MFC Debug"
!MESSAGE
-!MESSAGE Possible choices for configuration are:
+!MESSAGE Für die Konfiguration stehen zur Auswahl:
!MESSAGE
-!MESSAGE "RTSched - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "RTSched - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "RTSched - Win32 Release" (basierend auf "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "RTSched - Win32 Debug" (basierend auf "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "RTSched - Win32 MFC Debug" (basierend auf "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "RTSched - Win32 MFC Release" (basierend auf "Win32 (x86) Dynamic-Link Library")
!MESSAGE
# Begin Project
@@ -84,12 +86,74 @@ LINK32=link.exe
# ADD LINK32 TAOd.lib aced.lib TAO_CosNamingd.lib TAO_Svc_Utilsd.lib /nologo /dll /debug /machine:I386 /out:"..\..\..\bin\TAO_RTSchedd.dll" /pdbtype:sept /libpath:"..\..\tao" /libpath:"..\..\..\ace"
# SUBTRACT LINK32 /profile
+!ELSEIF "$(CFG)" == "RTSched - Win32 MFC Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "RTSched___Win32_MFC_Debug"
+# PROP BASE Intermediate_Dir "RTSched___Win32_MFC_Debug"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ""
+# PROP Intermediate_Dir "DLL\Debug\RTSchedMFC"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "_DEBUG" /D "_MBCS" /D "_USRDLL" /D "TAO_ORBSVCS_HAS_NAMING" /D "WIN32" /D "_WINDOWS" /D "TAO_RTSCHED_BUILD_DLL" /FD /c
+# SUBTRACT BASE CPP /YX
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "_DEBUG" /D "_MBCS" /D "_USRDLL" /D "TAO_ORBSVCS_HAS_NAMING" /D "WIN32" /D "_WINDOWS" /D "TAO_RTSCHED_BUILD_DLL" /D ACE_HAS_MFC=1 /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# 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 TAOd.lib aced.lib TAO_CosNamingd.lib TAO_Svc_Utilsd.lib /nologo /dll /debug /machine:I386 /out:"..\..\..\bin\TAO_RTSchedd.dll" /pdbtype:sept /libpath:"..\..\tao" /libpath:"..\..\..\ace"
+# SUBTRACT BASE LINK32 /profile
+# ADD LINK32 TAOmfcd.lib acemfcd.lib TAO_CosNamingmfcd.lib TAO_Svc_Utilsmfcd.lib /nologo /dll /debug /machine:I386 /out:"..\..\..\bin\TAO_RTSchedmfcd.dll" /pdbtype:sept /libpath:"..\..\tao" /libpath:"..\..\..\ace"
+# SUBTRACT LINK32 /profile
+
+!ELSEIF "$(CFG)" == "RTSched - Win32 MFC Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "RTSched___Win32_MFC_Release"
+# PROP BASE Intermediate_Dir "RTSched___Win32_MFC_Release"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir ""
+# PROP Intermediate_Dir "DLL\Release\RTSchedMFC"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "../" /I "../../" /I "../../../" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "TAO_RTSCHED_BUILD_DLL" /FD /c
+# SUBTRACT BASE CPP /YX
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /I "../../" /I "../../../" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "TAO_RTSCHED_BUILD_DLL" /D ACE_HAS_MFC=1 /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# 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 TAO.lib TAO_CosNaming.lib TAO_Svc_Utils.lib /nologo /dll /machine:I386 /out:"..\..\..\bin\TAO_RTSched.dll" /libpath:"..\..\tao" /libpath:"..\..\..\ace"
+# ADD LINK32 ace.lib TAO.lib TAO_CosNaming.lib TAO_Svc_Utils.lib /nologo /dll /machine:I386 /out:"..\..\..\bin\TAO_RTSchedmfc.dll" /libpath:"..\..\tao" /libpath:"..\..\..\ace"
+
!ENDIF
# Begin Target
# Name "RTSched - Win32 Release"
# Name "RTSched - Win32 Debug"
+# Name "RTSched - Win32 MFC Debug"
+# Name "RTSched - Win32 MFC Release"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
@@ -303,6 +367,86 @@ BuildCmds= \
$(BuildCmds)
# End Custom Build
+!ELSEIF "$(CFG)" == "RTSched - Win32 MFC Debug"
+
+# PROP BASE Ignore_Default_Tool 1
+# PROP Ignore_Default_Tool 1
+USERDEP__RTECS="..\..\..\bin\tao_idl.exe"
+# Begin Custom Build - Invoking TAO_IDL Compiler on $(InputName)
+InputPath=.\RtecScheduler.idl
+InputName=RtecScheduler
+
+BuildCmds= \
+ ..\..\..\bin\tao_idl -Ge 1 -I../../ -I../../tao -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_RTSched_Export -Wb,export_include=Sched\sched_export.h $(InputName).idl
+
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "RTSched - Win32 MFC Release"
+
+# PROP BASE Ignore_Default_Tool 1
+# PROP Ignore_Default_Tool 1
+USERDEP__RTECS="..\..\..\bin\Release\tao_idl.exe"
+# Begin Custom Build - Invoking TAO_IDL Compiler on $(InputName)
+InputPath=.\RtecScheduler.idl
+InputName=RtecScheduler
+
+BuildCmds= \
+ ..\..\..\bin\Release\tao_idl -Ge 1 -I../../ -I../../tao -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_RTSched_Export -Wb,export_include=Sched\sched_export.h $(InputName).idl
+
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+# End Custom Build
+
!ENDIF
# End Source File
@@ -377,17 +521,77 @@ SOURCE=.\Sched\Strategy_Scheduler.i
# Begin Source File
SOURCE=.\Sched\Reconfig_Sched_Utils_T.cpp
+
+!IF "$(CFG)" == "RTSched - Win32 Release"
+
# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "RTSched - Win32 Debug"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "RTSched - Win32 MFC Debug"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "RTSched - Win32 MFC Release"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\Sched\Reconfig_Scheduler_T.cpp
+
+!IF "$(CFG)" == "RTSched - Win32 Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "RTSched - Win32 Debug"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "RTSched - Win32 MFC Debug"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "RTSched - Win32 MFC Release"
+
+# PROP BASE Exclude_From_Build 1
# PROP Exclude_From_Build 1
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\RtecSchedulerS_T.cpp
+
+!IF "$(CFG)" == "RTSched - Win32 Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "RTSched - Win32 Debug"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "RTSched - Win32 MFC Debug"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "RTSched - Win32 MFC Release"
+
+# PROP BASE Exclude_From_Build 1
# PROP Exclude_From_Build 1
+
+!ENDIF
+
# End Source File
# End Group
# End Target
diff --git a/TAO/orbsvcs/orbsvcs/RTSchedEvent.dsp b/TAO/orbsvcs/orbsvcs/RTSchedEvent.dsp
index 5d1a79d86c5..7284de53b2b 100644
--- a/TAO/orbsvcs/orbsvcs/RTSchedEvent.dsp
+++ b/TAO/orbsvcs/orbsvcs/RTSchedEvent.dsp
@@ -1,24 +1,26 @@
# Microsoft Developer Studio Project File - Name="RTSchedEvent" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
+# ** NICHT BEARBEITEN **
# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-CFG=RTSchedEvent - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
+CFG=RTSchedEvent - Win32 MFC Debug
+!MESSAGE Dies ist kein gültiges Makefile. Zum Erstellen dieses Projekts mit NMAKE
+!MESSAGE verwenden Sie den Befehl "Makefile exportieren" und führen Sie den Befehl
!MESSAGE
!MESSAGE NMAKE /f "RTSchedEvent.mak".
!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE Sie können beim Ausführen von NMAKE eine Konfiguration angeben
+!MESSAGE durch Definieren des Makros CFG in der Befehlszeile. Zum Beispiel:
!MESSAGE
-!MESSAGE NMAKE /f "RTSchedEvent.mak" CFG="RTSchedEvent - Win32 Debug"
+!MESSAGE NMAKE /f "RTSchedEvent.mak" CFG="RTSchedEvent - Win32 MFC Debug"
!MESSAGE
-!MESSAGE Possible choices for configuration are:
+!MESSAGE Für die Konfiguration stehen zur Auswahl:
!MESSAGE
-!MESSAGE "RTSchedEvent - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "RTSchedEvent - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "RTSchedEvent - Win32 Release" (basierend auf "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "RTSchedEvent - Win32 Debug" (basierend auf "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "RTSchedEvent - Win32 MFC Debug" (basierend auf "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "RTSchedEvent - Win32 MFC Release" (basierend auf "Win32 (x86) Dynamic-Link Library")
!MESSAGE
# Begin Project
@@ -83,12 +85,72 @@ 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 /dll /debug /machine:I386 /pdbtype:sept
# ADD LINK32 TAOd.lib aced.lib TAO_Svc_Utilsd.lib TAO_RTSchedd.lib TAO_RTEventd.lib /nologo /dll /debug /machine:I386 /out:"..\..\..\bin\TAO_RTSchedEventd.dll" /pdbtype:sept /libpath:"..\..\tao" /libpath:"..\..\..\ace"
+!ELSEIF "$(CFG)" == "RTSchedEvent - Win32 MFC Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "RTSchedEvent___Win32_MFC_Debug"
+# PROP BASE Intermediate_Dir "RTSchedEvent___Win32_MFC_Debug"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ""
+# PROP Intermediate_Dir "DLL\Debug\RTSchedEventMFC"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "TAO_RTSCHEDEVENT_BUILD_DLL" /FD /c
+# SUBTRACT BASE CPP /YX
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "TAO_RTSCHEDEVENT_BUILD_DLL" /D ACE_HAS_MFC=1 /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# 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 TAOd.lib aced.lib TAO_Svc_Utilsd.lib TAO_RTSchedd.lib TAO_RTEventd.lib /nologo /dll /debug /machine:I386 /out:"..\..\..\bin\TAO_RTSchedEventd.dll" /pdbtype:sept /libpath:"..\..\tao" /libpath:"..\..\..\ace"
+# ADD LINK32 TAOmfcd.lib acemfcd.lib TAO_Svc_Utilsmfcd.lib TAO_RTSchedmfcd.lib TAO_RTEventmfcd.lib /nologo /dll /debug /machine:I386 /out:"..\..\..\bin\TAO_RTSchedEventmfcd.dll" /pdbtype:sept /libpath:"..\..\tao" /libpath:"..\..\..\ace"
+
+!ELSEIF "$(CFG)" == "RTSchedEvent - Win32 MFC Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "RTSchedEvent___Win32_MFC_Release"
+# PROP BASE Intermediate_Dir "RTSchedEvent___Win32_MFC_Release"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir ""
+# PROP Intermediate_Dir "DLL\Release\RTSchedEventMFC"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "../" /I "../../" /I "../../../" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "TAO_RTSCHEDEVENT_BUILD_DLL" /FD /c
+# SUBTRACT BASE CPP /YX
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /I "../../" /I "../../../" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "TAO_RTSCHEDEVENT_BUILD_DLL" /D ACE_HAS_MFC=1 /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# 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 TAO.lib TAO_Svc_Utils.lib TAO_RTSched.lib TAO_RTEvent.lib /nologo /dll /machine:I386 /out:"..\..\..\bin\TAO_RTSchedEvent.dll" /libpath:"..\..\tao" /libpath:"..\..\..\ace"
+# ADD LINK32 acemfc.lib TAOmfc.lib TAO_Svc_Utilsmfc.lib TAO_RTSchedmfc.lib TAO_RTEventmfc.lib /nologo /dll /machine:I386 /out:"..\..\..\bin\TAO_RTSchedEventmfc.dll" /libpath:"..\..\tao" /libpath:"..\..\..\ace"
+
!ENDIF
# Begin Target
# Name "RTSchedEvent - Win32 Release"
# Name "RTSchedEvent - Win32 Debug"
+# Name "RTSchedEvent - Win32 MFC Debug"
+# Name "RTSchedEvent - Win32 MFC Release"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
diff --git a/TAO/orbsvcs/orbsvcs/Svc_Utils.dsp b/TAO/orbsvcs/orbsvcs/Svc_Utils.dsp
index d3af7dba50e..5b19dd71dc0 100644
--- a/TAO/orbsvcs/orbsvcs/Svc_Utils.dsp
+++ b/TAO/orbsvcs/orbsvcs/Svc_Utils.dsp
@@ -1,24 +1,26 @@
# Microsoft Developer Studio Project File - Name="Svc Utils" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
+# ** NICHT BEARBEITEN **
# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-CFG=Svc Utils - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
+CFG=Svc Utils - Win32 MFC Debug
+!MESSAGE Dies ist kein gültiges Makefile. Zum Erstellen dieses Projekts mit NMAKE
+!MESSAGE verwenden Sie den Befehl "Makefile exportieren" und führen Sie den Befehl
!MESSAGE
!MESSAGE NMAKE /f "Svc_Utils.mak".
!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE Sie können beim Ausführen von NMAKE eine Konfiguration angeben
+!MESSAGE durch Definieren des Makros CFG in der Befehlszeile. Zum Beispiel:
!MESSAGE
-!MESSAGE NMAKE /f "Svc_Utils.mak" CFG="Svc Utils - Win32 Debug"
+!MESSAGE NMAKE /f "Svc_Utils.mak" CFG="Svc Utils - Win32 MFC Debug"
!MESSAGE
-!MESSAGE Possible choices for configuration are:
+!MESSAGE Für die Konfiguration stehen zur Auswahl:
!MESSAGE
-!MESSAGE "Svc Utils - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "Svc Utils - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "Svc Utils - Win32 Release" (basierend auf "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "Svc Utils - Win32 Debug" (basierend auf "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "Svc Utils - Win32 mfc Release" (basierend auf "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "Svc Utils - Win32 MFC Debug" (basierend auf "Win32 (x86) Dynamic-Link Library")
!MESSAGE
# Begin Project
@@ -83,12 +85,72 @@ 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 /dll /debug /machine:I386 /pdbtype:sept
# ADD LINK32 TAOd.lib aced.lib /nologo /dll /debug /machine:I386 /out:"..\..\..\bin\TAO_Svc_Utilsd.dll" /pdbtype:sept /libpath:"..\..\tao" /libpath:"..\..\..\ace"
+!ELSEIF "$(CFG)" == "Svc Utils - Win32 mfc Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Svc_Utils___Win32_mfc_Release"
+# PROP BASE Intermediate_Dir "Svc_Utils___Win32_mfc_Release"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir ""
+# PROP Intermediate_Dir "DLL\Release\Svc_UtilsMFC"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "../" /I "../../" /I "../../../" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TAO_SVC_UTILS_BUILD_DLL" /D "TAO_ORBSVCS_HAS_SVC_UTILS" /FD /c
+# SUBTRACT BASE CPP /YX
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /I "../../" /I "../../../" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TAO_SVC_UTILS_BUILD_DLL" /D "TAO_ORBSVCS_HAS_SVC_UTILS" /D ACE_HAS_MFC=1 /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# 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 TAO.lib /nologo /dll /machine:I386 /out:"..\..\..\bin\TAO_Svc_Utils.dll" /libpath:"..\..\tao" /libpath:"..\..\..\ace"
+# ADD LINK32 acemfc.lib TAOmfc.lib /nologo /dll /machine:I386 /out:"..\..\..\bin\TAO_Svc_Utilsmfc.dll" /libpath:"..\..\tao" /libpath:"..\..\..\ace"
+
+!ELSEIF "$(CFG)" == "Svc Utils - Win32 MFC Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Svc_Utils___Win32_MFC_Debug"
+# PROP BASE Intermediate_Dir "Svc_Utils___Win32_MFC_Debug"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ""
+# PROP Intermediate_Dir "DLL\Debug\Svc_Utils"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TAO_SVC_UTILS_BUILD_DLL" /D "TAO_ORBSVCS_HAS_SVC_UTILS" /FD /c
+# SUBTRACT BASE CPP /YX
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TAO_SVC_UTILS_BUILD_DLL" /D "TAO_ORBSVCS_HAS_SVC_UTILS" /D ACE_HAS_MFC=1 /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# 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 TAOd.lib aced.lib /nologo /dll /debug /machine:I386 /out:"..\..\..\bin\TAO_Svc_Utilsd.dll" /pdbtype:sept /libpath:"..\..\tao" /libpath:"..\..\..\ace"
+# ADD LINK32 TAOmfcd.lib acemfcd.lib /nologo /dll /debug /machine:I386 /out:"..\..\..\bin\TAO_Svc_Utilsmfcd.dll" /pdbtype:sept /libpath:"..\..\tao" /libpath:"..\..\..\ace"
+
!ENDIF
# Begin Target
# Name "Svc Utils - Win32 Release"
# Name "Svc Utils - Win32 Debug"
+# Name "Svc Utils - Win32 mfc Release"
+# Name "Svc Utils - Win32 MFC Debug"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
@@ -266,6 +328,51 @@ BuildCmds= \
$(BuildCmds)
# End Custom Build
+!ELSEIF "$(CFG)" == "Svc Utils - Win32 mfc Release"
+
+# PROP BASE Ignore_Default_Tool 1
+# PROP Ignore_Default_Tool 1
+USERDEP__RTECB="..\..\..\bin\Release\tao_idl.exe"
+# Begin Custom Build
+InputPath=.\RtecBase.idl
+InputName=RtecBase
+
+BuildCmds= \
+ ..\..\..\bin\Release\tao_idl -Ge 1 -I../../ -I../../tao -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_Svc_Utils_Export -Wb,export_include=svc_utils_export.h $(InputName).idl
+
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "Svc Utils - Win32 MFC Debug"
+
+# PROP BASE Ignore_Default_Tool 1
+# PROP Ignore_Default_Tool 1
+
!ENDIF
# End Source File
@@ -351,6 +458,51 @@ BuildCmds= \
$(BuildCmds)
# End Custom Build
+!ELSEIF "$(CFG)" == "Svc Utils - Win32 mfc Release"
+
+# PROP BASE Ignore_Default_Tool 1
+# PROP Ignore_Default_Tool 1
+USERDEP__TIMEB="..\..\..\bin\Release\tao_idl.exe"
+# Begin Custom Build - Invoking TAO_IDL Compiler on $(InputName)
+InputPath=.\TimeBase.idl
+InputName=TimeBase
+
+BuildCmds= \
+ ..\..\..\bin\Release\tao_idl -Ge 1 -I../../ -I../../tao -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_Svc_Utils_Export -Wb,export_include=svc_utils_export.h $(InputName).idl
+
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "Svc Utils - Win32 MFC Debug"
+
+# PROP BASE Ignore_Default_Tool 1
+# PROP Ignore_Default_Tool 1
+
!ENDIF
# End Source File
@@ -361,12 +513,52 @@ BuildCmds= \
# Begin Source File
SOURCE=.\RtecBaseS_T.cpp
+
+!IF "$(CFG)" == "Svc Utils - Win32 Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "Svc Utils - Win32 Debug"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "Svc Utils - Win32 mfc Release"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "Svc Utils - Win32 MFC Debug"
+
+# PROP BASE Exclude_From_Build 1
# PROP Exclude_From_Build 1
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=.\TimeBaseS_T.cpp
+
+!IF "$(CFG)" == "Svc Utils - Win32 Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "Svc Utils - Win32 Debug"
+
# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "Svc Utils - Win32 mfc Release"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "Svc Utils - Win32 MFC Debug"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ENDIF
+
# End Source File
# End Group
# End Target