summaryrefslogtreecommitdiff
path: root/ace/QoS
diff options
context:
space:
mode:
authorbrunsch <brunsch@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2001-02-11 23:34:42 +0000
committerbrunsch <brunsch@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2001-02-11 23:34:42 +0000
commit49bc63d30d6558688775beb947ac9bc2d99cd1fb (patch)
tree2c8112ef5d757e98f225f7c479c235f039bd9436 /ace/QoS
parentd4fcf319f325bdbd36cf71bccac99c9ae0ef97d8 (diff)
downloadATCD-49bc63d30d6558688775beb947ac9bc2d99cd1fb.tar.gz
ChangeLogTag:Sun Feb 11 15:33:39 2001 Darrell Brunsch <brunsch@uci.edu>
Diffstat (limited to 'ace/QoS')
-rw-r--r--ace/QoS/ACE_QoS.dsp30
-rw-r--r--ace/QoS/ACE_QoS_Export.h12
-rw-r--r--ace/QoS/ACE_QoS_Lib.dsp44
3 files changed, 46 insertions, 40 deletions
diff --git a/ace/QoS/ACE_QoS.dsp b/ace/QoS/ACE_QoS.dsp
index d00209cc740..d9ddb8c4c11 100644
--- a/ace/QoS/ACE_QoS.dsp
+++ b/ace/QoS/ACE_QoS.dsp
@@ -1,10 +1,10 @@
-# Microsoft Developer Studio Project File - Name="ACE_QoS" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="ACE_QoS DLL" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-CFG=ACE_QoS - Win32 Debug
+CFG=ACE_QoS DLL - Win32 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=ACE_QoS - 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 "ACE_QoS.mak" CFG="ACE_QoS - Win32 Debug"
+!MESSAGE NMAKE /f "ACE_QoS.mak" CFG="ACE_QoS DLL - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "ACE_QoS - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "ACE_QoS - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "ACE_QoS DLL - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "ACE_QoS DLL - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE
# Begin Project
@@ -29,7 +29,7 @@ CPP=cl.exe
MTL=midl.exe
RSC=rc.exe
-!IF "$(CFG)" == "ACE_QoS - Win32 Release"
+!IF "$(CFG)" == "ACE_QoS DLL - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -39,11 +39,11 @@ RSC=rc.exe
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir ""
-# PROP Intermediate_Dir "DLL\Release"
+# PROP Intermediate_Dir "Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ACE_QOS_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\.." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ACE_QoS_BUILD_DLL" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\.." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "ACE_QoS_BUILD_DLL" /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -53,10 +53,10 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 ..\..\bin\ace.lib /nologo /dll /pdb:"ACE_RMCast.pdb" /machine:I386 /out:"..\..\bin\ACE_QoS.dll" /implib:"ACE_RMCast.lib" /libpath:".."
+# ADD LINK32 ace.lib /nologo /dll /pdb:"ACE_RMCast.pdb" /machine:I386 /out:"..\..\bin\ACE_QoS.dll" /libpath:".."
# SUBTRACT LINK32 /pdb:none
-!ELSEIF "$(CFG)" == "ACE_QoS - Win32 Debug"
+!ELSEIF "$(CFG)" == "ACE_QoS DLL - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -66,11 +66,11 @@ LINK32=link.exe
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir ""
-# PROP Intermediate_Dir ".\DLL\Debug"
+# PROP Intermediate_Dir "Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ACE_QOS_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\.." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ACE_QoS_BUILD_DLL" /Fo"DLL\Debug/" /Fd"DLL\Debug/" /FD /c
+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ACE_QOS_EXPORTS" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\.." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "ACE_QoS_BUILD_DLL" /Fo"DLL\Debug/" /Fd"DLL\Debug/" /FD /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -87,8 +87,8 @@ LINK32=link.exe
# Begin Target
-# Name "ACE_QoS - Win32 Release"
-# Name "ACE_QoS - Win32 Debug"
+# Name "ACE_QoS DLL - Win32 Release"
+# Name "ACE_QoS DLL - Win32 Debug"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
diff --git a/ace/QoS/ACE_QoS_Export.h b/ace/QoS/ACE_QoS_Export.h
index db4eba50d8f..45790bbd24c 100644
--- a/ace/QoS/ACE_QoS_Export.h
+++ b/ace/QoS/ACE_QoS_Export.h
@@ -9,9 +9,15 @@
#include "ace/config-all.h"
-#if !defined (ACE_QoS_HAS_DLL)
-#define ACE_QoS_HAS_DLL 1
-#endif /* ! ACE_QoS_HAS_DLL */
+#if defined (ACE_AS_STATIC_LIBS)
+# if !defined (ACE_QoS_HAS_DLL)
+# define ACE_QoS_HAS_DLL 0
+# endif /* ! ACE_QoS_HAS_DLL */
+#else
+# if !defined (ACE_QoS_HAS_DLL)
+# define ACE_QoS_HAS_DLL 1
+# endif /* ! ACE_QoS_HAS_DLL */
+#endif /* ACE_AS_STATIC_LIB */
#if defined (ACE_QoS_HAS_DLL)
# if (ACE_QoS_HAS_DLL == 1)
diff --git a/ace/QoS/ACE_QoS_Lib.dsp b/ace/QoS/ACE_QoS_Lib.dsp
index 822832a8d99..c4facd6d3cf 100644
--- a/ace/QoS/ACE_QoS_Lib.dsp
+++ b/ace/QoS/ACE_QoS_Lib.dsp
@@ -1,10 +1,10 @@
-# Microsoft Developer Studio Project File - Name="ACE_QoS_Lib" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="ACE_QoS LIB" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Static Library" 0x0104
-CFG=ACE_QoS_Lib - Win32 Debug
+CFG=ACE_QoS LIB - 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=ACE_QoS_Lib - 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 "ACE_QoS_Lib.mak" CFG="ACE_QoS_Lib - Win32 Debug"
+!MESSAGE NMAKE /f "ACE_QoS_Lib.mak" CFG="ACE_QoS LIB - Win32 Static Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "ACE_QoS_Lib - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "ACE_QoS_Lib - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "ACE_QoS LIB - Win32 Static Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "ACE_QoS LIB - Win32 Static Debug" (based on "Win32 (x86) Static Library")
!MESSAGE
# Begin Project
@@ -28,20 +28,20 @@ CFG=ACE_QoS_Lib - Win32 Debug
CPP=cl.exe
RSC=rc.exe
-!IF "$(CFG)" == "ACE_QoS_Lib - Win32 Release"
+!IF "$(CFG)" == "ACE_QoS LIB - Win32 Static Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "ACE_QoS_Lib___Win32_Release"
-# PROP BASE Intermediate_Dir "ACE_QoS_Lib___Win32_Release"
+# PROP BASE Output_Dir "Static_Release"
+# PROP BASE Intermediate_Dir "Static_Release"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "lib\Release"
-# PROP Intermediate_Dir "lib\Release"
+# PROP Output_Dir ""
+# PROP Intermediate_Dir "Static_Release"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\.." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ACE_QoS_BUILD_DLL" /Fo"DLL\Release/" /Fd"DLL\Release/" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\.." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "ACE_QoS_BUILD_DLL" /D "ACE_AS_STATIC_LIBS" /FD /c
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
@@ -49,22 +49,22 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\bin\ACE_QoSd.lib"
+# ADD LIB32 /nologo /out:"ACE_QoSs.lib"
-!ELSEIF "$(CFG)" == "ACE_QoS_Lib - Win32 Debug"
+!ELSEIF "$(CFG)" == "ACE_QoS LIB - Win32 Static Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "ACE_QoS_Lib___Win32_Debug"
-# PROP BASE Intermediate_Dir "ACE_QoS_Lib___Win32_Debug"
+# PROP BASE Output_Dir "ACE_QoS LIB___Win32_Debug"
+# PROP BASE Intermediate_Dir "ACE_QoS LIB___Win32_Debug"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "lib\Release"
-# PROP Intermediate_Dir "lib\Debug"
+# PROP Output_Dir ""
+# PROP Intermediate_Dir "Static_Debug"
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\.." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ACE_QoS_BUILD_DLL" /Fo"DLL\Debug/" /Fd"DLL\Debug/" /FD /c
+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\.." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "ACE_QoS_BUILD_DLL" /D "ACE_AS_STATIC_LIBS" /Fo"DLL\Debug/" /Fd"DLL\Debug/" /FD /c
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
@@ -72,14 +72,14 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\bin\ACE_QoS.lib"
+# ADD LIB32 /nologo /out:"ACE_QoSsd.lib"
!ENDIF
# Begin Target
-# Name "ACE_QoS_Lib - Win32 Release"
-# Name "ACE_QoS_Lib - Win32 Debug"
+# Name "ACE_QoS LIB - Win32 Static Release"
+# Name "ACE_QoS LIB - Win32 Static Debug"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"