mcatan 2004/05/10 13:36:25
Modified: msvc/static static.cpp static.dsp Log: fixed msvc6 static library Revision Changes Path 1.3 +3 -1 logging-log4cxx/msvc/static/static.cpp Index: static.cpp =================================================================== RCS file: /home/cvs/logging-log4cxx/msvc/static/static.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- static.cpp 30 Apr 2004 17:36:09 -0000 1.2 +++ static.cpp 10 May 2004 20:36:25 -0000 1.3 @@ -1,3 +1,5 @@ +#include <log4cxx/config.h> +#include <log4cxx/helpers/boundedfifo.h> #include <log4cxx/asyncappender.h> #include <log4cxx/consoleappender.h> #include <log4cxx/dailyrollingfileappender.h> @@ -12,9 +14,9 @@ #include <log4cxx/helpers/appenderattachableimpl.h> #include <log4cxx/helpers/onlyonceerrorhandler.h> #include <log4cxx/net/smtpappender.h> -#include <log4cxx/net/smtpappender.h> #include <log4cxx/net/socketappender.h> #include <log4cxx/net/sockethubappender.h> +#include <log4cxx/helpers/datagramsocket.h> #include <log4cxx/net/syslogappender.h> #include <log4cxx/net/telnetappender.h> #include <log4cxx/net/xmlsocketappender.h> 1.6 +137 -2 logging-log4cxx/msvc/static/static.dsp Index: static.dsp =================================================================== RCS file: /home/cvs/logging-log4cxx/msvc/static/static.dsp,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- static.dsp 5 Apr 2004 20:55:51 -0000 1.5 +++ static.dsp 10 May 2004 20:36:25 -0000 1.6 @@ -211,6 +211,109 @@ # End Source File # Begin Source File +SOURCE=..\..\include\log4cxx\nt\EventLogCategories.mc + +!IF "$(CFG)" == "static - Win32 Release" + +# Begin Custom Build +IntDir=.\Release +TargetDir=\logging-log4cxx\msvc\Lib\Release +InputPath=..\..\include\log4cxx\nt\EventLogCategories.mc + +BuildCmds= \ + MC $(InputPath) -r $(IntDir) -h $(IntDir) \ + RC -r -fo $(IntDir)\EventLogCategories.res $(IntDir)\EventLogCategories.rc \ + LINK /subsystem:windows /INCREMENTAL:NO /dll /out:$(TargetDir)\NTEventLogAppender.dll /NOENTRY /machine:I386 $(IntDir)\EventLogCategories.res \ + + +"$(IntDir)\EventLogCategories.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + $(BuildCmds) + +"$(IntDir)\EventLogCategories.res" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + $(BuildCmds) + +"$(TargetDir)\NTEventLogAppender.dll" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + $(BuildCmds) +# End Custom Build + +!ELSEIF "$(CFG)" == "static - Win32 Debug" + +# Begin Custom Build +IntDir=.\Debug +TargetDir=\logging-log4cxx\msvc\Lib\Debug +InputPath=..\..\include\log4cxx\nt\EventLogCategories.mc + +BuildCmds= \ + MC $(InputPath) -r $(IntDir) -h $(IntDir) \ + RC -r -fo $(IntDir)\EventLogCategories.res $(IntDir)\EventLogCategories.rc \ + LINK /subsystem:windows /INCREMENTAL:NO /dll /out:$(TargetDir)\NTEventLogAppender.dll /NOENTRY /machine:I386 $(IntDir)\EventLogCategories.res \ + + +"$(IntDir)\EventLogCategories.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + $(BuildCmds) + +"$(IntDir)\EventLogCategories.res" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + $(BuildCmds) + +"$(TargetDir)\NTEventLogAppender.dll" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + $(BuildCmds) +# End Custom Build + +!ELSEIF "$(CFG)" == "static - Win32 Unicode Release" + +# Begin Custom Build +IntDir=.\Unicode_R +TargetDir=\logging-log4cxx\msvc\Lib\Unicode_R +InputPath=..\..\include\log4cxx\nt\EventLogCategories.mc + +BuildCmds= \ + MC $(InputPath) -r $(IntDir) -h $(IntDir) \ + RC -r -fo $(IntDir)\EventLogCategories.res $(IntDir)\EventLogCategories.rc \ + LINK /subsystem:windows /INCREMENTAL:NO /dll /out:$(TargetDir)\NTEventLogAppender.dll /NOENTRY /machine:I386 $(IntDir)\EventLogCategories.res \ + + +"$(IntDir)\EventLogCategories.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + $(BuildCmds) + +"$(IntDir)\EventLogCategories.res" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + $(BuildCmds) + +"$(TargetDir)\NTEventLogAppender.dll" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + $(BuildCmds) +# End Custom Build + +!ELSEIF "$(CFG)" == "static - Win32 Unicode Debug" + +# Begin Custom Build +IntDir=.\Unicode_D +TargetDir=\logging-log4cxx\msvc\Lib\Unicode_D +InputPath=..\..\include\log4cxx\nt\EventLogCategories.mc + +BuildCmds= \ + MC $(InputPath) -r $(IntDir) -h $(IntDir) \ + RC -r -fo $(IntDir)\EventLogCategories.res $(IntDir)\EventLogCategories.rc \ + LINK /subsystem:windows /INCREMENTAL:NO /dll /out:$(TargetDir)\NTEventLogAppender.dll /NOENTRY /machine:I386 $(IntDir)\EventLogCategories.res \ + + +"$(IntDir)\EventLogCategories.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + $(BuildCmds) + +"$(IntDir)\EventLogCategories.res" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + $(BuildCmds) + +"$(TargetDir)\NTEventLogAppender.dll" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + $(BuildCmds) +# End Custom Build + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=..\..\src\fallbackerrorhandler.cpp +# End Source File +# Begin Source File + SOURCE=..\..\src\fileappender.cpp # End Source File # Begin Source File @@ -255,6 +358,10 @@ # End Source File # Begin Source File +SOURCE=..\..\src\locale.cpp +# End Source File +# Begin Source File + SOURCE=..\..\src\logger.cpp # End Source File # Begin Source File @@ -327,10 +434,18 @@ # End Source File # Begin Source File +SOURCE=..\..\src\propertyresourcebundle.cpp +# End Source File +# Begin Source File + SOURCE=..\..\src\propertysetter.cpp # End Source File # Begin Source File +SOURCE=..\..\src\resourcebundle.cpp +# End Source File +# Begin Source File + SOURCE=..\..\src\rollingfileappender.cpp # End Source File # Begin Source File @@ -351,6 +466,10 @@ # End Source File # Begin Source File +SOURCE=..\..\src\simplesocketserver.cpp +# End Source File +# Begin Source File + SOURCE=..\..\src\smtpappender.cpp # End Source File # Begin Source File @@ -383,6 +502,10 @@ # End Source File # Begin Source File +SOURCE=.\static.cpp +# End Source File +# Begin Source File + SOURCE=..\..\src\stringhelper.cpp # End Source File # Begin Source File @@ -526,11 +649,11 @@ # End Source File # Begin Source File -SOURCE=..\..\include\log4cxx\helpers\gnomexml.h +SOURCE=..\..\include\log4cxx\helpers\inetaddress.h # End Source File # Begin Source File -SOURCE=..\..\include\log4cxx\helpers\inetaddress.h +SOURCE=..\..\include\log4cxx\helpers\intializationutil.h # End Source File # Begin Source File @@ -542,6 +665,10 @@ # End Source File # Begin Source File +SOURCE=..\..\include\log4cxx\helpers\locale.h +# End Source File +# Begin Source File + SOURCE=..\..\include\log4cxx\helpers\loglog.h # End Source File # Begin Source File @@ -610,6 +737,10 @@ # End Source File # Begin Source File +SOURCE=..\..\include\log4cxx\helpers\strictmath.h +# End Source File +# Begin Source File + SOURCE=..\..\include\log4cxx\helpers\stringhelper.h # End Source File # Begin Source File @@ -800,6 +931,10 @@ # Begin Source File SOURCE=..\..\include\log4cxx\config.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\log4cxx\config_msvc.h # End Source File # Begin Source File
