ChangeLogTag:Mon Nov 13 02:13:54 2000 Darrell Brunsch <brunsch@uci.edu>

3 files changed, 21 insertions, 197 deletions

diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index 549b65ae4ba..ffd8b7c8044 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,16 @@
+Mon Nov 13 02:13:54 2000  Darrell Brunsch <brunsch@uci.edu>
+
+        * tao/Strategies/TAO_Strategies.dsp:
+
+          An ACE_HAS_STRATEGIES_DLL was being defined for the cpp 
+          files, which was preventing anything from being exported.
+          Removed it and things look happy on Win32 Release now.
+
+        * tao/Strategies/TAO_Strategies_Static.dsp:
+
+          Changed the configurations to Win32 Static Debug and
+          Win32 Static Release.
+
 Mon Nov 13 08:46:40 2000  Johnny Willemsen <jwillemsen@remedy.nl>
 
         * orbsvcs/ImplRepo_Service/ImplRepo.bor:
diff --git a/TAO/tao/Strategies/TAO_Strategies.dsp b/TAO/tao/Strategies/TAO_Strategies.dsp
index 9c38bea6875..1cb590ab3b4 100644
--- a/TAO/tao/Strategies/TAO_Strategies.dsp
+++ b/TAO/tao/Strategies/TAO_Strategies.dsp
@@ -95,275 +95,86 @@ LINK32=link.exe
 # Begin Source File

 

 SOURCE=.\advanced_resource.cpp

-

-!IF  "$(CFG)" == "TAO_Strategies - Win32 Release"

-

-# ADD CPP /D TAO_STRATEGIES_HAS_DLL=0

-

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

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Direct_Priority_Mapping.cpp

-

-!IF  "$(CFG)" == "TAO_Strategies - Win32 Release"

-

-# ADD CPP /D TAO_STRATEGIES_HAS_DLL=0

-

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

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Linear_Priority_Mapping.cpp

-

-!IF  "$(CFG)" == "TAO_Strategies - Win32 Release"

-

-# ADD CPP /D TAO_STRATEGIES_HAS_DLL=0

-

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

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Reactor_Per_Priority.cpp

-

-!IF  "$(CFG)" == "TAO_Strategies - Win32 Release"

-

-# ADD CPP /D TAO_STRATEGIES_HAS_DLL=0

-

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

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\SHMIOP_Acceptor.cpp

-

-!IF  "$(CFG)" == "TAO_Strategies - Win32 Release"

-

-# ADD CPP /D TAO_STRATEGIES_HAS_DLL=0

-

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

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\SHMIOP_Connect.cpp

-

-!IF  "$(CFG)" == "TAO_Strategies - Win32 Release"

-

-# ADD CPP /D TAO_STRATEGIES_HAS_DLL=0

-

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

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\SHMIOP_Connector.cpp

-

-!IF  "$(CFG)" == "TAO_Strategies - Win32 Release"

-

-# ADD CPP /D TAO_STRATEGIES_HAS_DLL=0

-

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

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\SHMIOP_Endpoint.cpp

-

-!IF  "$(CFG)" == "TAO_Strategies - Win32 Release"

-

-# ADD CPP /D TAO_STRATEGIES_HAS_DLL=0

-

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

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\SHMIOP_Factory.cpp

-

-!IF  "$(CFG)" == "TAO_Strategies - Win32 Release"

-

-# ADD CPP /D TAO_STRATEGIES_HAS_DLL=0

-

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

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\SHMIOP_Profile.cpp

-

-!IF  "$(CFG)" == "TAO_Strategies - Win32 Release"

-

-# ADD CPP /D TAO_STRATEGIES_HAS_DLL=0

-

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

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\SHMIOP_Transport.cpp

-

-!IF  "$(CFG)" == "TAO_Strategies - Win32 Release"

-

-# ADD CPP /D TAO_STRATEGIES_HAS_DLL=0

-

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

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\TAO_Strategies_Internal.cpp

-

-!IF  "$(CFG)" == "TAO_Strategies - Win32 Release"

-

-# ADD CPP /D TAO_STRATEGIES_HAS_DLL=0

-

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

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\UIOP_Acceptor.cpp

-

-!IF  "$(CFG)" == "TAO_Strategies - Win32 Release"

