X-Git-Url: https://granicus.if.org/sourcecode?a=blobdiff_plain;f=libhttpd.dsp;h=13a5b1da59a632238623bfad982a3b0fe8734934;hb=d0046ecbc458ed21594b4307d1d92ce7073a56be;hp=73bfdcc0d534ed1c7cbb6b79380f91140b7a74a0;hpb=f65c47bd75fb583e450fcf3f8cca5a8f12ddc5e4;p=apache diff --git a/libhttpd.dsp b/libhttpd.dsp index 73bfdcc0d5..13a5b1da59 100644 --- a/libhttpd.dsp +++ b/libhttpd.dsp @@ -43,7 +43,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MD /W3 /O2 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT" /FD /c -# ADD CPP /nologo /MD /W3 /O2 /Oy- /Zi /I "./include" /I "./srclib/apr/include" /I "./srclib/apr-util/include" /I "./srclib/pcre" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "PCRE_STATIC" /D "AP_DECLARE_EXPORT" /Fd"Release\libhttpd_cl" /FD /c +# ADD CPP /nologo /MD /W3 /O2 /Oy- /Zi /I "./include" /I "./srclib/apr/include" /I "./srclib/apr-util/include" /I "./srclib/pcre" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT" /Fd"Release\libhttpd_cl" /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "NDEBUG" @@ -53,11 +53,14 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib advapi32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll -# ADD LINK32 kernel32.lib user32.lib advapi32.lib ws2_32.lib mswsock.lib "Release\buildmark.obj" /nologo /subsystem:windows /dll /debug /base:@"os\win32\BaseAddr.ref",libhttpd.dll /opt:ref +# ADD LINK32 pcre.lib kernel32.lib user32.lib advapi32.lib ws2_32.lib mswsock.lib "Release\buildmark.obj" /nologo /subsystem:windows /dll /debug /libpath:"./srclib/pcre" /base:@"os\win32\BaseAddr.ref",libhttpd.dll /opt:ref # Begin Special Build Tool +TargetPath=.\Release\libhttpd.dll SOURCE="$(InputPath)" PreLink_Desc=Compiling buildmark -PreLink_Cmds=cl.exe /nologo /MD /W3 /O2 /I "./include" /I "./srclib/apr/include" /I "./srclib/apr-util/include" /I "./srclib/pcre" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "PCRE_STATIC" /D "AP_DECLARE_EXPORT" /Fd"Release\libhttpd" /FD /c server\buildmark.c /Fo"Release\buildmark.obj" +PreLink_Cmds=cl.exe /nologo /MD /W3 /O2 /Oy- /Zi /I "./include" /I "./srclib/apr/include" /I "./srclib/apr-util/include" /I "./srclib/pcre" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT" /Fd"Release\libhttpd" /FD /c server\buildmark.c /Fo"Release\buildmark.obj" +PostBuild_Desc=Embed .manifest +PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);2 # End Special Build Tool !ELSEIF "$(CFG)" == "libhttpd - Win32 Debug" @@ -74,7 +77,7 @@ PreLink_Cmds=cl.exe /nologo /MD /W3 /O2 /I "./include" /I "./srclib/apr/include" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MDd /W3 /EHsc /Zi /Od /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT" /FD /c -# ADD CPP /nologo /MDd /W3 /EHsc /Zi /Od /I "./include" /I "./srclib/apr/include" /I "./srclib/apr-util/include" /I "./srclib/pcre" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "PCRE_STATIC" /D "AP_DECLARE_EXPORT" /Fd"Debug\libhttpd_cl" /FD /c +# ADD CPP /nologo /MDd /W3 /EHsc /Zi /Od /I "./include" /I "./srclib/apr/include" /I "./srclib/apr-util/include" /I "./srclib/pcre" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT" /Fd"Debug\libhttpd_cl" /FD /c # ADD BASE MTL /nologo /D "_DEBUG" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "_DEBUG" @@ -84,11 +87,14 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib advapi32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /incremental:no /debug -# ADD LINK32 kernel32.lib user32.lib advapi32.lib ws2_32.lib mswsock.lib "Debug\buildmark.obj" /nologo /subsystem:windows /dll /incremental:no /debug /base:@"os\win32\BaseAddr.ref",libhttpd.dll +# ADD LINK32 pcred.lib kernel32.lib user32.lib advapi32.lib ws2_32.lib mswsock.lib "Debug\buildmark.obj" /nologo /subsystem:windows /dll /incremental:no /debug /libpath:"./srclib/pcre" /base:@"os\win32\BaseAddr.ref",libhttpd.dll # Begin Special Build Tool +TargetPath=.\Debug\libhttpd.dll SOURCE="$(InputPath)" PreLink_Desc=Compiling buildmark -PreLink_Cmds=cl.exe /nologo /MDd /W3 /GX /Zi /Od /I "./include" /I "./srclib/apr/include" /I "./srclib/apr-util/include" /I "./srclib/pcre" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "PCRE_STATIC" /D "AP_DECLARE_EXPORT" /Fd"Debug\libhttpd" /FD /c server\buildmark.c /Fo"Debug\buildmark.obj" +PreLink_Cmds=cl.exe /nologo /MDd /W3 /EHsc /Zi /Od /I "./include" /I "./srclib/apr/include" /I "./srclib/apr-util/include" /I "./srclib/pcre" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT" /Fd"Debug\libhttpd" /FD /c server\buildmark.c /Fo"Debug\buildmark.obj" +PostBuild_Desc=Embed .manifest +PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);2 # End Special Build Tool !ENDIF @@ -110,6 +116,10 @@ SOURCE=.\include\ap_config.h # End Source File # Begin Source File +SOURCE=.\include\ap_expr.h +# End Source File +# Begin Source File + SOURCE=.\include\ap_mmn.h # End Source File # Begin Source File @@ -183,32 +193,7 @@ InputPath=.\modules\generators\mod_cgi.h # End Source File # Begin Source File -SOURCE=.\modules\http\mod_core.h - -!IF "$(CFG)" == "libhttpd - Win32 Release" - -# PROP Ignore_Default_Tool 1 -# Begin Custom Build - Creating include/mod_core.h -InputPath=.\modules\http\mod_core.h - -".\include\mod_core.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - type .\modules\http\mod_core.h > .\include\mod_core.h - -# End Custom Build - -!ELSEIF "$(CFG)" == "libhttpd - Win32 Debug" - -# PROP Ignore_Default_Tool 1 -# Begin Custom Build - Creating include/mod_core.h -InputPath=.\modules\http\mod_core.h - -".\include\mod_core.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - type .\modules\http\mod_core.h > .\include\mod_core.h - -# End Custom Build - -!ENDIF - +SOURCE=.\include\mod_core.h # End Source File # Begin Source File @@ -299,16 +284,16 @@ InputPath=.\modules\proxy\mod_proxy.h # End Source File # Begin Source File -SOURCE=.\modules\mappers\mod_so.h +SOURCE=.\modules\core\mod_so.h !IF "$(CFG)" == "libhttpd - Win32 Release" # PROP Ignore_Default_Tool 1 # Begin Custom Build - Creating include/mod_so.h -InputPath=.\modules\mappers\mod_so.h +InputPath=.\modules\core\mod_so.h ".\include\mod_so.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - type .\modules\mappers\mod_so.h > .\include\mod_so.h + type .\modules\core\mod_so.h > .\include\mod_so.h # End Custom Build @@ -316,10 +301,10 @@ InputPath=.\modules\mappers\mod_so.h # PROP Ignore_Default_Tool 1 # Begin Custom Build - Creating include/mod_so.h -InputPath=.\modules\mappers\mod_so.h +InputPath=.\modules\core\mod_so.h ".\include\mod_so.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - type .\modules\mappers\mod_so.h > .\include\mod_so.h + type .\modules\core\mod_so.h > .\include\mod_so.h # End Custom Build @@ -434,7 +419,7 @@ SOURCE=.\server\vhost.c # PROP Default_Filter "" # Begin Source File -SOURCE=.\modules\mappers\mod_so.c +SOURCE=.\modules\core\mod_so.c # End Source File # Begin Source File @@ -482,10 +467,22 @@ SOURCE=.\include\util_charset.h # End Source File # Begin Source File +SOURCE=.\server\util_cookies.c +# End Source File +# Begin Source File + +SOURCE=.\server\util_cookies.h +# End Source File +# Begin Source File + SOURCE=.\include\util_ebcdic.h # End Source File # Begin Source File +SOURCE=.\server\util_expr.c +# End Source File +# Begin Source File + SOURCE=.\server\util_filter.c # End Source File # Begin Source File @@ -502,6 +499,14 @@ SOURCE=.\include\util_md5.h # End Source File # Begin Source File +SOURCE=.\server\util_mutex.c +# End Source File +# Begin Source File + +SOURCE=.\include\util_mutex.h +# End Source File +# Begin Source File + SOURCE=.\server\util_pcre.c # End Source File # Begin Source File @@ -538,10 +543,6 @@ SOURCE=.\include\ap_listen.h # End Source File # Begin Source File -SOURCE=.\include\ap_mpm.h -# End Source File -# Begin Source File - SOURCE=.\os\win32\ap_regkey.c # End Source File # Begin Source File @@ -558,35 +559,6 @@ SOURCE=.\server\listen.c # End Source File # Begin Source File -SOURCE=.\server\mpm\winnt\mpm.h - -!IF "$(CFG)" == "libhttpd - Win32 Release" - -# PROP Ignore_Default_Tool 1 -# Begin Custom Build - Creating include/mpm.h -InputPath=.\server\mpm\winnt\mpm.h - -".\include\mpm.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - type .\server\mpm\winnt\mpm.h > .\include\mpm.h - -# End Custom Build - -!ELSEIF "$(CFG)" == "libhttpd - Win32 Debug" - -# PROP Ignore_Default_Tool 1 -# Begin Custom Build - Creating include/mpm.h -InputPath=.\server\mpm\winnt\mpm.h - -".\include\mpm.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - type .\server\mpm\winnt\mpm.h > .\include\mpm.h - -# End Custom Build - -!ENDIF - -# End Source File -# Begin Source File - SOURCE=.\server\mpm_common.c # End Source File # Begin Source File