From: William A. Rowe Jr Date: Fri, 17 Aug 2001 03:45:35 +0000 (+0000) Subject: The purpose of this patch is to toggle the debugging mode (default) to X-Git-Tag: 2.0.24~27 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=90623070739b0ccd41e359f22a33810104894ad2;p=thirdparty%2Fapache%2Fhttpd.git The purpose of this patch is to toggle the debugging mode (default) to Program Database (from Program Database for Modify on the fly debugging). The net effect of this patch is to clean up all of the irrelevant entries associated with either the debugging or release command line switches, and generally straighten the projects as they would be exported from VC6/SP5. The outcome of this patch is that VC5 users -should- be able to load and build the workspace without any errors (as they used to have no symbols database at all, the /ZI option doesn't work, they had to use cvtdsp.pl to toggle these to /Zi.) git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90269 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/Apache.dsp b/Apache.dsp index 0965d40483f..92bcb79c02e 100644 --- a/Apache.dsp +++ b/Apache.dsp @@ -66,7 +66,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MDd /W3 /GX /ZI /Od /I "./include" /I "./os/win32" /I "./srclib/apr/include" /I "./srclib/apr-util/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c -# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I "./include" /I "./os/win32" /I "./srclib/apr/include" /I "./srclib/apr-util/include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /Fd"Debug\Apache" /FD /c +# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "./include" /I "./os/win32" /I "./srclib/apr/include" /I "./srclib/apr-util/include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /Fd"Debug\Apache" /FD /c # SUBTRACT CPP /YX # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" @@ -90,7 +90,6 @@ SOURCE=.\build\win32\Apache.ico # Begin Source File SOURCE=.\build\win32\Apache.rc - # End Source File # Begin Source File @@ -107,8 +106,7 @@ SOURCE=.\build\win32\win32ver.awk InputPath=.\build\win32\win32ver.awk ".\build\win32\Apache.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - awk -f ./build/win32/win32ver.awk Apache "Apache HTTP Server"\ - ./include/ap_release.h icon=apache.ico > .\build\win32\Apache.rc + awk -f ./build/win32/win32ver.awk Apache "Apache HTTP Server" ./include/ap_release.h icon=apache.ico > .\build\win32\Apache.rc # End Custom Build @@ -119,8 +117,7 @@ InputPath=.\build\win32\win32ver.awk InputPath=.\build\win32\win32ver.awk ".\build\win32\Apache.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - awk -f ./build/win32/win32ver.awk Apache "Apache HTTP Server"\ - ./include/ap_release.h icon=apache.ico > .\build\win32\Apache.rc + awk -f ./build/win32/win32ver.awk Apache "Apache HTTP Server" ./include/ap_release.h icon=apache.ico > .\build\win32\Apache.rc # End Custom Build diff --git a/libhttpd.dsp b/libhttpd.dsp index d8bc0f05f55..eb520dd4294 100644 --- a/libhttpd.dsp +++ b/libhttpd.dsp @@ -68,8 +68,8 @@ LINK32=link.exe # PROP Intermediate_Dir "Debug" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -# ADD BASE CPP /nologo /MDd /W3 /GX /Od /I ".\include" /I ".\srclib\apr\include" /I ".\srclib\apr-util\include" /I "./server/mpm/winnt" /I "./srclib/expat-lite" /I "./os/win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT" /FD /ZI /c -# ADD CPP /nologo /MDd /W3 /GX /Od /I ".\include" /I ".\srclib\apr\include" /I ".\srclib\apr-util\include" /I "./server/mpm/winnt" /I "./srclib/expat-lite" /I "./os/win32" /I "./modules/http" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT" /Fd"Debug\libhttpd" /FD /ZI /c +# ADD BASE CPP /nologo /MDd /W3 /GX /ZI /Od /I ".\include" /I ".\srclib\apr\include" /I ".\srclib\apr-util\include" /I "./server/mpm/winnt" /I "./srclib/expat-lite" /I "./os/win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT" /FD /c +# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I ".\include" /I ".\srclib\apr\include" /I ".\srclib\apr-util\include" /I "./server/mpm/winnt" /I "./srclib/expat-lite" /I "./os/win32" /I "./modules/http" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT" /Fd"Debug\libhttpd" /FD /c # ADD BASE MTL /nologo /D "_DEBUG" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "_DEBUG" @@ -409,15 +409,15 @@ SOURCE=.\include\ap_mpm.h # End Source File # Begin Source File -SOURCE=.\server\mpm_common.c +SOURCE=.\server\listen.c # End Source File # Begin Source File -SOURCE=.\server\listen.c +SOURCE=.\server\mpm\winnt\mpm.h # End Source File # Begin Source File -SOURCE=.\server\mpm\winnt\mpm.h +SOURCE=.\server\mpm_common.c # End Source File # Begin Source File @@ -451,7 +451,6 @@ SOURCE=.\server\mpm\winnt\service.c # Begin Source File SOURCE=.\build\win32\libhttpd.rc - # End Source File # Begin Source File @@ -464,8 +463,7 @@ SOURCE=.\build\win32\win32ver.awk InputPath=.\build\win32\win32ver.awk ".\build\win32\libhttpd.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - awk -f ./build/win32/win32ver.awk libhttpd "Apache HTTP Server Core"\ - ./include/ap_release.h > .\build\win32\libhttpd.rc + awk -f ./build/win32/win32ver.awk libhttpd "Apache HTTP Server Core" ./include/ap_release.h > .\build\win32\libhttpd.rc # End Custom Build @@ -476,8 +474,7 @@ InputPath=.\build\win32\win32ver.awk InputPath=.\build\win32\win32ver.awk ".\build\win32\libhttpd.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - awk -f ./build/win32/win32ver.awk libhttpd "Apache HTTP Server Core"\ - ./include/ap_release.h > .\build\win32\libhttpd.rc + awk -f ./build/win32/win32ver.awk libhttpd "Apache HTTP Server Core" ./include/ap_release.h > .\build\win32\libhttpd.rc # End Custom Build diff --git a/modules/aaa/mod_auth_anon.dsp b/modules/aaa/mod_auth_anon.dsp index 7e9f99beaed..5c7ae7e418e 100644 --- a/modules/aaa/mod_auth_anon.dsp +++ b/modules/aaa/mod_auth_anon.dsp @@ -52,8 +52,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /out:"Release/mod_auth_anon.so" /machine:I386 /base:@..\..\os\win32\BaseAddr.ref,mod_auth_anon -# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /out:"Release/mod_auth_anon.so" /machine:I386 /base:@..\..\os\win32\BaseAddr.ref,mod_auth_anon +# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /out:"Release/mod_auth_anon.so" /base:@..\..\os\win32\BaseAddr.ref,mod_auth_anon +# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /out:"Release/mod_auth_anon.so" /base:@..\..\os\win32\BaseAddr.ref,mod_auth_anon !ELSEIF "$(CFG)" == "mod_auth_anon - Win32 Debug" @@ -69,7 +69,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MDd /W3 /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c -# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I "..\..\include" /I "..\..\os\win32" /I "..\..\srclib\apr\include" /I "..\..\srclib\apr-util\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /Fd"Debug\mod_auth_anon" /FD /c +# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /I "..\..\srclib\apr\include" /I "..\..\srclib\apr-util\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /Fd"Debug\mod_auth_anon" /FD /c # ADD BASE MTL /nologo /D "_DEBUG" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "_DEBUG" @@ -78,8 +78,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /out:"Debug/mod_auth_anon.so" /machine:I386 /base:@..\..\os\win32\BaseAddr.ref,mod_auth_anon -# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /out:"Debug/mod_auth_anon.so" /machine:I386 /base:@..\..\os\win32\BaseAddr.ref,mod_auth_anon +# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /out:"Debug/mod_auth_anon.so" /base:@..\..\os\win32\BaseAddr.ref,mod_auth_anon +# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /out:"Debug/mod_auth_anon.so" /base:@..\..\os\win32\BaseAddr.ref,mod_auth_anon !ENDIF @@ -106,8 +106,7 @@ SOURCE=..\..\build\win32\win32ver.awk InputPath=..\..\build\win32\win32ver.awk ".\mod_auth_anon.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - awk -f ../../build/win32/win32ver.awk mod_auth_anon\ - "auth_anon_module for Apache" ../../include/ap_release.h > .\mod_auth_anon.rc + awk -f ../../build/win32/win32ver.awk mod_auth_anon "auth_anon_module for Apache" ../../include/ap_release.h > .\mod_auth_anon.rc # End Custom Build @@ -118,8 +117,7 @@ InputPath=..\..\build\win32\win32ver.awk InputPath=..\..\build\win32\win32ver.awk ".\mod_auth_anon.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - awk -f ../../build/win32/win32ver.awk mod_auth_anon\ - "auth_anon_module for Apache" ../../include/ap_release.h > .\mod_auth_anon.rc + awk -f ../../build/win32/win32ver.awk mod_auth_anon "auth_anon_module for Apache" ../../include/ap_release.h > .\mod_auth_anon.rc # End Custom Build diff --git a/modules/aaa/mod_auth_dbm.dsp b/modules/aaa/mod_auth_dbm.dsp index 62625ae18e4..7fae18bcf89 100644 --- a/modules/aaa/mod_auth_dbm.dsp +++ b/modules/aaa/mod_auth_dbm.dsp @@ -52,8 +52,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /out:"Release/mod_auth_dbm.so" /machine:I386 /base:@..\..\os\win32\BaseAddr.ref,mod_auth_dbm -# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /out:"Release/mod_auth_dbm.so" /machine:I386 /base:@..\..\os\win32\BaseAddr.ref,mod_auth_dbm +# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /out:"Release/mod_auth_dbm.so" /base:@..\..\os\win32\BaseAddr.ref,mod_auth_dbm +# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /out:"Release/mod_auth_dbm.so" /base:@..\..\os\win32\BaseAddr.ref,mod_auth_dbm !ELSEIF "$(CFG)" == "mod_auth_dbm - Win32 Debug" @@ -69,7 +69,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MDd /W3 /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c -# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I "..\..\include" /I "..\..\srclib\apr\include" /I "../../srclib/apr-util/include" /I "..\..\srclib\sdbm" /I "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_AUTH_DBM_USE_APR" /Fd"Debug\mod_auth_dbm" /FD /c +# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\srclib\apr\include" /I "../../srclib/apr-util/include" /I "..\..\srclib\sdbm" /I "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_AUTH_DBM_USE_APR" /Fd"Debug\mod_auth_dbm" /FD /c # ADD BASE MTL /nologo /D "_DEBUG" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "_DEBUG" @@ -78,8 +78,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /out:"Debug/mod_auth_dbm.so" /machine:I386 /base:@..\..\os\win32\BaseAddr.ref,mod_auth_dbm -# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /out:"Debug/mod_auth_dbm.so" /machine:I386 /base:@..\..\os\win32\BaseAddr.ref,mod_auth_dbm +# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /out:"Debug/mod_auth_dbm.so" /base:@..\..\os\win32\BaseAddr.ref,mod_auth_dbm +# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /out:"Debug/mod_auth_dbm.so" /base:@..\..\os\win32\BaseAddr.ref,mod_auth_dbm !ENDIF @@ -106,8 +106,7 @@ SOURCE=..\..\build\win32\win32ver.awk InputPath=..\..\build\win32\win32ver.awk ".\mod_auth_dbm.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - awk -f ../../build/win32/win32ver.awk mod_auth_dbm\ - "auth_dbm_module for Apache" ../../include/ap_release.h > .\mod_auth_dbm.rc + awk -f ../../build/win32/win32ver.awk mod_auth_dbm "auth_dbm_module for Apache" ../../include/ap_release.h > .\mod_auth_dbm.rc # End Custom Build @@ -118,8 +117,7 @@ InputPath=..\..\build\win32\win32ver.awk InputPath=..\..\build\win32\win32ver.awk ".\mod_auth_dbm.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - awk -f ../../build/win32/win32ver.awk mod_auth_dbm\ - "auth_dbm_module for Apache" ../../include/ap_release.h > .\mod_auth_dbm.rc + awk -f ../../build/win32/win32ver.awk mod_auth_dbm "auth_dbm_module for Apache" ../../include/ap_release.h > .\mod_auth_dbm.rc # End Custom Build diff --git a/modules/aaa/mod_auth_digest.dsp b/modules/aaa/mod_auth_digest.dsp index 8948c127698..68e73ab5d67 100644 --- a/modules/aaa/mod_auth_digest.dsp +++ b/modules/aaa/mod_auth_digest.dsp @@ -52,8 +52,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /out:"Release/mod_auth_digest.so" /machine:I386 /base:@..\..\os\win32\BaseAddr.ref,mod_auth_digest -# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /out:"Release/mod_auth_digest.so" /machine:I386 /base:@..\..\os\win32\BaseAddr.ref,mod_auth_digest +# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /out:"Release/mod_auth_digest.so" /base:@..\..\os\win32\BaseAddr.ref,mod_auth_digest +# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /out:"Release/mod_auth_digest.so" /base:@..\..\os\win32\BaseAddr.ref,mod_auth_digest !ELSEIF "$(CFG)" == "mod_auth_digest - Win32 Debug" @@ -69,7 +69,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MDd /W3 /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c -# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I "..\..\include" /I "..\..\os\win32" /I "..\..\srclib\apr\include" /I "../../srclib/apr-util/include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /Fd"Debug\mod_auth_digest" /FD /c +# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /I "..\..\srclib\apr\include" /I "../../srclib/apr-util/include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /Fd"Debug\mod_auth_digest" /FD /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL" # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL" # ADD BASE RSC /l 0x409 /d "_DEBUG" @@ -78,8 +78,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /out:"Debug/mod_auth_digest.so" /machine:I386 /base:@..\..\os\win32\BaseAddr.ref,mod_auth_digest -# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /out:"Debug/mod_auth_digest.so" /machine:I386 /base:@..\..\os\win32\BaseAddr.ref,mod_auth_digest +# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /out:"Debug/mod_auth_digest.so" /base:@..\..\os\win32\BaseAddr.ref,mod_auth_digest +# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /out:"Debug/mod_auth_digest.so" /base:@..\..\os\win32\BaseAddr.ref,mod_auth_digest !ENDIF @@ -106,8 +106,7 @@ SOURCE=..\..\build\win32\win32ver.awk InputPath=..\..\build\win32\win32ver.awk ".\mod_auth_digest.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - awk -f ../../build/win32/win32ver.awk mod_auth_digest\ - "auth_digest_module for Apache" ../../include/ap_release.h > .\mod_auth_digest.rc + awk -f ../../build/win32/win32ver.awk mod_auth_digest "auth_digest_module for Apache" ../../include/ap_release.h > .\mod_auth_digest.rc # End Custom Build @@ -118,8 +117,7 @@ InputPath=..\..\build\win32\win32ver.awk InputPath=..\..\build\win32\win32ver.awk ".\mod_auth_digest.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - awk -f ../../build/win32/win32ver.awk mod_auth_digest\ - "auth_digest_module for Apache" ../../include/ap_release.h > .\mod_auth_digest.rc + awk -f ../../build/win32/win32ver.awk mod_auth_digest "auth_digest_module for Apache" ../../include/ap_release.h > .\mod_auth_digest.rc # End Custom Build diff --git a/modules/cache/mod_file_cache.dsp b/modules/cache/mod_file_cache.dsp index bbf157154bf..5e2b5c43908 100644 --- a/modules/cache/mod_file_cache.dsp +++ b/modules/cache/mod_file_cache.dsp @@ -69,7 +69,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MDd /W3 /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c -# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I "..\..\include" /I "..\..\os\win32" /I "..\..\srclib\apr\include" /I "../../srclib/apr-util/include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /Fd"Debug\mod_file_cache" /FD /c +# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /I "..\..\srclib\apr\include" /I "../../srclib/apr-util/include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /Fd"Debug\mod_file_cache" /FD /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL" # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL" # ADD BASE RSC /l 0x409 /d "_DEBUG" @@ -106,8 +106,7 @@ SOURCE=..\..\build\win32\win32ver.awk InputPath=..\..\build\win32\win32ver.awk ".\mod_file_cache.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - awk -f ../../build/win32/win32ver.awk mod_file_cache\ - "file_cache_module for Apache" ../../include/ap_release.h > .\mod_file_cache.rc + awk -f ../../build/win32/win32ver.awk mod_file_cache "file_cache_module for Apache" ../../include/ap_release.h > .\mod_file_cache.rc # End Custom Build @@ -118,8 +117,7 @@ InputPath=..\..\build\win32\win32ver.awk InputPath=..\..\build\win32\win32ver.awk ".\mod_file_cache.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - awk -f ../../build/win32/win32ver.awk mod_file_cache\ - "file_cache_module for Apache" ../../include/ap_release.h > .\mod_file_cache.rc + awk -f ../../build/win32/win32ver.awk mod_file_cache "file_cache_module for Apache" ../../include/ap_release.h > .\mod_file_cache.rc # End Custom Build diff --git a/modules/dav/fs/mod_dav_fs.dsp b/modules/dav/fs/mod_dav_fs.dsp index 9132d88dabe..f03022b90d6 100644 --- a/modules/dav/fs/mod_dav_fs.dsp +++ b/modules/dav/fs/mod_dav_fs.dsp @@ -52,8 +52,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 kernel32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /incremental:no /map /out:"Release/mod_dav_fs.so" /machine:I386 /base:@..\..\..\os\win32\BaseAddr.ref,mod_dav_fs -# ADD LINK32 kernel32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /incremental:no /map /out:"Release/mod_dav_fs.so" /machine:I386 /base:@..\..\..\os\win32\BaseAddr.ref,mod_dav_fs +# ADD BASE LINK32 kernel32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /map /machine:I386 /out:"Release/mod_dav_fs.so" /base:@..\..\..\os\win32\BaseAddr.ref,mod_dav_fs +# ADD LINK32 kernel32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /map /machine:I386 /out:"Release/mod_dav_fs.so" /base:@..\..\..\os\win32\BaseAddr.ref,mod_dav_fs !ELSEIF "$(CFG)" == "mod_dav_fs - Win32 Debug" @@ -69,7 +69,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MDd /W3 /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c -# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I "..\main" /I "..\..\..\srclib\aputil" /I "..\..\..\srclib\sdbm" /I "..\..\..\srclib\expat-lite" /I "..\..\..\srclib\apr\include" /I "../../../srclib/apr-util/include" /I "..\..\..\include" /I "..\..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /Fd"Debug\mod_dav_fs" /FD /c +# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "..\main" /I "..\..\..\srclib\aputil" /I "..\..\..\srclib\sdbm" /I "..\..\..\srclib\expat-lite" /I "..\..\..\srclib\apr\include" /I "../../../srclib/apr-util/include" /I "..\..\..\include" /I "..\..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /Fd"Debug\mod_dav_fs" /FD /c # ADD BASE MTL /nologo /D "_DEBUG" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "_DEBUG" @@ -78,8 +78,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 kernel32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /out:"Debug/mod_dav_fs.so" /machine:I386 /base:@..\..\..\os\win32\BaseAddr.ref,mod_dav_fs -# ADD LINK32 kernel32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /out:"Debug/mod_dav_fs.so" /machine:I386 /base:@..\..\..\os\win32\BaseAddr.ref,mod_dav_fs +# ADD BASE LINK32 kernel32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /out:"Debug/mod_dav_fs.so" /base:@..\..\..\os\win32\BaseAddr.ref,mod_dav_fs +# ADD LINK32 kernel32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /out:"Debug/mod_dav_fs.so" /base:@..\..\..\os\win32\BaseAddr.ref,mod_dav_fs !ENDIF @@ -130,8 +130,7 @@ SOURCE=..\..\..\build\win32\win32ver.awk InputPath=..\..\..\build\win32\win32ver.awk ".\mod_dav_fs.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - awk -f ../../../build/win32/win32ver.awk mod_dav_fs\ - "dav_fs_module for Apache" ../../../include/ap_release.h > .\mod_dav_fs.rc + awk -f ../../../build/win32/win32ver.awk mod_dav_fs "dav_fs_module for Apache" ../../../include/ap_release.h > .\mod_dav_fs.rc # End Custom Build @@ -142,8 +141,7 @@ InputPath=..\..\..\build\win32\win32ver.awk InputPath=..\..\..\build\win32\win32ver.awk ".\mod_dav_fs.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - awk -f ../../../build/win32/win32ver.awk mod_dav_fs\ - "dav_fs_module for Apache" ../../../include/ap_release.h > .\mod_dav_fs.rc + awk -f ../../../build/win32/win32ver.awk mod_dav_fs "dav_fs_module for Apache" ../../../include/ap_release.h > .\mod_dav_fs.rc # End Custom Build diff --git a/modules/dav/main/mod_dav.dsp b/modules/dav/main/mod_dav.dsp index 4f6edb461f1..0b640193048 100644 --- a/modules/dav/main/mod_dav.dsp +++ b/modules/dav/main/mod_dav.dsp @@ -52,8 +52,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 kernel32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /incremental:no /map /out:"Release/mod_dav.so" /machine:I386 /base:@..\..\..\os\win32\BaseAddr.ref,mod_dav -# ADD LINK32 kernel32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /incremental:no /map /out:"Release/mod_dav.so" /machine:I386 /base:@..\..\..\os\win32\BaseAddr.ref,mod_dav +# ADD BASE LINK32 kernel32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /map /machine:I386 /out:"Release/mod_dav.so" /base:@..\..\..\os\win32\BaseAddr.ref,mod_dav +# ADD LINK32 kernel32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /map /machine:I386 /out:"Release/mod_dav.so" /base:@..\..\..\os\win32\BaseAddr.ref,mod_dav !ELSEIF "$(CFG)" == "mod_dav - Win32 Debug" @@ -69,7 +69,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MDd /W3 /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c -# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I "..\..\..\srclib\aputil" /I "..\..\..\srclib\sdbm" /I "..\..\..\srclib\expat-lite" /I "..\..\..\srclib\apr\include" /I "../../../srclib/apr-util/include" /I "..\..\..\include" /I "..\..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "DAV_DECLARE_EXPORT" /Fd"Debug\mod_dav" /FD /c +# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "..\..\..\srclib\aputil" /I "..\..\..\srclib\sdbm" /I "..\..\..\srclib\expat-lite" /I "..\..\..\srclib\apr\include" /I "../../../srclib/apr-util/include" /I "..\..\..\include" /I "..\..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "DAV_DECLARE_EXPORT" /Fd"Debug\mod_dav" /FD /c # ADD BASE MTL /nologo /D "_DEBUG" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "_DEBUG" @@ -78,8 +78,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 kernel32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /out:"Debug/mod_dav.so" /machine:I386 /base:@..\..\..\os\win32\BaseAddr.ref,mod_dav -# ADD LINK32 kernel32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /map /debug /out:"Debug/mod_dav.so" /machine:I386 /base:@..\..\..\os\win32\BaseAddr.ref,mod_dav +# ADD BASE LINK32 kernel32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /out:"Debug/mod_dav.so" /base:@..\..\..\os\win32\BaseAddr.ref,mod_dav +# ADD LINK32 kernel32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /map /debug /machine:I386 /out:"Debug/mod_dav.so" /base:@..\..\..\os\win32\BaseAddr.ref,mod_dav !ENDIF @@ -142,8 +142,7 @@ SOURCE=..\..\..\build\win32\win32ver.awk InputPath=..\..\..\build\win32\win32ver.awk ".\mod_dav.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - awk -f ../../../build/win32/win32ver.awk mod_dav\ - "dav_module for Apache" ../../../include/ap_release.h > .\mod_dav.rc + awk -f ../../../build/win32/win32ver.awk mod_dav "dav_module for Apache" ../../../include/ap_release.h > .\mod_dav.rc # End Custom Build @@ -154,8 +153,7 @@ InputPath=..\..\..\build\win32\win32ver.awk InputPath=..\..\..\build\win32\win32ver.awk ".\mod_dav.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - awk -f ../../../build/win32/win32ver.awk mod_dav\ - "dav_module for Apache" ../../../include/ap_release.h > .\mod_dav.rc + awk -f ../../../build/win32/win32ver.awk mod_dav "dav_module for Apache" ../../../include/ap_release.h > .\mod_dav.rc # End Custom Build diff --git a/modules/generators/mod_info.dsp b/modules/generators/mod_info.dsp index e34fdb8ae38..66c362b6fec 100644 --- a/modules/generators/mod_info.dsp +++ b/modules/generators/mod_info.dsp @@ -52,8 +52,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /out:"Release/mod_info.so" /machine:I386 /base:@..\..\os\win32\BaseAddr.ref,mod_info -# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /out:"Release/mod_info.so" /machine:I386 /base:@..\..\os\win32\BaseAddr.ref,mod_info +# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /out:"Release/mod_info.so" /base:@..\..\os\win32\BaseAddr.ref,mod_info +# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /out:"Release/mod_info.so" /base:@..\..\os\win32\BaseAddr.ref,mod_info !ELSEIF "$(CFG)" == "mod_info - Win32 Debug" @@ -69,7 +69,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MDd /W3 /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c -# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I "..\..\include" /I "..\..\os\win32" /I "..\..\srclib\apr\include" /I "../../srclib/apr-util/include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /Fd"Debug\mod_info" /FD /c +# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /I "..\..\srclib\apr\include" /I "../../srclib/apr-util/include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /Fd"Debug\mod_info" /FD /c # ADD BASE MTL /nologo /D "_DEBUG" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "_DEBUG" @@ -78,8 +78,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /out:"Debug/mod_info.so" /machine:I386 /base:@..\..\os\win32\BaseAddr.ref,mod_info -# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /out:"Debug/mod_info.so" /machine:I386 /base:@..\..\os\win32\BaseAddr.ref,mod_info +# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /out:"Debug/mod_info.so" /base:@..\..\os\win32\BaseAddr.ref,mod_info +# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /out:"Debug/mod_info.so" /base:@..\..\os\win32\BaseAddr.ref,mod_info !ENDIF @@ -106,8 +106,7 @@ SOURCE=..\..\build\win32\win32ver.awk InputPath=..\..\build\win32\win32ver.awk ".\mod_info.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - awk -f ../../build/win32/win32ver.awk mod_info\ - "info_module for Apache" ../../include/ap_release.h > .\mod_info.rc + awk -f ../../build/win32/win32ver.awk mod_info "info_module for Apache" ../../include/ap_release.h > .\mod_info.rc # End Custom Build @@ -118,8 +117,7 @@ InputPath=..\..\build\win32\win32ver.awk InputPath=..\..\build\win32\win32ver.awk ".\mod_info.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - awk -f ../../build/win32/win32ver.awk mod_info\ - "info_module for Apache" ../../include/ap_release.h > .\mod_info.rc + awk -f ../../build/win32/win32ver.awk mod_info "info_module for Apache" ../../include/ap_release.h > .\mod_info.rc # End Custom Build diff --git a/modules/generators/mod_status.dsp b/modules/generators/mod_status.dsp index b62a0eb3dfa..0b8d88cfdc4 100644 --- a/modules/generators/mod_status.dsp +++ b/modules/generators/mod_status.dsp @@ -69,7 +69,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MDd /W3 /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c -# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I "..\..\include" /I "..\..\os\win32" /I "..\..\srclib\apr\include" /I "../../srclib/apr-util/include" /I "../../server/mpm/winnt" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /Fd"Debug\mod_status" /FD /c +# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /I "..\..\srclib\apr\include" /I "../../srclib/apr-util/include" /I "../../server/mpm/winnt" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /Fd"Debug\mod_status" /FD /c # ADD BASE MTL /nologo /D "_DEBUG" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "_DEBUG" @@ -106,8 +106,7 @@ SOURCE=..\..\build\win32\win32ver.awk InputPath=..\..\build\win32\win32ver.awk ".\mod_status.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - awk -f ../../build/win32/win32ver.awk mod_status\ - "status_module for Apache" ../../include/ap_release.h > .\mod_status.rc + awk -f ../../build/win32/win32ver.awk mod_status "status_module for Apache" ../../include/ap_release.h > .\mod_status.rc # End Custom Build @@ -118,8 +117,7 @@ InputPath=..\..\build\win32\win32ver.awk InputPath=..\..\build\win32\win32ver.awk ".\mod_status.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - awk -f ../../build/win32/win32ver.awk mod_status\ - "status_module for Apache" ../../include/ap_release.h > .\mod_status.rc + awk -f ../../build/win32/win32ver.awk mod_status "status_module for Apache" ../../include/ap_release.h > .\mod_status.rc # End Custom Build diff --git a/modules/mappers/mod_rewrite.dsp b/modules/mappers/mod_rewrite.dsp index 94a7e37fdd3..79dad302344 100644 --- a/modules/mappers/mod_rewrite.dsp +++ b/modules/mappers/mod_rewrite.dsp @@ -52,8 +52,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /out:"Release/mod_rewrite.so" /machine:I386 /base:@..\..\os\win32\BaseAddr.ref,mod_rewrite -# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /out:"Release/mod_rewrite.so" /machine:I386 /base:@..\..\os\win32\BaseAddr.ref,mod_rewrite +# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /out:"Release/mod_rewrite.so" /base:@..\..\os\win32\BaseAddr.ref,mod_rewrite +# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /out:"Release/mod_rewrite.so" /base:@..\..\os\win32\BaseAddr.ref,mod_rewrite !ELSEIF "$(CFG)" == "mod_rewrite - Win32 Debug" @@ -69,7 +69,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MDd /W3 /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c -# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I "..\..\include" /I "..\..\os\win32" /I "..\..\srclib\apr\include" /I "../../srclib/apr-util/include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "NO_DBM_REWRITEMAP" /Fd"Debug\mod_rewrite" /FD /c +# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /I "..\..\srclib\apr\include" /I "../../srclib/apr-util/include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "NO_DBM_REWRITEMAP" /Fd"Debug\mod_rewrite" /FD /c # ADD BASE MTL /nologo /D "_DEBUG" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "_DEBUG" @@ -78,8 +78,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /out:"Debug/mod_rewrite.so" /machine:I386 /base:@..\..\os\win32\BaseAddr.ref,mod_rewrite -# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /out:"Debug/mod_rewrite.so" /machine:I386 /base:@..\..\os\win32\BaseAddr.ref,mod_rewrite +# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /out:"Debug/mod_rewrite.so" /base:@..\..\os\win32\BaseAddr.ref,mod_rewrite +# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /out:"Debug/mod_rewrite.so" /base:@..\..\os\win32\BaseAddr.ref,mod_rewrite !ENDIF @@ -106,8 +106,7 @@ SOURCE=..\..\build\win32\win32ver.awk InputPath=..\..\build\win32\win32ver.awk ".\mod_rewrite.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - awk -f ../../build/win32/win32ver.awk mod_rewrite\ - "rewrite_module for Apache" ../../include/ap_release.h > .\mod_rewrite.rc + awk -f ../../build/win32/win32ver.awk mod_rewrite "rewrite_module for Apache" ../../include/ap_release.h > .\mod_rewrite.rc # End Custom Build @@ -118,8 +117,7 @@ InputPath=..\..\build\win32\win32ver.awk InputPath=..\..\build\win32\win32ver.awk ".\mod_rewrite.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - awk -f ../../build/win32/win32ver.awk mod_rewrite\ - "rewrite_module for Apache" ../../include/ap_release.h > .\mod_rewrite.rc + awk -f ../../build/win32/win32ver.awk mod_rewrite "rewrite_module for Apache" ../../include/ap_release.h > .\mod_rewrite.rc # End Custom Build diff --git a/modules/mappers/mod_speling.dsp b/modules/mappers/mod_speling.dsp index b59b2e3ac4c..70cfb197e07 100644 --- a/modules/mappers/mod_speling.dsp +++ b/modules/mappers/mod_speling.dsp @@ -52,8 +52,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /out:"Release/mod_speling.so" /machine:I386 /base:@..\..\os\win32\BaseAddr.ref,mod_speling -# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /out:"Release/mod_speling.so" /machine:I386 /base:@..\..\os\win32\BaseAddr.ref,mod_speling +# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /out:"Release/mod_speling.so" /base:@..\..\os\win32\BaseAddr.ref,mod_speling +# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /out:"Release/mod_speling.so" /base:@..\..\os\win32\BaseAddr.ref,mod_speling !ELSEIF "$(CFG)" == "mod_speling - Win32 Debug" @@ -69,7 +69,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MDd /W3 /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c -# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I "..\..\include" /I "..\..\os\win32" /I "..\..\srclib\apr\include" /I "../../srclib/apr-util/include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /Fd"Debug\mod_speling" /FD /c +# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /I "..\..\srclib\apr\include" /I "../../srclib/apr-util/include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /Fd"Debug\mod_speling" /FD /c # ADD BASE MTL /nologo /D "_DEBUG" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "_DEBUG" @@ -78,8 +78,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /out:"Debug/mod_speling.so" /machine:I386 /base:@..\..\os\win32\BaseAddr.ref,mod_speling -# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /out:"Debug/mod_speling.so" /machine:I386 /base:@..\..\os\win32\BaseAddr.ref,mod_speling +# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /out:"Debug/mod_speling.so" /base:@..\..\os\win32\BaseAddr.ref,mod_speling +# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /out:"Debug/mod_speling.so" /base:@..\..\os\win32\BaseAddr.ref,mod_speling !ENDIF @@ -106,8 +106,7 @@ SOURCE=..\..\build\win32\win32ver.awk InputPath=..\..\build\win32\win32ver.awk ".\mod_speling.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - awk -f ../../build/win32/win32ver.awk mod_speling\ - "speling_module for Apache" ../../include/ap_release.h > .\mod_speling.rc + awk -f ../../build/win32/win32ver.awk mod_speling "speling_module for Apache" ../../include/ap_release.h > .\mod_speling.rc # End Custom Build @@ -118,8 +117,7 @@ InputPath=..\..\build\win32\win32ver.awk InputPath=..\..\build\win32\win32ver.awk ".\mod_speling.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - awk -f ../../build/win32/win32ver.awk mod_speling\ - "speling_module for Apache" ../../include/ap_release.h > .\mod_speling.rc + awk -f ../../build/win32/win32ver.awk mod_speling "speling_module for Apache" ../../include/ap_release.h > .\mod_speling.rc # End Custom Build diff --git a/modules/metadata/mod_cern_meta.dsp b/modules/metadata/mod_cern_meta.dsp index 6cd91c0e184..c3eead74c26 100644 --- a/modules/metadata/mod_cern_meta.dsp +++ b/modules/metadata/mod_cern_meta.dsp @@ -52,8 +52,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /out:"Release/mod_cern_meta.so" /machine:I386 /base:@..\..\os\win32\BaseAddr.ref,mod_cern_meta -# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /out:"Release/mod_cern_meta.so" /machine:I386 /base:@..\..\os\win32\BaseAddr.ref,mod_cern_meta +# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /out:"Release/mod_cern_meta.so" /base:@..\..\os\win32\BaseAddr.ref,mod_cern_meta +# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /out:"Release/mod_cern_meta.so" /base:@..\..\os\win32\BaseAddr.ref,mod_cern_meta !ELSEIF "$(CFG)" == "mod_cern_meta - Win32 Debug" @@ -69,7 +69,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MDd /W3 /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c -# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I "..\..\include" /I "..\..\os\win32" /I "..\..\srclib\apr\include" /I "../../srclib/apr-util/include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /Fd"Debug\mod_cern_meta" /FD /c +# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /I "..\..\srclib\apr\include" /I "../../srclib/apr-util/include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /Fd"Debug\mod_cern_meta" /FD /c # ADD BASE MTL /nologo /D "_DEBUG" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "_DEBUG" @@ -78,8 +78,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /out:"Debug/mod_cern_meta.so" /machine:I386 /base:@..\..\os\win32\BaseAddr.ref,mod_cern_meta -# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /out:"Debug/mod_cern_meta.so" /machine:I386 /base:@..\..\os\win32\BaseAddr.ref,mod_cern_meta +# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /out:"Debug/mod_cern_meta.so" /base:@..\..\os\win32\BaseAddr.ref,mod_cern_meta +# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /out:"Debug/mod_cern_meta.so" /base:@..\..\os\win32\BaseAddr.ref,mod_cern_meta !ENDIF @@ -106,8 +106,7 @@ SOURCE=..\..\build\win32\win32ver.awk InputPath=..\..\build\win32\win32ver.awk ".\mod_cern_meta.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - awk -f ../../build/win32/win32ver.awk mod_cern_meta\ - "cern_meta_module for Apache" ../../include/ap_release.h > .\mod_cern_meta.rc + awk -f ../../build/win32/win32ver.awk mod_cern_meta "cern_meta_module for Apache" ../../include/ap_release.h > .\mod_cern_meta.rc # End Custom Build @@ -118,8 +117,7 @@ InputPath=..\..\build\win32\win32ver.awk InputPath=..\..\build\win32\win32ver.awk ".\mod_cern_meta.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - awk -f ../../build/win32/win32ver.awk mod_cern_meta\ - "cern_meta_module for Apache" ../../include/ap_release.h > .\mod_cern_meta.rc + awk -f ../../build/win32/win32ver.awk mod_cern_meta "cern_meta_module for Apache" ../../include/ap_release.h > .\mod_cern_meta.rc # End Custom Build diff --git a/modules/metadata/mod_expires.dsp b/modules/metadata/mod_expires.dsp index d8705694ff1..f691021627b 100644 --- a/modules/metadata/mod_expires.dsp +++ b/modules/metadata/mod_expires.dsp @@ -52,8 +52,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /out:"Release/mod_expires.so" /machine:I386 /base:@..\..\os\win32\BaseAddr.ref,mod_expires -# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /out:"Release/mod_expires.so" /machine:I386 /base:@..\..\os\win32\BaseAddr.ref,mod_expires +# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /out:"Release/mod_expires.so" /base:@..\..\os\win32\BaseAddr.ref,mod_expires +# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /out:"Release/mod_expires.so" /base:@..\..\os\win32\BaseAddr.ref,mod_expires !ELSEIF "$(CFG)" == "mod_expires - Win32 Debug" @@ -69,7 +69,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MDd /W3 /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c -# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I "..\..\include" /I "..\..\os\win32" /I "..\..\srclib\apr\include" /I "../../srclib/apr-util/include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /Fd"Debug\mod_expires" /FD /c +# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /I "..\..\srclib\apr\include" /I "../../srclib/apr-util/include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /Fd"Debug\mod_expires" /FD /c # ADD BASE MTL /nologo /D "_DEBUG" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "_DEBUG" @@ -78,8 +78,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /out:"Debug/mod_expires.so" /machine:I386 /base:@..\..\os\win32\BaseAddr.ref,mod_expires -# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /out:"Debug/mod_expires.so" /machine:I386 /base:@..\..\os\win32\BaseAddr.ref,mod_expires +# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /out:"Debug/mod_expires.so" /base:@..\..\os\win32\BaseAddr.ref,mod_expires +# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /out:"Debug/mod_expires.so" /base:@..\..\os\win32\BaseAddr.ref,mod_expires !ENDIF @@ -106,8 +106,7 @@ SOURCE=..\..\build\win32\win32ver.awk InputPath=..\..\build\win32\win32ver.awk ".\mod_expires.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - awk -f ../../build/win32/win32ver.awk mod_expires\ - "expires_module for Apache" ../../include/ap_release.h > .\mod_expires.rc + awk -f ../../build/win32/win32ver.awk mod_expires "expires_module for Apache" ../../include/ap_release.h > .\mod_expires.rc # End Custom Build @@ -118,8 +117,7 @@ InputPath=..\..\build\win32\win32ver.awk InputPath=..\..\build\win32\win32ver.awk ".\mod_expires.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - awk -f ../../build/win32/win32ver.awk mod_expires\ - "expires_module for Apache" ../../include/ap_release.h > .\mod_expires.rc + awk -f ../../build/win32/win32ver.awk mod_expires "expires_module for Apache" ../../include/ap_release.h > .\mod_expires.rc # End Custom Build diff --git a/modules/metadata/mod_headers.dsp b/modules/metadata/mod_headers.dsp index 02017b29202..af7fe4bdbe8 100644 --- a/modules/metadata/mod_headers.dsp +++ b/modules/metadata/mod_headers.dsp @@ -52,8 +52,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /out:"Release/mod_headers.so" /machine:I386 /base:@..\..\os\win32\BaseAddr.ref,mod_headers -# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /out:"Release/mod_headers.so" /machine:I386 /base:@..\..\os\win32\BaseAddr.ref,mod_headers +# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /out:"Release/mod_headers.so" /base:@..\..\os\win32\BaseAddr.ref,mod_headers +# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /out:"Release/mod_headers.so" /base:@..\..\os\win32\BaseAddr.ref,mod_headers !ELSEIF "$(CFG)" == "mod_headers - Win32 Debug" @@ -69,7 +69,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MDd /W3 /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c -# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I "..\..\include" /I "..\..\os\win32" /I "..\..\srclib\apr\include" /I "../../srclib/apr-util/include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /Fd"Debug\mod_headers" /FD /c +# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /I "..\..\srclib\apr\include" /I "../../srclib/apr-util/include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /Fd"Debug\mod_headers" /FD /c # ADD BASE MTL /nologo /D "_DEBUG" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "_DEBUG" @@ -78,8 +78,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /out:"Debug/mod_headers.so" /machine:I386 /base:@..\..\os\win32\BaseAddr.ref,mod_headers -# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /out:"Debug/mod_headers.so" /machine:I386 /base:@..\..\os\win32\BaseAddr.ref,mod_headers +# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /out:"Debug/mod_headers.so" /base:@..\..\os\win32\BaseAddr.ref,mod_headers +# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /out:"Debug/mod_headers.so" /base:@..\..\os\win32\BaseAddr.ref,mod_headers !ENDIF @@ -106,9 +106,7 @@ SOURCE=..\..\build\win32\win32ver.awk InputPath=..\..\build\win32\win32ver.awk ".\mod_headers.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - awk -f ../../build/win32/win32ver.awk mod_headers\ - "headers_module for Apache" ../../include/ap_release.h\ -> .\mod_headers.rc + awk -f ../../build/win32/win32ver.awk mod_headers "headers_module for Apache" ../../include/ap_release.h > .\mod_headers.rc # End Custom Build @@ -119,9 +117,7 @@ InputPath=..\..\build\win32\win32ver.awk InputPath=..\..\build\win32\win32ver.awk ".\mod_headers.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - awk -f ../../build/win32/win32ver.awk mod_headers\ - "headers_module for Apache" ../../include/ap_release.h\ - > .\mod_headers.rc + awk -f ../../build/win32/win32ver.awk mod_headers "headers_module for Apache" ../../include/ap_release.h > .\mod_headers.rc # End Custom Build diff --git a/modules/metadata/mod_usertrack.dsp b/modules/metadata/mod_usertrack.dsp index 9dd99dff817..4b79d894b23 100644 --- a/modules/metadata/mod_usertrack.dsp +++ b/modules/metadata/mod_usertrack.dsp @@ -52,8 +52,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /out:"Release/mod_usertrack.so" /machine:I386 /base:@..\..\os\win32\BaseAddr.ref,mod_usertrack -# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /out:"Release/mod_usertrack.so" /machine:I386 /base:@..\..\os\win32\BaseAddr.ref,mod_usertrack +# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /out:"Release/mod_usertrack.so" /base:@..\..\os\win32\BaseAddr.ref,mod_usertrack +# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /out:"Release/mod_usertrack.so" /base:@..\..\os\win32\BaseAddr.ref,mod_usertrack !ELSEIF "$(CFG)" == "mod_usertrack - Win32 Debug" @@ -69,7 +69,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MDd /W3 /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c -# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I "..\..\include" /I "..\..\os\win32" /I "..\..\srclib\apr\include" /I "../../srclib/apr-util/include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /Fd"Debug\mod_usertrack" /FD /c +# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /I "..\..\srclib\apr\include" /I "../../srclib/apr-util/include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /Fd"Debug\mod_usertrack" /FD /c # ADD BASE MTL /nologo /D "_DEBUG" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "_DEBUG" @@ -78,8 +78,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /out:"Debug/mod_usertrack.so" /machine:I386 /base:@..\..\os\win32\BaseAddr.ref,mod_usertrack -# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /out:"Debug/mod_usertrack.so" /machine:I386 /base:@..\..\os\win32\BaseAddr.ref,mod_usertrack +# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /out:"Debug/mod_usertrack.so" /base:@..\..\os\win32\BaseAddr.ref,mod_usertrack +# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /out:"Debug/mod_usertrack.so" /base:@..\..\os\win32\BaseAddr.ref,mod_usertrack !ENDIF @@ -106,9 +106,7 @@ SOURCE=..\..\build\win32\win32ver.awk InputPath=..\..\build\win32\win32ver.awk ".\mod_usertrack.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - awk -f ../../build/win32/win32ver.awk mod_usertrack\ - "usertrack_module for Apache" ../../include/ap_release.h\ - > .\mod_usertrack.rc + awk -f ../../build/win32/win32ver.awk mod_usertrack "usertrack_module for Apache" ../../include/ap_release.h > .\mod_usertrack.rc # End Custom Build @@ -119,9 +117,7 @@ InputPath=..\..\build\win32\win32ver.awk InputPath=..\..\build\win32\win32ver.awk ".\mod_usertrack.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - awk -f ../../build/win32/win32ver.awk mod_usertrack\ - "usertrack_module for Apache" ../../include/ap_release.h\ - > .\mod_usertrack.rc + awk -f ../../build/win32/win32ver.awk mod_usertrack "usertrack_module for Apache" ../../include/ap_release.h > .\mod_usertrack.rc # End Custom Build diff --git a/modules/ssl/mod_ssl.dsp b/modules/ssl/mod_ssl.dsp index 7ad8e5a5112..560bfaf6b4e 100644 --- a/modules/ssl/mod_ssl.dsp +++ b/modules/ssl/mod_ssl.dsp @@ -52,8 +52,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /out:"Release/mod_ssl.so" /machine:I386 /base:@..\..\os\win32\BaseAddr.ref,mod_ssl -# ADD LINK32 kernel32.lib ssleay32.lib libeay32.lib /nologo /libpath:"../../srclib/openssl/out32dll" /subsystem:windows /dll /incremental:no /map /out:"Release/mod_ssl.so" /machine:I386 /base:@..\..\os\win32\BaseAddr.ref,mod_ssl +# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /out:"Release/mod_ssl.so" /base:@..\..\os\win32\BaseAddr.ref,mod_ssl +# ADD LINK32 kernel32.lib ssleay32.lib libeay32.lib /nologo /subsystem:windows /dll /map /machine:I386 /out:"Release/mod_ssl.so" /libpath:"../../srclib/openssl/out32dll" /base:@..\..\os\win32\BaseAddr.ref,mod_ssl !ELSEIF "$(CFG)" == "mod_ssl - Win32 Debug" @@ -69,7 +69,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MDd /W3 /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c -# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I "../../include" /I "../../os/win32" /I "../../server/mpm/winnt" /I "../../srclib/apr/include" /I "../../srclib/apr-util/include" /I "../../srclib/openssl/inc32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "NOCRYPT" /Fd"Debug\mod_ssl" /FD /c +# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "../../include" /I "../../os/win32" /I "../../server/mpm/winnt" /I "../../srclib/apr/include" /I "../../srclib/apr-util/include" /I "../../srclib/openssl/inc32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "NOCRYPT" /Fd"Debug\mod_ssl" /FD /c # ADD BASE MTL /nologo /D "_DEBUG" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "_DEBUG" @@ -78,8 +78,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /out:"Debug/mod_ssl.so" /machine:I386 /base:@..\..\os\win32\BaseAddr.ref,mod_ssl -# ADD LINK32 kernel32.lib ssleay32.lib libeay32.lib /nologo /libpath:"../../srclib/openssl/out32dll.dbg" /subsystem:windows /dll /incremental:no /map /debug /out:"Debug/mod_ssl.so" /machine:I386 /base:@..\..\os\win32\BaseAddr.ref,mod_ssl +# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /out:"Debug/mod_ssl.so" /base:@..\..\os\win32\BaseAddr.ref,mod_ssl +# ADD LINK32 kernel32.lib ssleay32.lib libeay32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /out:"Debug/mod_ssl.so" /libpath:"../../srclib/openssl/out32dll.dbg" /base:@..\..\os\win32\BaseAddr.ref,mod_ssl !ENDIF @@ -216,7 +216,7 @@ SOURCE=.\ssl_util_table.h # PROP Default_Filter "" # Begin Source File -SOURCE=.\ssl_expr_parse.y .\ssl_expr_parse.h +SOURCE=.\ssl_expr_parse.y !IF "$(CFG)" == "mod_ssl - Win32 Release" @@ -225,9 +225,7 @@ InputPath=.\ssl_expr_parse.y BuildCmds= \ bison -y -d ssl_expr_parse.y \ - sed -e "s;yy;ssl_expr_yy;g" -e\ - "/#if defined(c_plusplus) || defined(__cplusplus)/,/#endif/d" ssl_expr_parse.c \ + sed -e "s;yy;ssl_expr_yy;g" -e "/#if defined(c_plusplus) || defined(__cplusplus)/,/#endif/d" ssl_expr_parse.c \ del y.tab.c \ sed -e "s;yy;ssl_expr_yy;g" ssl_expr_parse.h \ del y.tab.h \ @@ -247,9 +245,7 @@ InputPath=.\ssl_expr_parse.y BuildCmds= \ bison -y -d ssl_expr_parse.y \ - sed -e "s;yy;ssl_expr_yy;g" -e\ - "/#if defined(c_plusplus) || defined(__cplusplus)/,/#endif/d" ssl_expr_parse.c \ + sed -e "s;yy;ssl_expr_yy;g" -e "/#if defined(c_plusplus) || defined(__cplusplus)/,/#endif/d" ssl_expr_parse.c \ del y.tab.c \ sed -e "s;yy;ssl_expr_yy;g" ssl_expr_parse.h \ del y.tab.h \ @@ -314,8 +310,7 @@ SOURCE=..\..\build\win32\win32ver.awk InputPath=..\..\build\win32\win32ver.awk ".\mod_ssl.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - awk -f ../../build/win32/win32ver.awk mod_ssl\ - "ssl_module for Apache" ../../include/ap_release.h > .\mod_ssl.rc + awk -f ../../build/win32/win32ver.awk mod_ssl "ssl_module for Apache" ../../include/ap_release.h > .\mod_ssl.rc # End Custom Build @@ -326,8 +321,7 @@ InputPath=..\..\build\win32\win32ver.awk InputPath=..\..\build\win32\win32ver.awk ".\mod_ssl.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - awk -f ../../build/win32/win32ver.awk mod_ssl\ - "ssl_module for Apache" ../../include/ap_release.h > .\mod_ssl.rc + awk -f ../../build/win32/win32ver.awk mod_ssl "ssl_module for Apache" ../../include/ap_release.h > .\mod_ssl.rc # End Custom Build diff --git a/modules/tls/mod_tls.dsp b/modules/tls/mod_tls.dsp index c04fe5531de..e224e264b34 100644 --- a/modules/tls/mod_tls.dsp +++ b/modules/tls/mod_tls.dsp @@ -52,8 +52,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /out:"Release/mod_tls.so" /machine:I386 /base:@..\..\os\win32\BaseAddr.ref,mod_tls -# ADD LINK32 kernel32.lib ssleay32.lib libeay32.lib /nologo /libpath:"../../srclib/openssl/out32dll" /subsystem:windows /dll /incremental:no /map /out:"Release/mod_tls.so" /machine:I386 /base:@..\..\os\win32\BaseAddr.ref,mod_tls +# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /out:"Release/mod_tls.so" /base:@..\..\os\win32\BaseAddr.ref,mod_tls +# ADD LINK32 kernel32.lib ssleay32.lib libeay32.lib /nologo /subsystem:windows /dll /map /machine:I386 /out:"Release/mod_tls.so" /libpath:"../../srclib/openssl/out32dll" /base:@..\..\os\win32\BaseAddr.ref,mod_tls !ELSEIF "$(CFG)" == "mod_tls - Win32 Debug" @@ -69,7 +69,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MDd /W3 /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c -# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I "../../include" /I "../../os/win32" /I "../../srclib/apr/include" /I "../../srclib/apr-util/include" /I "../../srclib/openssl/inc32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /Fd"Debug\mod_tls" /FD /c +# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "../../include" /I "../../os/win32" /I "../../srclib/apr/include" /I "../../srclib/apr-util/include" /I "../../srclib/openssl/inc32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /Fd"Debug\mod_tls" /FD /c # ADD BASE MTL /nologo /D "_DEBUG" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "_DEBUG" @@ -78,8 +78,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /out:"Debug/mod_tls.so" /machine:I386 /base:@..\..\os\win32\BaseAddr.ref,mod_tls -# ADD LINK32 kernel32.lib ssleay32.lib libeay32.lib /nologo /libpath:"../../srclib/openssl/out32dll.dbg" /subsystem:windows /dll /incremental:no /map /debug /out:"Debug/mod_tls.so" /machine:I386 /base:@..\..\os\win32\BaseAddr.ref,mod_tls +# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /out:"Debug/mod_tls.so" /base:@..\..\os\win32\BaseAddr.ref,mod_tls +# ADD LINK32 kernel32.lib ssleay32.lib libeay32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /out:"Debug/mod_tls.so" /libpath:"../../srclib/openssl/out32dll.dbg" /base:@..\..\os\win32\BaseAddr.ref,mod_tls !ENDIF @@ -93,15 +93,15 @@ SOURCE=.\mod_tls.c # End Source File # Begin Source File -SOURCE=.\openssl_state_machine.c +SOURCE=.\mod_tls.rc # End Source File # Begin Source File -SOURCE=.\openssl_state_machine.h +SOURCE=.\openssl_state_machine.c # End Source File # Begin Source File -SOURCE=.\mod_tls.rc +SOURCE=.\openssl_state_machine.h # End Source File # Begin Source File @@ -114,8 +114,7 @@ SOURCE=..\..\build\win32\win32ver.awk InputPath=..\..\build\win32\win32ver.awk ".\mod_tls.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - awk -f ../../build/win32/win32ver.awk mod_tls\ - "tls_module for Apache" ../../include/ap_release.h > .\mod_tls.rc + awk -f ../../build/win32/win32ver.awk mod_tls "tls_module for Apache" ../../include/ap_release.h > .\mod_tls.rc # End Custom Build @@ -126,8 +125,7 @@ InputPath=..\..\build\win32\win32ver.awk InputPath=..\..\build\win32\win32ver.awk ".\mod_tls.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - awk -f ../../build/win32/win32ver.awk mod_tls\ - "tls_module for Apache" ../../include/ap_release.h > .\mod_tls.rc + awk -f ../../build/win32/win32ver.awk mod_tls "tls_module for Apache" ../../include/ap_release.h > .\mod_tls.rc # End Custom Build diff --git a/server/gen_test_char.dsp b/server/gen_test_char.dsp index 26c12386dbb..8a9a4dc5733 100644 --- a/server/gen_test_char.dsp +++ b/server/gen_test_char.dsp @@ -49,8 +49,10 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 kernel32.lib /nologo /subsystem:console /incremental:no /pdb:"Release\gen_test_char.pdb" /machine:I386 -# ADD LINK32 kernel32.lib /nologo /subsystem:console /incremental:no /pdb:"Release\gen_test_char.pdb" /machine:I386 +# ADD BASE LINK32 kernel32.lib /nologo /subsystem:console /pdb:"Release\gen_test_char.pdb" /machine:I386 +# SUBTRACT BASE LINK32 /pdb:none +# ADD LINK32 kernel32.lib /nologo /subsystem:console /pdb:"Release\gen_test_char.pdb" /machine:I386 +# SUBTRACT LINK32 /pdb:none !ELSEIF "$(CFG)" == "gen_test_char - Win32 Debug" @@ -66,7 +68,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MDd /W3 /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c -# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I "..\include" /I "..\srclib\apr\include" /I "..\srclib\apr-util\include" /I "..\os\win32" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Fd"Debug\gen_test_char" /FD /c +# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "..\include" /I "..\srclib\apr\include" /I "..\srclib\apr-util\include" /I "..\os\win32" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Fd"Debug\gen_test_char" /FD /c # ADD BASE RSC /l 0x809 /d "_DEBUG" # ADD RSC /l 0x809 /d "_DEBUG" BSC32=bscmake.exe @@ -74,7 +76,9 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib /nologo /subsystem:console /incremental:no /pdb:"Debug\gen_test_char.pdb" /debug /machine:I386 /pdbtype:sept +# SUBTRACT BASE LINK32 /pdb:none # ADD LINK32 kernel32.lib /nologo /subsystem:console /incremental:no /pdb:"Debug\gen_test_char.pdb" /debug /machine:I386 +# SUBTRACT LINK32 /pdb:none !ENDIF diff --git a/srclib/pcre/dftables.dsp b/srclib/pcre/dftables.dsp index 744ae5c0451..7d83a859385 100644 --- a/srclib/pcre/dftables.dsp +++ b/srclib/pcre/dftables.dsp @@ -49,8 +49,10 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 kernel32.lib /nologo /subsystem:console /incremental:no /pdb:"Release\dftables.pdb" /map /machine:I386 -# ADD LINK32 kernel32.lib /nologo /subsystem:console /incremental:no /pdb:"Release\dftables.pdb" /map /machine:I386 +# ADD BASE LINK32 kernel32.lib /nologo /subsystem:console /pdb:"Release\dftables.pdb" /map /machine:I386 +# SUBTRACT BASE LINK32 /pdb:none +# ADD LINK32 kernel32.lib /nologo /subsystem:console /pdb:"Release\dftables.pdb" /map /machine:I386 +# SUBTRACT LINK32 /pdb:none !ELSEIF "$(CFG)" == "dftables - Win32 Debug" @@ -66,7 +68,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MDd /W3 /GX /ZI /Od /D "_WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Fd"Debug\dftables" /FD /c -# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /D "_WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Fd"Debug\dftables" /FD /c +# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /D "_WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Fd"Debug\dftables" /FD /c # ADD BASE RSC /l 0x809 /d "_DEBUG" # ADD RSC /l 0x809 /d "_DEBUG" BSC32=bscmake.exe @@ -74,7 +76,9 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib /nologo /subsystem:console /incremental:no /pdb:"Debug\dftables.pdb" /map /debug /machine:I386 /pdbtype:sept +# SUBTRACT BASE LINK32 /pdb:none # ADD LINK32 kernel32.lib /nologo /subsystem:console /incremental:no /pdb:"Debug\dftables.pdb" /map /debug /machine:I386 +# SUBTRACT LINK32 /pdb:none !ENDIF diff --git a/srclib/pcre/pcre.dsp b/srclib/pcre/pcre.dsp index 6aa9cc2d5b9..b683a813af4 100644 --- a/srclib/pcre/pcre.dsp +++ b/srclib/pcre/pcre.dsp @@ -26,6 +26,7 @@ CFG=pcre - Win32 Debug # PROP Scc_ProjName "" # PROP Scc_LocalPath "" CPP=cl.exe +RSC=rc.exe !IF "$(CFG)" == "pcre - Win32 Release" @@ -39,11 +40,10 @@ CPP=cl.exe # PROP Output_Dir "LibR" # PROP Intermediate_Dir "LibR" # PROP Target_Dir "" -RSC=rc.exe -# ADD BASE RSC /l 0x409 -# ADD RSC /l 0x409 # ADD BASE CPP /nologo /MD /W3 /O2 /D "_WIN32" /D "NDEBUG" /D "_WINDOWS" /D "STATIC" /Fd"LibR/pcre" /FD /c # ADD CPP /nologo /MD /W3 /O2 /D "_WIN32" /D "NDEBUG" /D "_WINDOWS" /D "STATIC" /Fd"LibR/pcre" /FD /c +# ADD BASE RSC /l 0x409 +# ADD RSC /l 0x409 BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -63,11 +63,10 @@ LIB32=link.exe -lib # PROP Output_Dir "LibD" # PROP Intermediate_Dir "LibD" # PROP Target_Dir "" -RSC=rc.exe +# ADD BASE CPP /nologo /MDd /W3 /GX /ZI /Od /D "_WIN32" /D "_DEBUG" /D "_WINDOWS" /D "STATIC" /Fd"LibD/pcre" /FD /c +# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /D "_WIN32" /D "_DEBUG" /D "_WINDOWS" /D "STATIC" /Fd"LibD/pcre" /FD /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 -# ADD BASE CPP /nologo /MDd /W3 /GX /ZI /Od /D "_WIN32" /D "_DEBUG" /D "_WINDOWS" /D "STATIC" /Fd"LibD/pcre" /FD /c -# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /D "_WIN32" /D "_DEBUG" /D "_WINDOWS" /D "STATIC" /Fd"LibD/pcre" /FD /c BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo diff --git a/srclib/pcre/pcreposix.dsp b/srclib/pcre/pcreposix.dsp index caf2278cb91..942f54e6b3d 100644 --- a/srclib/pcre/pcreposix.dsp +++ b/srclib/pcre/pcreposix.dsp @@ -26,6 +26,7 @@ CFG=pcreposix - Win32 Debug # PROP Scc_ProjName "" # PROP Scc_LocalPath "" CPP=cl.exe +RSC=rc.exe !IF "$(CFG)" == "pcreposix - Win32 Release" @@ -39,11 +40,10 @@ CPP=cl.exe # PROP Output_Dir "LibR" # PROP Intermediate_Dir "LibR" # PROP Target_Dir "" -RSC=rc.exe -# ADD BASE RSC /l 0x409 -# ADD RSC /l 0x409 # ADD BASE CPP /nologo /MD /W3 /O2 /D "_WIN32" /D "NDEBUG" /D "_WINDOWS" /D "STATIC" /Fd"LibR/pcreposix" /FD /c # ADD CPP /nologo /MD /W3 /O2 /D "_WIN32" /D "NDEBUG" /D "_WINDOWS" /D "STATIC" /Fd"LibR/pcreposix" /FD /c +# ADD BASE RSC /l 0x409 +# ADD RSC /l 0x409 BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -63,11 +63,10 @@ LIB32=link.exe -lib # PROP Output_Dir "LibD" # PROP Intermediate_Dir "LibD" # PROP Target_Dir "" -RSC=rc.exe +# ADD BASE CPP /nologo /MDd /W3 /GX /ZI /Od /D "_WIN32" /D "_DEBUG" /D "_WINDOWS" /D "STATIC" /Fd"LibD/pcreposix" /FD /c +# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /D "_WIN32" /D "_DEBUG" /D "_WINDOWS" /D "STATIC" /Fd"LibD/pcreposix" /FD /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 -# ADD BASE CPP /nologo /MDd /W3 /GX /ZI /Od /D "_WIN32" /D "_DEBUG" /D "_WINDOWS" /D "STATIC" /Fd"LibD/pcreposix" /FD /c -# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /D "_WIN32" /D "_DEBUG" /D "_WINDOWS" /D "STATIC" /Fd"LibD/pcreposix" /FD /c BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo diff --git a/support/ab.dsp b/support/ab.dsp index 046371a4b10..ac01645f222 100644 --- a/support/ab.dsp +++ b/support/ab.dsp @@ -49,8 +49,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console /incremental:no /map /machine:I386 -# ADD LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console /incremental:no /map /machine:I386 +# ADD BASE LINK32 kernel32.lib user32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console /map /machine:I386 +# ADD LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console /map /machine:I386 !ELSEIF "$(CFG)" == "ab - Win32 Debug" @@ -66,7 +66,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MDd /W3 /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "APR_DECLARE_STATIC" /D "APU_DECLARE_STATIC" /FD /c -# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I "../srclib/apr/include" /I "../srclib/apr-util/include" /I "../include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "APR_DECLARE_STATIC" /D "APU_DECLARE_STATIC" /Fd"Debug/ab" /FD /c +# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "../srclib/apr/include" /I "../srclib/apr-util/include" /I "../include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "APR_DECLARE_STATIC" /D "APU_DECLARE_STATIC" /Fd"Debug/ab" /FD /c # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" BSC32=bscmake.exe @@ -89,7 +89,6 @@ SOURCE=.\ab.c # Begin Source File SOURCE=.\ab.rc - # End Source File # Begin Source File @@ -102,8 +101,7 @@ SOURCE=..\build\win32\win32ver.awk InputPath=..\build\win32\win32ver.awk ".\ab.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - awk -f ../build/win32/win32ver.awk ab "ApacheBench Utility"\ - ../include/ap_release.h > .\ab.rc + awk -f ../build/win32/win32ver.awk ab "ApacheBench Utility" ../include/ap_release.h > .\ab.rc # End Custom Build @@ -114,8 +112,7 @@ InputPath=..\build\win32\win32ver.awk InputPath=..\build\win32\win32ver.awk ".\ab.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - awk -f ../build/win32/win32ver.awk ab "ApacheBench Utility"\ - ../include/ap_release.h > .\ab.rc + awk -f ../build/win32/win32ver.awk ab "ApacheBench Utility" ../include/ap_release.h > .\ab.rc # End Custom Build diff --git a/support/htdigest.dsp b/support/htdigest.dsp index 8430e3d8878..94e7ba361c9 100644 --- a/support/htdigest.dsp +++ b/support/htdigest.dsp @@ -49,8 +49,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console /incremental:no /map /machine:I386 -# ADD LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console /incremental:no /map /machine:I386 +# ADD BASE LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console /map /machine:I386 +# ADD LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console /map /machine:I386 !ELSEIF "$(CFG)" == "htdigest - Win32 Debug" @@ -66,7 +66,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MDd /W3 /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "APR_DECLARE_STATIC" /D "APU_DECLARE_STATIC" /FD /c -# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I "../srclib/apr/include" /I "../srclib/apr-util/include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "APR_DECLARE_STATIC" /D "APU_DECLARE_STATIC" /Fd"Debug/htdigest" /FD /c +# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "../srclib/apr/include" /I "../srclib/apr-util/include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "APR_DECLARE_STATIC" /D "APU_DECLARE_STATIC" /Fd"Debug/htdigest" /FD /c # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" BSC32=bscmake.exe @@ -89,7 +89,6 @@ SOURCE=.\htdigest.c # Begin Source File SOURCE=.\htdigest.rc - # End Source File # Begin Source File @@ -102,8 +101,7 @@ SOURCE=..\build\win32\win32ver.awk InputPath=..\build\win32\win32ver.awk ".\htdigest.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - awk -f ../build/win32/win32ver.awk htdigest "htdigest Utility"\ - ../include/ap_release.h > .\htdigest.rc + awk -f ../build/win32/win32ver.awk htdigest "htdigest Utility" ../include/ap_release.h > .\htdigest.rc # End Custom Build @@ -114,8 +112,7 @@ InputPath=..\build\win32\win32ver.awk InputPath=..\build\win32\win32ver.awk ".\htdigest.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - awk -f ../build/win32/win32ver.awk htdigest "htdigest Utility"\ - ../include/ap_release.h > .\htdigest.rc + awk -f ../build/win32/win32ver.awk htdigest "htdigest Utility" ../include/ap_release.h > .\htdigest.rc # End Custom Build diff --git a/support/htpasswd.dsp b/support/htpasswd.dsp index 5ef31ba613f..ccfc5a8feb7 100644 --- a/support/htpasswd.dsp +++ b/support/htpasswd.dsp @@ -49,8 +49,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console /incremental:no /map /machine:I386 -# ADD LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console /incremental:no /map /machine:I386 +# ADD BASE LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console /map /machine:I386 +# ADD LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console /map /machine:I386 !ELSEIF "$(CFG)" == "htpasswd - Win32 Debug" @@ -66,7 +66,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MDd /W3 /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "APR_DECLARE_STATIC" /D "APU_DECLARE_STATIC" /FD /c -# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I "../srclib/apr/include" /I "../srclib/apr-util/include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "APR_DECLARE_STATIC" /D "APU_DECLARE_STATIC" /Fd"Debug/htpasswd" /FD /c +# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "../srclib/apr/include" /I "../srclib/apr-util/include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "APR_DECLARE_STATIC" /D "APU_DECLARE_STATIC" /Fd"Debug/htpasswd" /FD /c # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" BSC32=bscmake.exe @@ -89,7 +89,6 @@ SOURCE=.\htpasswd.c # Begin Source File SOURCE=.\htpasswd.rc - # End Source File # Begin Source File @@ -102,8 +101,7 @@ SOURCE=..\build\win32\win32ver.awk InputPath=..\build\win32\win32ver.awk ".\htpasswd.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - awk -f ../build/win32/win32ver.awk htpasswd "htpasswd Utility"\ - ../include/ap_release.h > .\htpasswd.rc + awk -f ../build/win32/win32ver.awk htpasswd "htpasswd Utility" ../include/ap_release.h > .\htpasswd.rc # End Custom Build @@ -114,8 +112,7 @@ InputPath=..\build\win32\win32ver.awk InputPath=..\build\win32\win32ver.awk ".\htpasswd.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - awk -f ../build/win32/win32ver.awk htpasswd "htpasswd Utility"\ - ../include/ap_release.h > .\htpasswd.rc + awk -f ../build/win32/win32ver.awk htpasswd "htpasswd Utility" ../include/ap_release.h > .\htpasswd.rc # End Custom Build diff --git a/support/logresolve.dsp b/support/logresolve.dsp index 1302e615ab1..6465c871489 100644 --- a/support/logresolve.dsp +++ b/support/logresolve.dsp @@ -49,8 +49,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console /incremental:no /map /machine:I386 -# ADD LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console /incremental:no /map /machine:I386 +# ADD BASE LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console /map /machine:I386 +# ADD LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console /map /machine:I386 !ELSEIF "$(CFG)" == "logresolve - Win32 Debug" @@ -66,7 +66,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MDd /W3 /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "APR_DECLARE_STATIC" /D "APU_DECLARE_STATIC" /FD /c -# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I "../srclib/apr/include" /I "../srclib/apr-util/include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "APR_DECLARE_STATIC" /D "APU_DECLARE_STATIC" /Fd"Debug/logresolve" /FD /c +# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "../srclib/apr/include" /I "../srclib/apr-util/include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "APR_DECLARE_STATIC" /D "APU_DECLARE_STATIC" /Fd"Debug/logresolve" /FD /c # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" BSC32=bscmake.exe @@ -89,7 +89,6 @@ SOURCE=.\logresolve.c # Begin Source File SOURCE=.\logresolve.rc - # End Source File # Begin Source File @@ -102,8 +101,7 @@ SOURCE=..\build\win32\win32ver.awk InputPath=..\build\win32\win32ver.awk ".\logresolve.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - awk -f ../build/win32/win32ver.awk logresolve "logresolve Utility"\ - ../include/ap_release.h > .\logresolve.rc + awk -f ../build/win32/win32ver.awk logresolve "logresolve Utility" ../include/ap_release.h > .\logresolve.rc # End Custom Build @@ -114,8 +112,7 @@ InputPath=..\build\win32\win32ver.awk InputPath=..\build\win32\win32ver.awk ".\logresolve.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - awk -f ../build/win32/win32ver.awk logresolve "logresolve Utility"\ - ../include/ap_release.h > .\logresolve.rc + awk -f ../build/win32/win32ver.awk logresolve "logresolve Utility" ../include/ap_release.h > .\logresolve.rc # End Custom Build diff --git a/support/rotatelogs.dsp b/support/rotatelogs.dsp index 1d9b0a1836f..f91a09b4f47 100644 --- a/support/rotatelogs.dsp +++ b/support/rotatelogs.dsp @@ -66,7 +66,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MDd /W3 /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "APR_DECLARE_STATIC" /D "APU_DECLARE_STATIC" /FD /c -# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I "../srclib/apr/include" /I "../srclib/apr-util/include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "APR_DECLARE_STATIC" /D "APU_DECLARE_STATIC" /Fd"Debug/rotatelogs" /FD /c +# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "../srclib/apr/include" /I "../srclib/apr-util/include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "APR_DECLARE_STATIC" /D "APU_DECLARE_STATIC" /Fd"Debug/rotatelogs" /FD /c # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" BSC32=bscmake.exe @@ -89,7 +89,6 @@ SOURCE=.\rotatelogs.c # Begin Source File SOURCE=.\rotatelogs.rc - # End Source File # Begin Source File @@ -102,8 +101,7 @@ SOURCE=..\build\win32\win32ver.awk InputPath=..\build\win32\win32ver.awk ".\rotatelogs.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - awk -f ../build/win32/win32ver.awk rotatelogs "rotatelogs Utility"\ - ../include/ap_release.h > .\rotatelogs.rc + awk -f ../build/win32/win32ver.awk rotatelogs "rotatelogs Utility" ../include/ap_release.h > .\rotatelogs.rc # End Custom Build @@ -114,8 +112,7 @@ InputPath=..\build\win32\win32ver.awk InputPath=..\build\win32\win32ver.awk ".\rotatelogs.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - awk -f ../build/win32/win32ver.awk rotatelogs "rotatelogs Utility"\ - ../include/ap_release.h > .\rotatelogs.rc + awk -f ../build/win32/win32ver.awk rotatelogs "rotatelogs Utility" ../include/ap_release.h > .\rotatelogs.rc # End Custom Build diff --git a/support/win32/ApacheMonitor.dsp b/support/win32/ApacheMonitor.dsp index 58948edc6c8..c438c5390cb 100644 --- a/support/win32/ApacheMonitor.dsp +++ b/support/win32/ApacheMonitor.dsp @@ -70,7 +70,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /Yu"stdafx.h" /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "STRICT" /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "STRICT" /FD /GZ /c # SUBTRACT CPP /YX /Yc /Yu # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 @@ -135,8 +135,7 @@ SOURCE=..\..\build\win32\win32ver.awk InputPath=..\..\build\win32\win32ver.awk ".\ApacheMonitorVersion.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - awk -f ../../build/win32/win32ver.awk ApacheMonitor\ - "Apache Server Monitor" ../../include/ap_release.h > .\ApacheMonitorVersion.rc + awk -f ../../build/win32/win32ver.awk ApacheMonitor "Apache HTTP Server Monitor" ../../include/ap_release.h > .\ApacheMonitorVersion.rc # End Custom Build @@ -147,8 +146,7 @@ InputPath=..\..\build\win32\win32ver.awk InputPath=..\..\build\win32\win32ver.awk ".\ApacheMonitorVersion.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - awk -f ../../build/win32/win32ver.awk ApacheMonitor\ - "Apache Server Monitor" ../../include/ap_release.h > .\ApacheMonitorVersion.rc + awk -f ../../build/win32/win32ver.awk ApacheMonitor "Apache HTTP Server Monitor" ../../include/ap_release.h > .\ApacheMonitorVersion.rc # End Custom Build diff --git a/support/win32/wintty.dsp b/support/win32/wintty.dsp index 1c0883730ac..7659023d89b 100644 --- a/support/win32/wintty.dsp +++ b/support/win32/wintty.dsp @@ -49,8 +49,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib advapi32.lib /nologo /subsystem:console /incremental:no /map /machine:I386 -# ADD LINK32 kernel32.lib user32.lib advapi32.lib /nologo /subsystem:console /incremental:no /map /machine:I386 +# ADD BASE LINK32 kernel32.lib user32.lib advapi32.lib /nologo /subsystem:console /map /machine:I386 +# ADD LINK32 kernel32.lib user32.lib advapi32.lib /nologo /subsystem:console /map /machine:I386 !ELSEIF "$(CFG)" == "wintty - Win32 Debug" @@ -66,7 +66,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MDd /W3 /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "APR_DECLARE_STATIC" /D "APU_DECLARE_STATIC" /FD /c -# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I "../srclib/apr/include" /I "../srclib/apr-util/include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "APR_DECLARE_STATIC" /D "APU_DECLARE_STATIC" /Fd"Debug/wintty" /FD /c +# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "../srclib/apr/include" /I "../srclib/apr-util/include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "APR_DECLARE_STATIC" /D "APU_DECLARE_STATIC" /Fd"Debug/wintty" /FD /c # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" BSC32=bscmake.exe @@ -84,14 +84,6 @@ LINK32=link.exe # Name "wintty - Win32 Debug" # Begin Source File -SOURCE=.\wintty.c -# End Source File -# Begin Source File - -SOURCE=.\wintty.rc -# End Source File -# Begin Source File - SOURCE=..\..\build\win32\win32ver.awk !IF "$(CFG)" == "wintty - Win32 Release" @@ -101,8 +93,7 @@ SOURCE=..\..\build\win32\win32ver.awk InputPath=..\..\build\win32\win32ver.awk ".\wintty.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - awk -f ../../build/win32/win32ver.awk wintty\ - "wintty Console Utility" ../../include/ap_release.h > .\wintty.rc + awk -f ../../build/win32/win32ver.awk wintty "wintty Console Utility" ../../include/ap_release.h > .\wintty.rc # End Custom Build @@ -113,13 +104,20 @@ InputPath=..\..\build\win32\win32ver.awk InputPath=..\..\build\win32\win32ver.awk ".\wintty.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - awk -f ../../build/win32/win32ver.awk wintty\ - "wintty Console Utility" ../../include/ap_release.h > .\wintty.rc + awk -f ../../build/win32/win32ver.awk wintty "wintty Console Utility" ../../include/ap_release.h > .\wintty.rc # End Custom Build !ENDIF +# End Source File +# Begin Source File + +SOURCE=.\wintty.c +# End Source File +# Begin Source File + +SOURCE=.\wintty.rc # End Source File # End Target # End Project