-

-# ADD CPP /D TAO_STRATEGIES_HAS_DLL=0

-

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

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\UIOP_Connect.cpp

-

-!IF  "$(CFG)" == "TAO_Strategies - Win32 Release"

-

-# ADD CPP /D TAO_STRATEGIES_HAS_DLL=0

-

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

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\UIOP_Connector.cpp

-

-!IF  "$(CFG)" == "TAO_Strategies - Win32 Release"

-

-# ADD CPP /D TAO_STRATEGIES_HAS_DLL=0

-

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

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\UIOP_Endpoint.cpp

-

-!IF  "$(CFG)" == "TAO_Strategies - Win32 Release"

-

-# ADD CPP /D TAO_STRATEGIES_HAS_DLL=0

-

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

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\uiop_endpoints.cpp

-

-!IF  "$(CFG)" == "TAO_Strategies - Win32 Release"

-

-# ADD CPP /D TAO_STRATEGIES_HAS_DLL=0

-

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

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\UIOP_Factory.cpp

-

-!IF  "$(CFG)" == "TAO_Strategies - Win32 Release"

-

-# ADD CPP /D TAO_STRATEGIES_HAS_DLL=0

-

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

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\UIOP_Lite_Factory.cpp

-

-!IF  "$(CFG)" == "TAO_Strategies - Win32 Release"

-

-# ADD CPP /D TAO_STRATEGIES_HAS_DLL=0

-

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

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\UIOP_Profile.cpp

-

-!IF  "$(CFG)" == "TAO_Strategies - Win32 Release"

-

-# ADD CPP /D TAO_STRATEGIES_HAS_DLL=0

-

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

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\UIOP_Transport.cpp

-

-!IF  "$(CFG)" == "TAO_Strategies - Win32 Release"

-

-# ADD CPP /D TAO_STRATEGIES_HAS_DLL=0

-

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

-

-!ENDIF 

-

 # End Source File

 # End Group

 # Begin Group "Header Files"

diff --git a/TAO/tao/Strategies/TAO_Strategies_Static.dsp b/TAO/tao/Strategies/TAO_Strategies_Static.dsp
index 208d02dec4d..a5e2af6cad1 100644
--- a/TAO/tao/Strategies/TAO_Strategies_Static.dsp
+++ b/TAO/tao/Strategies/TAO_Strategies_Static.dsp
@@ -4,7 +4,7 @@
 

 # TARGTYPE "Win32 (x86) Static Library" 0x0104

 

-CFG=TAO_Strategies_Static - Win32 Debug

+CFG=TAO_Strategies_Static - Win32 Static 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,12 @@ CFG=TAO_Strategies_Static - Win32 Debug
 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

 !MESSAGE 

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

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

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "TAO_Strategies_Static - Win32 Release" (based on "Win32 (x86) Static Library")

-!MESSAGE "TAO_Strategies_Static - Win32 Debug" (based on "Win32 (x86) Static Library")

+!MESSAGE "TAO_Strategies_Static - Win32 Static Release" (based on "Win32 (x86) Static Library")

+!MESSAGE "TAO_Strategies_Static - Win32 Static Debug" (based on "Win32 (x86) Static Library")

 !MESSAGE 

 

 # Begin Project

@@ -28,7 +28,7 @@ CFG=TAO_Strategies_Static - Win32 Debug
 CPP=cl.exe

 RSC=rc.exe

 

-!IF  "$(CFG)" == "TAO_Strategies_Static - Win32 Release"

+!IF  "$(CFG)" == "TAO_Strategies_Static - Win32 Static Release"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 0

@@ -52,7 +52,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo

 # ADD LIB32 /nologo /out:"TAO_Strategiess.lib"

 

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

+!ELSEIF  "$(CFG)" == "TAO_Strategies_Static - Win32 Static Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

@@ -80,8 +80,8 @@ LIB32=link.exe -lib
 

 # Begin Target

 

-# Name "TAO_Strategies_Static - Win32 Release"

-# Name "TAO_Strategies_Static - Win32 Debug"

+# Name "TAO_Strategies_Static - Win32 Static Release"

+# Name "TAO_Strategies_Static - Win32 Static Debug"

 # Begin Group "Source Files"

 

 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"