diff options
29 files changed, 317 insertions, 317 deletions
diff --git a/Apache.dsp b/Apache.dsp index a1772dd7ca..ff356138e3 100644 --- a/Apache.dsp +++ b/Apache.dsp @@ -41,8 +41,8 @@ RSC=rc.exe # PROP Intermediate_Dir ".\ApacheR" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "./include" /I "./os/win32" /I "./lib/apr/include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "SHARED_MODULE" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "./include" /I "./os/win32" /I "./lib/apr/include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c +# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "./include" /I "./os/win32" /I "./srclib/apr/include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "SHARED_MODULE" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "./include" /I "./os/win32" /I "./srclib/apr/include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c # SUBTRACT CPP /YX # ADD BASE RSC /l 0x809 /d "NDEBUG" # ADD RSC /l 0x809 /d "NDEBUG" @@ -66,8 +66,8 @@ LINK32=link.exe # PROP Intermediate_Dir ".\ApacheD" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -# ADD BASE CPP /nologo /MDd /W3 /GX /ZI /Od /I "./include" /I "./os/win32" /I "./lib/apr/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c -# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I "./include" /I "./os/win32" /I "./lib/apr/include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /FD /c +# ADD BASE CPP /nologo /MDd /W3 /GX /ZI /Od /I "./include" /I "./os/win32" /I "./srclib/apr/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c +# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I "./include" /I "./os/win32" /I "./srclib/apr/include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /FD /c # SUBTRACT CPP /YX # ADD BASE RSC /l 0x809 /d "_DEBUG" # ADD RSC /l 0x809 /d "_DEBUG" @@ -95,7 +95,7 @@ SOURCE=.\os\win32\apache.rc # End Source File # Begin Source File -SOURCE=.\main\http_main.c +SOURCE=.\server\http_main.c # End Source File # End Target # End Project diff --git a/Apache.dsw b/Apache.dsw index 3a5fef9c27..dddb5850aa 100644 --- a/Apache.dsw +++ b/Apache.dsw @@ -171,7 +171,7 @@ Package=<4> ############################################################################### -Project: "aprlib"=".\lib\apr\aprlib.dsp" - Package Owner=<4> +Project: "aprlib"=".\srclib\apr\aprlib.dsp" - Package Owner=<4> Package=<5> {{{ @@ -183,7 +183,7 @@ Package=<4> ############################################################################### -Project: "aprlibdll"=".\lib\apr\aprlibdll.dsp" - Package Owner=<4> +Project: "aprlibdll"=".\srclib\apr\aprlibdll.dsp" - Package Owner=<4> Package=<5> {{{ @@ -198,7 +198,7 @@ Package=<4> ############################################################################### -Project: "dftables"=".\lib\pcre\dftables.dsp" - Package Owner=<4> +Project: "dftables"=".\srclib\pcre\dftables.dsp" - Package Owner=<4> Package=<5> {{{ @@ -210,7 +210,7 @@ Package=<4> ############################################################################### -Project: "expatlib"=".\lib\expat-lite\expatlib.dsp" - Package Owner=<4> +Project: "expatlib"=".\srclib\expat-lite\expatlib.dsp" - Package Owner=<4> Package=<5> {{{ @@ -222,7 +222,7 @@ Package=<4> ############################################################################### -Project: "gen_test_char"=".\main\gen_test_char.dsp" - Package Owner=<4> +Project: "gen_test_char"=".\server\gen_test_char.dsp" - Package Owner=<4> Package=<5> {{{ @@ -237,7 +237,7 @@ Package=<4> ############################################################################### -Project: "gen_uri_delims"=".\main\gen_uri_delims.dsp" - Package Owner=<4> +Project: "gen_uri_delims"=".\server\gen_uri_delims.dsp" - Package Owner=<4> Package=<5> {{{ @@ -315,7 +315,7 @@ Package=<4> ############################################################################### -Project: "mod_auth_anon"=".\os\win32\mod_auth_anon.dsp" - Package Owner=<4> +Project: "mod_auth_anon"=".\modules\aaa\mod_auth_anon.dsp" - Package Owner=<4> Package=<5> {{{ @@ -333,7 +333,7 @@ Package=<4> ############################################################################### -Project: "mod_auth_dbm"=".\os\win32\mod_auth_dbm.dsp" - Package Owner=<4> +Project: "mod_auth_dbm"=".\modules\aaa\mod_auth_dbm.dsp" - Package Owner=<4> Package=<5> {{{ @@ -354,7 +354,7 @@ Package=<4> ############################################################################### -Project: "mod_auth_digest"=".\os\win32\mod_auth_digest.dsp" - Package Owner=<4> +Project: "mod_auth_digest"=".\modules\aaa\mod_auth_digest.dsp" - Package Owner=<4> Package=<5> {{{ @@ -372,7 +372,7 @@ Package=<4> ############################################################################### -Project: "mod_cern_meta"=".\os\win32\mod_cern_meta.dsp" - Package Owner=<4> +Project: "mod_cern_meta"=".\modules\metadata\mod_cern_meta.dsp" - Package Owner=<4> Package=<5> {{{ @@ -390,7 +390,7 @@ Package=<4> ############################################################################### -Project: "mod_dav"=".\os\win32\mod_dav.dsp" - Package Owner=<4> +Project: "mod_dav"=".\modules\dav\main\mod_dav.dsp" - Package Owner=<4> Package=<5> {{{ @@ -408,7 +408,7 @@ Package=<4> ############################################################################### -Project: "mod_dav_fs"=".\os\win32\mod_dav_fs.dsp" - Package Owner=<4> +Project: "mod_dav_fs"=".\modules\dav\fs\mod_dav_fs.dsp" - Package Owner=<4> Package=<5> {{{ @@ -435,7 +435,7 @@ Package=<4> ############################################################################### -Project: "mod_expires"=".\os\win32\mod_expires.dsp" - Package Owner=<4> +Project: "mod_expires"=".\modules\metadata\mod_expires.dsp" - Package Owner=<4> Package=<5> {{{ @@ -453,7 +453,7 @@ Package=<4> ############################################################################### -Project: "mod_file_cache"=".\os\win32\mod_file_cache.dsp" - Package Owner=<4> +Project: "mod_file_cache"=".\modules\cache\mod_file_cache.dsp" - Package Owner=<4> Package=<5> {{{ @@ -471,7 +471,7 @@ Package=<4> ############################################################################### -Project: "mod_headers"=".\os\win32\mod_headers.dsp" - Package Owner=<4> +Project: "mod_headers"=".\modules\metadata\mod_headers.dsp" - Package Owner=<4> Package=<5> {{{ @@ -489,7 +489,7 @@ Package=<4> ############################################################################### -Project: "mod_info"=".\os\win32\mod_info.dsp" - Package Owner=<4> +Project: "mod_info"=".\modules\generators\mod_info.dsp" - Package Owner=<4> Package=<5> {{{ @@ -507,7 +507,7 @@ Package=<4> ############################################################################### -Project: "mod_proxy"=".\os\win32\mod_proxy.dsp" - Package Owner=<4> +Project: "mod_proxy"=".\modules\proxy\mod_proxy.dsp" - Package Owner=<4> Package=<5> {{{ @@ -525,7 +525,7 @@ Package=<4> ############################################################################### -Project: "mod_rewrite"=".\os\win32\mod_rewrite.dsp" - Package Owner=<4> +Project: "mod_rewrite"=".\modules\mappers\mod_rewrite.dsp" - Package Owner=<4> Package=<5> {{{ @@ -543,7 +543,7 @@ Package=<4> ############################################################################### -Project: "mod_speling"=".\os\win32\mod_speling.dsp" - Package Owner=<4> +Project: "mod_speling"=".\modules\mappers\mod_speling.dsp" - Package Owner=<4> Package=<5> {{{ @@ -561,7 +561,7 @@ Package=<4> ############################################################################### -Project: "mod_status"=".\os\win32\mod_status.dsp" - Package Owner=<4> +Project: "mod_status"=".\modules\generators\mod_status.dsp" - Package Owner=<4> Package=<5> {{{ @@ -579,7 +579,7 @@ Package=<4> ############################################################################### -Project: "mod_usertrack"=".\os\win32\mod_usertrack.dsp" - Package Owner=<4> +Project: "mod_usertrack"=".\modules\metadata\mod_usertrack.dsp" - Package Owner=<4> Package=<5> {{{ diff --git a/ApacheCore.dsp b/ApacheCore.dsp index 690203844e..d5b7bedd0c 100644 --- a/ApacheCore.dsp +++ b/ApacheCore.dsp @@ -40,8 +40,8 @@ RSC=rc.exe # PROP Output_Dir "LibR" # PROP Intermediate_Dir "LibR" # PROP Target_Dir "" -# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I ".\include" /I ".\lib\apr\include" /I ".\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT" /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I ".\include" /I ".\lib\apr\include" /I ".\lib\aputil" /I ".\lib\sdbm" /I ".\os\win32" /I ".\modules\mpm\winnt" /I ".\lib\expat-lite" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT" /FD /c +# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I ".\include" /I ".\srclib\apr\include" /I ".\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT" /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I ".\include" /I ".\srclib\apr\include" /I ".\srclib\apr-util" /I ".\srclib\sdbm" /I ".\os\win32" /I ".\server\mpm\winnt" /I ".\srclib\expat-lite" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT" /FD /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 BSC32=bscmake.exe @@ -64,8 +64,8 @@ LIB32=link.exe -lib # PROP Intermediate_Dir "LibD" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -# ADD BASE CPP /nologo /MDd /W3 /GX /ZI /Od /I ".\include" /I ".\lib\apr\include" /I ".\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT" /FD /c -# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I ".\include" /I ".\lib\apr\include" /I ".\lib\aputil" /I ".\lib\sdbm" /I ".\os\win32" /I ".\modules\mpm\winnt" /I ".\lib\expat-lite" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT" /FD /c +# ADD BASE CPP /nologo /MDd /W3 /GX /ZI /Od /I ".\include" /I ".\srclib\apr\include" /I ".\os\win32" /D "NDEBUG" /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" /I ".\srclib\sdbm" /I ".\os\win32" /I ".\server\mpm\winnt" /I ".\srclib\expat-lite" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT" /FD /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 BSC32=bscmake.exe @@ -119,27 +119,27 @@ SOURCE=.\os\win32\os.h # PROP Default_Filter "" # Begin Source File -SOURCE=.\lib\aputil\apu_private.hw +SOURCE=.\srclib\apr-util\apu_private.hw !IF "$(CFG)" == "ApacheCore - Win32 Release" # Begin Custom Build -InputPath=.\lib\aputil\apu_private.hw +InputPath=.\srclib\apr-util\apu_private.hw -".\lib\aputil\apu_private.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy .\lib\aputil\apu_private.hw .\lib\aputil\apu_private.h >nul - echo Created aputil apu_private.h from apu_private.hw +".\srclib\apr-util\apu_private.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy .\srclib\apr-util\apu_private.hw .\srclib\apr-util\apu_private.h >nul + echo Created apr-util apu_private.h from apu_private.hw # End Custom Build !ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" # Begin Custom Build -InputPath=.\lib\aputil\apu_private.hw +InputPath=.\srclib\apr-util\apu_private.hw -".\lib\aputil\apu_private.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy .\lib\aputil\apu_private.hw .\lib\aputil\apu_private.h >nul - echo Created aputil apu_private.h from apu_private.hw +".\srclib\apr-util\apu_private.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy .\srclib\apr-util\apu_private.hw .\srclib\apr-util\apu_private.h >nul + echo Created apr-util apu_private.h from apu_private.hw # End Custom Build @@ -148,15 +148,15 @@ InputPath=.\lib\aputil\apu_private.hw # End Source File # Begin Source File -SOURCE=.\main\gen_test_char.exe +SOURCE=.\server\gen_test_char.exe !IF "$(CFG)" == "ApacheCore - Win32 Release" # Begin Custom Build - Generating test_char.h -InputPath=.\main\gen_test_char.exe +InputPath=.\server\gen_test_char.exe -".\main\test_char.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - .\main\gen_test_char.exe >.\main\test_char.h +".\server\test_char.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + .\server\gen_test_char.exe >.\server\test_char.h echo Generated test_char.h from gen_test_char.exe # End Custom Build @@ -164,10 +164,10 @@ InputPath=.\main\gen_test_char.exe !ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" # Begin Custom Build - Generating test_char.h -InputPath=.\main\gen_test_char.exe +InputPath=.\server\gen_test_char.exe -".\main\test_char.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - .\main\gen_test_char.exe >.\main\test_char.h +".\server\test_char.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + .\server\gen_test_char.exe >.\server\test_char.h echo Generated test_char.h from gen_test_char.exe # End Custom Build @@ -177,15 +177,15 @@ InputPath=.\main\gen_test_char.exe # End Source File # Begin Source File -SOURCE=.\main\gen_uri_delims.exe +SOURCE=.\server\gen_uri_delims.exe !IF "$(CFG)" == "ApacheCore - Win32 Release" # Begin Custom Build - Generating uri_delims.h -InputPath=.\main\gen_uri_delims.exe +InputPath=.\server\gen_uri_delims.exe -".\main\uri_delims.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - .\main\gen_uri_delims.exe >.\main\uri_delims.h +".\server\uri_delims.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + .\server\gen_uri_delims.exe >.\server\uri_delims.h echo Generated uri_delims.h from gen_uri_delims.exe # End Custom Build @@ -193,10 +193,10 @@ InputPath=.\main\gen_uri_delims.exe !ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" # Begin Custom Build - Generating uri_delims.h -InputPath=.\main\gen_uri_delims.exe +InputPath=.\server\gen_uri_delims.exe -".\main\uri_delims.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - .\main\gen_uri_delims.exe >.\main\uri_delims.h +".\server\uri_delims.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + .\server\gen_uri_delims.exe >.\server\uri_delims.h echo Generated uri_delims.h from gen_uri_delims.exe # End Custom Build @@ -206,11 +206,11 @@ InputPath=.\main\gen_uri_delims.exe # End Source File # Begin Source File -SOURCE=.\main\test_char.h +SOURCE=.\server\test_char.h # End Source File # Begin Source File -SOURCE=.\main\uri_delims.h +SOURCE=.\server\uri_delims.h # End Source File # End Group # Begin Group "ap_buckets" @@ -294,7 +294,7 @@ SOURCE=.\include\ap_sha1.h # End Source File # Begin Source File -SOURCE=.\lib\aputil\apu_dbm.c +SOURCE=.\srclib\apr-util\apu_dbm.c # End Source File # End Group # Begin Group "httpd" @@ -302,7 +302,7 @@ SOURCE=.\lib\aputil\apu_dbm.c # PROP Default_Filter "" # Begin Source File -SOURCE=.\main\http_config.c +SOURCE=.\server\http_config.c # End Source File # Begin Source File @@ -310,7 +310,7 @@ SOURCE=.\include\http_config.h # End Source File # Begin Source File -SOURCE=.\main\http_connection.c +SOURCE=.\server\http_connection.c # End Source File # Begin Source File @@ -318,7 +318,7 @@ SOURCE=.\include\http_connection.h # End Source File # Begin Source File -SOURCE=.\main\http_core.c +SOURCE=.\server\http_core.c # End Source File # Begin Source File @@ -326,7 +326,7 @@ SOURCE=.\include\http_core.h # End Source File # Begin Source File -SOURCE=.\main\http_log.c +SOURCE=.\server\http_log.c # End Source File # Begin Source File @@ -338,7 +338,7 @@ SOURCE=.\include\http_main.h # End Source File # Begin Source File -SOURCE=.\main\http_protocol.c +SOURCE=.\server\http_protocol.c # End Source File # Begin Source File @@ -346,7 +346,7 @@ SOURCE=.\include\http_protocol.h # End Source File # Begin Source File -SOURCE=.\main\http_request.c +SOURCE=.\server\http_request.c # End Source File # Begin Source File @@ -354,7 +354,7 @@ SOURCE=.\include\http_request.h # End Source File # Begin Source File -SOURCE=.\main\http_vhost.c +SOURCE=.\server\http_vhost.c # End Source File # Begin Source File @@ -370,47 +370,47 @@ SOURCE=.\include\httpd.h # PROP Default_Filter "" # Begin Source File -SOURCE=.\modules\standard\mod_access.c +SOURCE=.\modules\aaa\mod_access.c # End Source File # Begin Source File -SOURCE=.\modules\standard\mod_actions.c +SOURCE=.\modules\mappers\mod_actions.c # End Source File # Begin Source File -SOURCE=.\modules\standard\mod_alias.c +SOURCE=.\modules\mappers\mod_alias.c # End Source File # Begin Source File -SOURCE=.\modules\standard\mod_asis.c +SOURCE=.\modules\generators\mod_asis.c # End Source File # Begin Source File -SOURCE=.\modules\standard\mod_auth.c +SOURCE=.\modules\aaa\mod_auth.c # End Source File # Begin Source File -SOURCE=.\modules\standard\mod_autoindex.c +SOURCE=.\modules\generators\mod_autoindex.c # End Source File # Begin Source File -SOURCE=.\modules\standard\mod_cgi.c +SOURCE=.\modules\generators\mod_cgi.c # End Source File # Begin Source File -SOURCE=.\modules\standard\mod_dir.c +SOURCE=.\modules\mappers\mod_dir.c # End Source File # Begin Source File -SOURCE=.\modules\standard\mod_env.c +SOURCE=.\modules\metadata\mod_env.c # End Source File # Begin Source File -SOURCE=.\modules\standard\mod_imap.c +SOURCE=.\modules\mappers\mod_imap.c # End Source File # Begin Source File -SOURCE=.\modules\standard\mod_include.c +SOURCE=.\modules\filters\mod_include.c # End Source File # Begin Source File @@ -418,27 +418,27 @@ SOURCE=.\os\win32\mod_isapi.c # End Source File # Begin Source File -SOURCE=.\modules\standard\mod_log_config.c +SOURCE=.\modules\loggers\mod_log_config.c # End Source File # Begin Source File -SOURCE=.\modules\standard\mod_mime.c +SOURCE=.\modules\http\mod_mime.c # End Source File # Begin Source File -SOURCE=.\modules\standard\mod_negotiation.c +SOURCE=.\modules\mappers\mod_negotiation.c # End Source File # Begin Source File -SOURCE=.\modules\standard\mod_setenvif.c +SOURCE=.\modules\metadata\mod_setenvif.c # End Source File # Begin Source File -SOURCE=.\modules\standard\mod_so.c +SOURCE=.\modules\mappers\mod_so.c # End Source File # Begin Source File -SOURCE=.\modules\standard\mod_userdir.c +SOURCE=.\modules\mappers\mod_userdir.c # End Source File # End Group # Begin Group "util" @@ -446,7 +446,7 @@ SOURCE=.\modules\standard\mod_userdir.c # PROP Default_Filter "" # Begin Source File -SOURCE=.\main\rfc1413.c +SOURCE=.\server\rfc1413.c # End Source File # Begin Source File @@ -454,11 +454,11 @@ SOURCE=.\include\rfc1413.h # End Source File # Begin Source File -SOURCE=.\main\util.c +SOURCE=.\server\util.c # End Source File # Begin Source File -SOURCE=.\main\util_cfgtree.c +SOURCE=.\server\util_cfgtree.c # End Source File # Begin Source File @@ -470,7 +470,7 @@ SOURCE=.\include\util_charset.h # End Source File # Begin Source File -SOURCE=.\main\util_date.c +SOURCE=.\server\util_date.c # End Source File # Begin Source File @@ -482,7 +482,7 @@ SOURCE=.\include\util_ebcdic.h # End Source File # Begin Source File -SOURCE=.\main\util_filter.c +SOURCE=.\server\util_filter.c # End Source File # Begin Source File @@ -490,7 +490,7 @@ SOURCE=.\include\util_filter.h # End Source File # Begin Source File -SOURCE=.\main\util_md5.c +SOURCE=.\server\util_md5.c # End Source File # Begin Source File @@ -498,7 +498,7 @@ SOURCE=.\include\util_md5.h # End Source File # Begin Source File -SOURCE=.\main\util_script.c +SOURCE=.\server\util_script.c # End Source File # Begin Source File @@ -506,7 +506,7 @@ SOURCE=.\include\util_script.h # End Source File # Begin Source File -SOURCE=.\main\util_uri.c +SOURCE=.\server\util_uri.c # End Source File # Begin Source File @@ -518,7 +518,7 @@ SOURCE=.\os\win32\util_win32.c # End Source File # Begin Source File -SOURCE=.\main\util_xml.c +SOURCE=.\server\util_xml.c # End Source File # Begin Source File @@ -538,11 +538,11 @@ SOURCE=.\include\ap_mpm.h # End Source File # Begin Source File -SOURCE=.\main\listen.c +SOURCE=.\server\listen.c # End Source File # Begin Source File -SOURCE=.\modules\mpm\winnt\mpm.h +SOURCE=.\server\mpm\winnt\mpm.h # End Source File # Begin Source File @@ -550,7 +550,7 @@ SOURCE=.\include\mpm_common.h # End Source File # Begin Source File -SOURCE=.\modules\mpm\winnt\mpm_default.h +SOURCE=.\server\mpm\winnt\mpm_default.h # End Source File # Begin Source File @@ -558,19 +558,19 @@ SOURCE=.\include\mpm_status.h # End Source File # Begin Source File -SOURCE=.\modules\mpm\winnt\mpm_winnt.c +SOURCE=.\server\mpm\winnt\mpm_winnt.c # End Source File # Begin Source File -SOURCE=.\modules\mpm\winnt\mpm_winnt.h +SOURCE=.\server\mpm\winnt\mpm_winnt.h # End Source File # Begin Source File -SOURCE=.\modules\mpm\winnt\registry.c +SOURCE=.\server\mpm\winnt\registry.c # End Source File # Begin Source File -SOURCE=.\modules\mpm\winnt\service.c +SOURCE=.\server\mpm\winnt\service.c # End Source File # End Group # End Target @@ -40,8 +40,8 @@ RSC=rc.exe # PROP Output_Dir "LibR" # PROP Intermediate_Dir "LibR" # PROP Target_Dir "" -# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I ".\include" /I ".\lib\apr\include" /I ".\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT" /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I ".\include" /I ".\lib\apr\include" /I ".\lib\aputil" /I ".\lib\sdbm" /I ".\os\win32" /I ".\modules\mpm\winnt" /I ".\lib\expat-lite" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT" /FD /c +# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I ".\include" /I ".\srclib\apr\include" /I ".\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT" /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I ".\include" /I ".\srclib\apr\include" /I ".\srclib\apr-util" /I ".\srclib\sdbm" /I ".\os\win32" /I ".\server\mpm\winnt" /I ".\srclib\expat-lite" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT" /FD /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 BSC32=bscmake.exe @@ -64,8 +64,8 @@ LIB32=link.exe -lib # PROP Intermediate_Dir "LibD" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -# ADD BASE CPP /nologo /MDd /W3 /GX /ZI /Od /I ".\include" /I ".\lib\apr\include" /I ".\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT" /FD /c -# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I ".\include" /I ".\lib\apr\include" /I ".\lib\aputil" /I ".\lib\sdbm" /I ".\os\win32" /I ".\modules\mpm\winnt" /I ".\lib\expat-lite" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT" /FD /c +# ADD BASE CPP /nologo /MDd /W3 /GX /ZI /Od /I ".\include" /I ".\srclib\apr\include" /I ".\os\win32" /D "NDEBUG" /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" /I ".\srclib\sdbm" /I ".\os\win32" /I ".\server\mpm\winnt" /I ".\srclib\expat-lite" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT" /FD /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 BSC32=bscmake.exe @@ -119,27 +119,27 @@ SOURCE=.\os\win32\os.h # PROP Default_Filter "" # Begin Source File -SOURCE=.\lib\aputil\apu_private.hw +SOURCE=.\srclib\apr-util\apu_private.hw !IF "$(CFG)" == "ApacheCore - Win32 Release" # Begin Custom Build -InputPath=.\lib\aputil\apu_private.hw +InputPath=.\srclib\apr-util\apu_private.hw -".\lib\aputil\apu_private.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy .\lib\aputil\apu_private.hw .\lib\aputil\apu_private.h >nul - echo Created aputil apu_private.h from apu_private.hw +".\srclib\apr-util\apu_private.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy .\srclib\apr-util\apu_private.hw .\srclib\apr-util\apu_private.h >nul + echo Created apr-util apu_private.h from apu_private.hw # End Custom Build !ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" # Begin Custom Build -InputPath=.\lib\aputil\apu_private.hw +InputPath=.\srclib\apr-util\apu_private.hw -".\lib\aputil\apu_private.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy .\lib\aputil\apu_private.hw .\lib\aputil\apu_private.h >nul - echo Created aputil apu_private.h from apu_private.hw +".\srclib\apr-util\apu_private.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy .\srclib\apr-util\apu_private.hw .\srclib\apr-util\apu_private.h >nul + echo Created apr-util apu_private.h from apu_private.hw # End Custom Build @@ -148,15 +148,15 @@ InputPath=.\lib\aputil\apu_private.hw # End Source File # Begin Source File -SOURCE=.\main\gen_test_char.exe +SOURCE=.\server\gen_test_char.exe !IF "$(CFG)" == "ApacheCore - Win32 Release" # Begin Custom Build - Generating test_char.h -InputPath=.\main\gen_test_char.exe +InputPath=.\server\gen_test_char.exe -".\main\test_char.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - .\main\gen_test_char.exe >.\main\test_char.h +".\server\test_char.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + .\server\gen_test_char.exe >.\server\test_char.h echo Generated test_char.h from gen_test_char.exe # End Custom Build @@ -164,10 +164,10 @@ InputPath=.\main\gen_test_char.exe !ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" # Begin Custom Build - Generating test_char.h -InputPath=.\main\gen_test_char.exe +InputPath=.\server\gen_test_char.exe -".\main\test_char.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - .\main\gen_test_char.exe >.\main\test_char.h +".\server\test_char.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + .\server\gen_test_char.exe >.\server\test_char.h echo Generated test_char.h from gen_test_char.exe # End Custom Build @@ -177,15 +177,15 @@ InputPath=.\main\gen_test_char.exe # End Source File # Begin Source File -SOURCE=.\main\gen_uri_delims.exe +SOURCE=.\server\gen_uri_delims.exe !IF "$(CFG)" == "ApacheCore - Win32 Release" # Begin Custom Build - Generating uri_delims.h -InputPath=.\main\gen_uri_delims.exe +InputPath=.\server\gen_uri_delims.exe -".\main\uri_delims.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - .\main\gen_uri_delims.exe >.\main\uri_delims.h +".\server\uri_delims.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + .\server\gen_uri_delims.exe >.\server\uri_delims.h echo Generated uri_delims.h from gen_uri_delims.exe # End Custom Build @@ -193,10 +193,10 @@ InputPath=.\main\gen_uri_delims.exe !ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" # Begin Custom Build - Generating uri_delims.h -InputPath=.\main\gen_uri_delims.exe +InputPath=.\server\gen_uri_delims.exe -".\main\uri_delims.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - .\main\gen_uri_delims.exe >.\main\uri_delims.h +".\server\uri_delims.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + .\server\gen_uri_delims.exe >.\server\uri_delims.h echo Generated uri_delims.h from gen_uri_delims.exe # End Custom Build @@ -206,11 +206,11 @@ InputPath=.\main\gen_uri_delims.exe # End Source File # Begin Source File -SOURCE=.\main\test_char.h +SOURCE=.\server\test_char.h # End Source File # Begin Source File -SOURCE=.\main\uri_delims.h +SOURCE=.\server\uri_delims.h # End Source File # End Group # Begin Group "ap_buckets" @@ -294,7 +294,7 @@ SOURCE=.\include\ap_sha1.h # End Source File # Begin Source File -SOURCE=.\lib\aputil\apu_dbm.c +SOURCE=.\srclib\apr-util\apu_dbm.c # End Source File # End Group # Begin Group "httpd" @@ -302,7 +302,7 @@ SOURCE=.\lib\aputil\apu_dbm.c # PROP Default_Filter "" # Begin Source File -SOURCE=.\main\http_config.c +SOURCE=.\server\http_config.c # End Source File # Begin Source File @@ -310,7 +310,7 @@ SOURCE=.\include\http_config.h # End Source File # Begin Source File -SOURCE=.\main\http_connection.c +SOURCE=.\server\http_connection.c # End Source File # Begin Source File @@ -318,7 +318,7 @@ SOURCE=.\include\http_connection.h # End Source File # Begin Source File -SOURCE=.\main\http_core.c +SOURCE=.\server\http_core.c # End Source File # Begin Source File @@ -326,7 +326,7 @@ SOURCE=.\include\http_core.h # End Source File # Begin Source File -SOURCE=.\main\http_log.c +SOURCE=.\server\http_log.c # End Source File # Begin Source File @@ -338,7 +338,7 @@ SOURCE=.\include\http_main.h # End Source File # Begin Source File -SOURCE=.\main\http_protocol.c +SOURCE=.\server\http_protocol.c # End Source File # Begin Source File @@ -346,7 +346,7 @@ SOURCE=.\include\http_protocol.h # End Source File # Begin Source File -SOURCE=.\main\http_request.c +SOURCE=.\server\http_request.c # End Source File # Begin Source File @@ -354,7 +354,7 @@ SOURCE=.\include\http_request.h # End Source File # Begin Source File -SOURCE=.\main\http_vhost.c +SOURCE=.\server\http_vhost.c # End Source File # Begin Source File @@ -370,47 +370,47 @@ SOURCE=.\include\httpd.h # PROP Default_Filter "" # Begin Source File -SOURCE=.\modules\standard\mod_access.c +SOURCE=.\modules\aaa\mod_access.c # End Source File # Begin Source File -SOURCE=.\modules\standard\mod_actions.c +SOURCE=.\modules\mappers\mod_actions.c # End Source File # Begin Source File -SOURCE=.\modules\standard\mod_alias.c +SOURCE=.\modules\mappers\mod_alias.c # End Source File # Begin Source File -SOURCE=.\modules\standard\mod_asis.c +SOURCE=.\modules\generators\mod_asis.c # End Source File # Begin Source File -SOURCE=.\modules\standard\mod_auth.c +SOURCE=.\modules\aaa\mod_auth.c # End Source File # Begin Source File -SOURCE=.\modules\standard\mod_autoindex.c +SOURCE=.\modules\generators\mod_autoindex.c # End Source File # Begin Source File -SOURCE=.\modules\standard\mod_cgi.c +SOURCE=.\modules\generators\mod_cgi.c # End Source File # Begin Source File -SOURCE=.\modules\standard\mod_dir.c +SOURCE=.\modules\mappers\mod_dir.c # End Source File # Begin Source File -SOURCE=.\modules\standard\mod_env.c +SOURCE=.\modules\metadata\mod_env.c # End Source File # Begin Source File -SOURCE=.\modules\standard\mod_imap.c +SOURCE=.\modules\mappers\mod_imap.c # End Source File # Begin Source File -SOURCE=.\modules\standard\mod_include.c +SOURCE=.\modules\filters\mod_include.c # End Source File # Begin Source File @@ -418,27 +418,27 @@ SOURCE=.\os\win32\mod_isapi.c # End Source File # Begin Source File -SOURCE=.\modules\standard\mod_log_config.c +SOURCE=.\modules\loggers\mod_log_config.c # End Source File # Begin Source File -SOURCE=.\modules\standard\mod_mime.c +SOURCE=.\modules\http\mod_mime.c # End Source File # Begin Source File -SOURCE=.\modules\standard\mod_negotiation.c +SOURCE=.\modules\mappers\mod_negotiation.c # End Source File # Begin Source File -SOURCE=.\modules\standard\mod_setenvif.c +SOURCE=.\modules\metadata\mod_setenvif.c # End Source File # Begin Source File -SOURCE=.\modules\standard\mod_so.c +SOURCE=.\modules\mappers\mod_so.c # End Source File # Begin Source File -SOURCE=.\modules\standard\mod_userdir.c +SOURCE=.\modules\mappers\mod_userdir.c # End Source File # End Group # Begin Group "util" @@ -446,7 +446,7 @@ SOURCE=.\modules\standard\mod_userdir.c # PROP Default_Filter "" # Begin Source File -SOURCE=.\main\rfc1413.c +SOURCE=.\server\rfc1413.c # End Source File # Begin Source File @@ -454,11 +454,11 @@ SOURCE=.\include\rfc1413.h # End Source File # Begin Source File -SOURCE=.\main\util.c +SOURCE=.\server\util.c # End Source File # Begin Source File -SOURCE=.\main\util_cfgtree.c +SOURCE=.\server\util_cfgtree.c # End Source File # Begin Source File @@ -470,7 +470,7 @@ SOURCE=.\include\util_charset.h # End Source File # Begin Source File -SOURCE=.\main\util_date.c +SOURCE=.\server\util_date.c # End Source File # Begin Source File @@ -482,7 +482,7 @@ SOURCE=.\include\util_ebcdic.h # End Source File # Begin Source File -SOURCE=.\main\util_filter.c +SOURCE=.\server\util_filter.c # End Source File # Begin Source File @@ -490,7 +490,7 @@ SOURCE=.\include\util_filter.h # End Source File # Begin Source File -SOURCE=.\main\util_md5.c +SOURCE=.\server\util_md5.c # End Source File # Begin Source File @@ -498,7 +498,7 @@ SOURCE=.\include\util_md5.h # End Source File # Begin Source File -SOURCE=.\main\util_script.c +SOURCE=.\server\util_script.c # End Source File # Begin Source File @@ -506,7 +506,7 @@ SOURCE=.\include\util_script.h # End Source File # Begin Source File -SOURCE=.\main\util_uri.c +SOURCE=.\server\util_uri.c # End Source File # Begin Source File @@ -518,7 +518,7 @@ SOURCE=.\os\win32\util_win32.c # End Source File # Begin Source File -SOURCE=.\main\util_xml.c +SOURCE=.\server\util_xml.c # End Source File # Begin Source File @@ -538,11 +538,11 @@ SOURCE=.\include\ap_mpm.h # End Source File # Begin Source File -SOURCE=.\main\listen.c +SOURCE=.\server\listen.c # End Source File # Begin Source File -SOURCE=.\modules\mpm\winnt\mpm.h +SOURCE=.\server\mpm\winnt\mpm.h # End Source File # Begin Source File @@ -550,7 +550,7 @@ SOURCE=.\include\mpm_common.h # End Source File # Begin Source File -SOURCE=.\modules\mpm\winnt\mpm_default.h +SOURCE=.\server\mpm\winnt\mpm_default.h # End Source File # Begin Source File @@ -558,19 +558,19 @@ SOURCE=.\include\mpm_status.h # End Source File # Begin Source File -SOURCE=.\modules\mpm\winnt\mpm_winnt.c +SOURCE=.\server\mpm\winnt\mpm_winnt.c # End Source File # Begin Source File -SOURCE=.\modules\mpm\winnt\mpm_winnt.h +SOURCE=.\server\mpm\winnt\mpm_winnt.h # End Source File # Begin Source File -SOURCE=.\modules\mpm\winnt\registry.c +SOURCE=.\server\mpm\winnt\registry.c # End Source File # Begin Source File -SOURCE=.\modules\mpm\winnt\service.c +SOURCE=.\server\mpm\winnt\service.c # End Source File # End Group # End Target diff --git a/modules/aaa/mod_auth_anon.dsp b/modules/aaa/mod_auth_anon.dsp index b1f290c3b2..3b8ab1f67a 100644 --- a/modules/aaa/mod_auth_anon.dsp +++ b/modules/aaa/mod_auth_anon.dsp @@ -43,7 +43,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /I ".\\" /I "..\..\lib\apr\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /I "..\..\os\win32" /I "..\..\srclib\apr\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /FD /c # SUBTRACT CPP /YX # ADD BASE MTL /nologo /D "NDEBUG" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 @@ -53,8 +53,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\lib\apr\Release" /base:@BaseAddr.ref,mod_auth_anon -# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\lib\apr\Release" /base:@BaseAddr.ref,mod_auth_anon +# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\srclib\apr\Release" /base:@BaseAddr.ref,mod_auth_anon +# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\srclib\apr\Release" /base:@BaseAddr.ref,mod_auth_anon !ELSEIF "$(CFG)" == "mod_auth_anon - Win32 Debug" @@ -70,7 +70,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\include" /I ".\\" /I "..\..\lib\apr\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /FD /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\include" /I "..\..\os\win32" /I "..\..\srclib\apr\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /FD /c # SUBTRACT CPP /YX # ADD BASE MTL /nologo /D "_DEBUG" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 @@ -80,8 +80,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug" /base:@BaseAddr.ref,mod_auth_anon -# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug" /base:@BaseAddr.ref,mod_auth_anon +# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\srclib\apr\Debug" /base:@BaseAddr.ref,mod_auth_anon +# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\srclib\apr\Debug" /base:@BaseAddr.ref,mod_auth_anon # SUBTRACT LINK32 /incremental:no /map !ENDIF @@ -92,7 +92,7 @@ LINK32=link.exe # Name "mod_auth_anon - Win32 Debug" # Begin Source File -SOURCE=..\..\modules\standard\mod_auth_anon.c +SOURCE=.\mod_auth_anon.c # End Source File # End Target # End Project diff --git a/modules/aaa/mod_auth_dbm.dsp b/modules/aaa/mod_auth_dbm.dsp index 0f94fb38ba..abc20df289 100644 --- a/modules/aaa/mod_auth_dbm.dsp +++ b/modules/aaa/mod_auth_dbm.dsp @@ -43,7 +43,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /I "..\..\lib\apr\include" /I "..\..\lib\sdbm" /I ".\\" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /I "..\..\srclib\apr\include" /I "..\..\srclib\sdbm" /I "..\..\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d "NDEBUG" @@ -52,8 +52,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\lib\apr\Release" /base:@BaseAddr.ref,mod_auth_dbm -# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\lib\apr\Release" /base:@BaseAddr.ref,mod_auth_dbm +# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\srclib\apr\Release" /base:@BaseAddr.ref,mod_auth_dbm +# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\srclib\apr\Release" /base:@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 /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\include" /I "..\..\lib\apr\include" /I "..\..\lib\sdbm" /I ".\\" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /FD /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\include" /I "..\..\srclib\apr\include" /I "..\..\srclib\sdbm" /I "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /FD /c # ADD BASE MTL /nologo /D "_DEBUG" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d "_DEBUG" @@ -78,8 +78,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug" /base:@BaseAddr.ref,mod_auth_dbm -# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug" /base:@BaseAddr.ref,mod_auth_dbm +# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\srclib\apr\Debug" /base:@BaseAddr.ref,mod_auth_dbm +# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\srclib\apr\Debug" /base:@BaseAddr.ref,mod_auth_dbm # SUBTRACT LINK32 /incremental:no /map !ENDIF @@ -90,7 +90,7 @@ LINK32=link.exe # Name "mod_auth_dbm - Win32 Debug" # Begin Source File -SOURCE=..\..\modules\standard\mod_auth_dbm.c +SOURCE=.\mod_auth_dbm.c # End Source File # End Target # End Project diff --git a/modules/aaa/mod_auth_digest.dsp b/modules/aaa/mod_auth_digest.dsp index fc3dfb1f89..6efa7a3028 100644 --- a/modules/aaa/mod_auth_digest.dsp +++ b/modules/aaa/mod_auth_digest.dsp @@ -43,7 +43,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /I ".\\" /I "..\..\lib\apr\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /I "..\..\os\win32" /I "..\..\srclib\apr\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL" # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL" # ADD BASE RSC /l 0x409 /d "NDEBUG" @@ -53,7 +53,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /machine:I386 -# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\lib\apr\Release" /base:@BaseAddr.ref,mod_auth_digest +# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\srclib\apr\Release" /base:@BaseAddr.ref,mod_auth_digest # SUBTRACT LINK32 /pdb:none !ELSEIF "$(CFG)" == "mod_auth_digest - Win32 Debug" @@ -70,7 +70,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\include" /I ".\\" /I "..\..\lib\apr\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /FD /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\include" /I "..\..\os\win32" /I "..\..\srclib\apr\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /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" @@ -80,7 +80,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug" /base:@BaseAddr.ref,mod_auth_digest +# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept /libpath:"..\..\CoreD" /libpath:"..\..\srclib\apr\Debug" /base:@BaseAddr.ref,mod_auth_digest # SUBTRACT LINK32 /pdb:none /incremental:no /map !ENDIF @@ -91,7 +91,7 @@ LINK32=link.exe # Name "mod_auth_digest - Win32 Debug" # Begin Source File -SOURCE=..\..\modules\standard\mod_auth_digest.c +SOURCE=.\mod_auth_digest.c # End Source File # End Target # End Project diff --git a/modules/cache/mod_file_cache.dsp b/modules/cache/mod_file_cache.dsp index 2b39099468..e9e662fd80 100644 --- a/modules/cache/mod_file_cache.dsp +++ b/modules/cache/mod_file_cache.dsp @@ -43,7 +43,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\include" /I ".\\" /I "..\..\lib\apr\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /FD /c +# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\include" /I "..\..\os\win32" /I "..\..\srclib\apr\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /FD /c # SUBTRACT CPP /YX # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL" # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL" @@ -54,7 +54,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386 -# ADD LINK32 user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\lib\apr\Release" +# ADD LINK32 user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\srclib\apr\Release" !ELSEIF "$(CFG)" == "mod_file_cache - Win32 Debug" @@ -70,7 +70,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\..\include" /I ".\\" /I "..\..\lib\apr\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /FD /c +# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\..\include" /I "..\..\os\win32" /I "..\..\srclib\apr\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /FD /c # SUBTRACT CPP /YX # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL" # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL" @@ -81,7 +81,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug" +# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept /libpath:"..\..\CoreD" /libpath:"..\..\srclib\apr\Debug" # SUBTRACT LINK32 /incremental:no /map !ENDIF @@ -92,7 +92,7 @@ LINK32=link.exe # Name "mod_file_cache - Win32 Debug" # Begin Source File -SOURCE=..\..\modules\standard\mod_file_cache.c +SOURCE=.\mod_file_cache.c # End Source File # End Target # End Project diff --git a/modules/dav/fs/mod_dav_fs.dsp b/modules/dav/fs/mod_dav_fs.dsp index 181cd9c021..1e79394f03 100644 --- a/modules/dav/fs/mod_dav_fs.dsp +++ b/modules/dav/fs/mod_dav_fs.dsp @@ -43,7 +43,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\modules\dav\main" /I "..\..\lib\aputil" /I "..\..\lib\sdbm" /I "..\..\lib\expat-lite" /I "..\..\lib\apr\include" /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\main" /I "..\..\..\srclib\aputil" /I "..\..\..\srclib\sdbm" /I "..\..\..\srclib\expat-lite" /I "..\..\..\srclib\apr\include" /I "..\..\..\include" /I "..\..\..\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d "NDEBUG" @@ -52,8 +52,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\lib\apr\Release" /base:@BaseAddr.ref,mod_dav_fs -# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\lib\apr\Release" /base:@BaseAddr.ref,mod_dav_fs +# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\..\CoreR" /libpath:"..\..\..\srclib\apr\Release" /base:@BaseAddr.ref,mod_dav_fs +# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\..\CoreR" /libpath:"..\..\..\srclib\apr\Release" /base:@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 /MTd /W3 /GX /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /ZI /c -# ADD CPP /nologo /MDd /W3 /GX /Od /I "..\..\modules\dav\main" /I "..\..\lib\aputil" /I "..\..\lib\sdbm" /I "..\..\lib\expat-lite" /I "..\..\lib\apr\include" /I "..\..\include" /I "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /YX /FD /ZI /c +# ADD CPP /nologo /MDd /W3 /GX /Od /I "..\main" /I "..\..\..\srclib\aputil" /I "..\..\..\srclib\sdbm" /I "..\..\..\srclib\expat-lite" /I "..\..\..\srclib\apr\include" /I "..\..\..\include" /I "..\..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /YX /FD /ZI /c # ADD BASE MTL /nologo /D "_DEBUG" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d "_DEBUG" @@ -78,8 +78,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /map /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug" /base:@BaseAddr.ref,mod_dav_fs -# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug" /base:@BaseAddr.ref,mod_dav_fs +# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /map /debug /machine:I386 /libpath:"..\..\..\CoreD" /libpath:"..\..\..\srclib\apr\Debug" /base:@BaseAddr.ref,mod_dav_fs +# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /debug /machine:I386 /libpath:"..\..\..\CoreD" /libpath:"..\..\..\srclib\apr\Debug" /base:@BaseAddr.ref,mod_dav_fs # SUBTRACT LINK32 /incremental:no /map !ENDIF @@ -93,19 +93,19 @@ LINK32=link.exe # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90" # Begin Source File -SOURCE=..\..\modules\dav\fs\dbm.c +SOURCE=.\dbm.c # End Source File # Begin Source File -SOURCE=..\..\modules\dav\fs\lock.c +SOURCE=.\lock.c # End Source File # Begin Source File -SOURCE=..\..\modules\dav\fs\mod_dav_fs.c +SOURCE=.\mod_dav_fs.c # End Source File # Begin Source File -SOURCE=..\..\modules\dav\fs\repos.c +SOURCE=.\repos.c # End Source File # End Group # Begin Group "Header Files" @@ -113,7 +113,7 @@ SOURCE=..\..\modules\dav\fs\repos.c # PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd" # Begin Source File -SOURCE=..\..\modules\dav\fs\repos.h +SOURCE=.\repos.h # End Source File # End Group # End Target diff --git a/modules/dav/main/mod_dav.dsp b/modules/dav/main/mod_dav.dsp index d479afb154..c6516028c9 100644 --- a/modules/dav/main/mod_dav.dsp +++ b/modules/dav/main/mod_dav.dsp @@ -43,7 +43,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\modules\dav\main" /I "..\..\lib\aputil" /I "..\..\lib\sdbm" /I "..\..\lib\expat-lite" /I "..\..\lib\apr\include" /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "DAV_DECLARE_EXPORT" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\srclib\aputil" /I "..\..\..\srclib\sdbm" /I "..\..\..\srclib\expat-lite" /I "..\..\..\srclib\apr\include" /I "..\..\..\include" /I "..\..\..\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "DAV_DECLARE_EXPORT" /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d "NDEBUG" @@ -52,8 +52,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\lib\apr\Release" /base:@BaseAddr.ref,mod_dav -# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\lib\apr\Release" /base:@BaseAddr.ref,mod_dav +# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\..\CoreR" /libpath:"..\..\..\srclib\apr\Release" /base:@BaseAddr.ref,mod_dav +# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\..\CoreR" /libpath:"..\..\..\srclib\apr\Release" /base:@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 /MTd /W3 /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /c -# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I "..\..\modules\dav\main" /I "..\..\lib\aputil" /I "..\..\lib\sdbm" /I "..\..\lib\expat-lite" /I "..\..\lib\apr\include" /I "..\..\include" /I "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "DAV_DECLARE_EXPORT" /YX /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 "..\..\..\include" /I "..\..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "DAV_DECLARE_EXPORT" /YX /FD /c # ADD BASE MTL /nologo /D "_DEBUG" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d "_DEBUG" @@ -78,8 +78,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /map /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug" /base:@BaseAddr.ref,mod_dav -# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug" /base:@BaseAddr.ref,mod_dav +# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /map /debug /machine:I386 /libpath:"..\..\..\CoreD" /libpath:"..\..\..\srclib\apr\Debug" /base:@BaseAddr.ref,mod_dav +# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /debug /machine:I386 /libpath:"..\..\..\CoreD" /libpath:"..\..\..\srclib\apr\Debug" /base:@BaseAddr.ref,mod_dav # SUBTRACT LINK32 /incremental:no /map !ENDIF @@ -93,31 +93,31 @@ LINK32=link.exe # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90" # Begin Source File -SOURCE=..\..\modules\dav\main\liveprop.c +SOURCE=.\liveprop.c # End Source File # Begin Source File -SOURCE=..\..\modules\dav\main\mod_dav.c +SOURCE=.\mod_dav.c # End Source File # Begin Source File -SOURCE=..\..\modules\dav\main\props.c +SOURCE=.\props.c # End Source File # Begin Source File -SOURCE=..\..\modules\dav\main\providers.c +SOURCE=.\providers.c # End Source File # Begin Source File -SOURCE=..\..\modules\dav\main\std_liveprop.c +SOURCE=.\std_liveprop.c # End Source File # Begin Source File -SOURCE=..\..\modules\dav\main\util.c +SOURCE=.\util.c # End Source File # Begin Source File -SOURCE=..\..\modules\dav\main\util_lock.c +SOURCE=.\util_lock.c # End Source File # End Group # Begin Group "Header Files" @@ -125,7 +125,7 @@ SOURCE=..\..\modules\dav\main\util_lock.c # PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd" # Begin Source File -SOURCE=..\..\modules\dav\main\mod_dav.h +SOURCE=.\mod_dav.h # End Source File # End Group # End Target diff --git a/modules/generators/mod_info.dsp b/modules/generators/mod_info.dsp index 281fd52a42..9d488c49f5 100644 --- a/modules/generators/mod_info.dsp +++ b/modules/generators/mod_info.dsp @@ -43,7 +43,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /I ".\\" /I "..\..\lib\apr\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /I "..\..\os\win32" /I "..\..\srclib\apr\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /FD /c # SUBTRACT CPP /YX # ADD BASE MTL /nologo /D "NDEBUG" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 @@ -53,8 +53,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\lib\apr\Release" /base:@BaseAddr.ref,mod_info -# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\lib\apr\Release" /base:@BaseAddr.ref,mod_info +# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\srclib\apr\Release" /base:@BaseAddr.ref,mod_info +# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\srclib\apr\Release" /base:@BaseAddr.ref,mod_info !ELSEIF "$(CFG)" == "mod_info - Win32 Debug" @@ -70,7 +70,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\include" /I ".\\" /I "..\..\lib\apr\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /FD /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\include" /I "..\..\os\win32" /I "..\..\srclib\apr\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /FD /c # SUBTRACT CPP /YX # ADD BASE MTL /nologo /D "_DEBUG" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 @@ -80,8 +80,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug" /base:@BaseAddr.ref,mod_info -# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug" /base:@BaseAddr.ref,mod_info +# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\srclib\apr\Debug" /base:@BaseAddr.ref,mod_info +# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\srclib\apr\Debug" /base:@BaseAddr.ref,mod_info # SUBTRACT LINK32 /incremental:no /map !ENDIF @@ -92,7 +92,7 @@ LINK32=link.exe # Name "mod_info - Win32 Debug" # Begin Source File -SOURCE=..\..\modules\standard\mod_info.c +SOURCE=.\mod_info.c # End Source File # End Target # End Project diff --git a/modules/generators/mod_status.dsp b/modules/generators/mod_status.dsp index f90f2280bb..c8b0218964 100644 --- a/modules/generators/mod_status.dsp +++ b/modules/generators/mod_status.dsp @@ -43,7 +43,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /I ".\\" /I "..\..\lib\apr\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /I "..\..\os\win32" /I "..\..\srclib\apr\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /FD /c # SUBTRACT CPP /YX # ADD BASE MTL /nologo /D "NDEBUG" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 @@ -53,8 +53,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\lib\apr\Release" /base:@BaseAddr.ref,mod_status -# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\lib\apr\Release" /base:@BaseAddr.ref,mod_status +# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\srclib\apr\Release" /base:@BaseAddr.ref,mod_status +# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\srclib\apr\Release" /base:@BaseAddr.ref,mod_status !ELSEIF "$(CFG)" == "mod_status - Win32 Debug" @@ -70,7 +70,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\include" /I ".\\" /I "..\..\lib\apr\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /FD /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\include" /I "..\..\os\win32" /I "..\..\srclib\apr\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /FD /c # SUBTRACT CPP /YX # ADD BASE MTL /nologo /D "_DEBUG" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 @@ -80,8 +80,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug" /base:@BaseAddr.ref,mod_status -# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug" /base:@BaseAddr.ref,mod_status +# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\srclib\apr\Debug" /base:@BaseAddr.ref,mod_status +# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\srclib\apr\Debug" /base:@BaseAddr.ref,mod_status # SUBTRACT LINK32 /incremental:no /map !ENDIF @@ -92,7 +92,7 @@ LINK32=link.exe # Name "mod_status - Win32 Debug" # Begin Source File -SOURCE=..\..\modules\standard\mod_status.c +SOURCE=.\mod_status.c # End Source File # End Target # End Project diff --git a/modules/mappers/mod_rewrite.dsp b/modules/mappers/mod_rewrite.dsp index ebe7d0f444..a5c1d30df5 100644 --- a/modules/mappers/mod_rewrite.dsp +++ b/modules/mappers/mod_rewrite.dsp @@ -43,7 +43,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /I ".\\" /I "..\..\lib\apr\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "NO_DBM_REWRITEMAP" /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /I "..\..\os\win32" /I "..\..\srclib\apr\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "NO_DBM_REWRITEMAP" /FD /c # SUBTRACT CPP /YX # ADD BASE MTL /nologo /D "NDEBUG" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 @@ -53,8 +53,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\lib\apr\Release" /base:@BaseAddr.ref,mod_rewrite -# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\lib\apr\Release" /base:@BaseAddr.ref,mod_rewrite +# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\srclib\apr\Release" /base:@BaseAddr.ref,mod_rewrite +# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\srclib\apr\Release" /base:@BaseAddr.ref,mod_rewrite !ELSEIF "$(CFG)" == "mod_rewrite - Win32 Debug" @@ -70,7 +70,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MTd /W3 /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /c -# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I "..\..\include" /I ".\\" /I "..\..\lib\apr\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "NO_DBM_REWRITEMAP" /FD /c +# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I "..\..\include" /I "..\..\os\win32" /I "..\..\srclib\apr\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "NO_DBM_REWRITEMAP" /FD /c # SUBTRACT CPP /YX # ADD BASE MTL /nologo /D "_DEBUG" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 @@ -80,8 +80,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug" /base:@BaseAddr.ref,mod_rewrite -# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug" /base:@BaseAddr.ref,mod_rewrite +# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\srclib\apr\Debug" /base:@BaseAddr.ref,mod_rewrite +# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\srclib\apr\Debug" /base:@BaseAddr.ref,mod_rewrite # SUBTRACT LINK32 /incremental:no /map !ENDIF @@ -92,7 +92,7 @@ LINK32=link.exe # Name "mod_rewrite - Win32 Debug" # Begin Source File -SOURCE=..\..\modules\standard\mod_rewrite.c +SOURCE=.\mod_rewrite.c # End Source File # End Target # End Project diff --git a/modules/mappers/mod_speling.dsp b/modules/mappers/mod_speling.dsp index cf7c692d51..81840e3e55 100644 --- a/modules/mappers/mod_speling.dsp +++ b/modules/mappers/mod_speling.dsp @@ -43,7 +43,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /I ".\\" /I "..\..\lib\apr\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /I "..\..\os\win32" /I "..\..\srclib\apr\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /FD /c # SUBTRACT CPP /YX # ADD BASE MTL /nologo /D "NDEBUG" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 @@ -53,8 +53,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\lib\apr\Release" /base:@BaseAddr.ref,mod_speling -# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\lib\apr\Release" /base:@BaseAddr.ref,mod_speling +# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\srclib\apr\Release" /base:@BaseAddr.ref,mod_speling +# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\srclib\apr\Release" /base:@BaseAddr.ref,mod_speling !ELSEIF "$(CFG)" == "mod_speling - Win32 Debug" @@ -70,7 +70,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\include" /I ".\\" /I "..\..\lib\apr\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /FD /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\include" /I "..\..\os\win32" /I "..\..\srclib\apr\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /FD /c # SUBTRACT CPP /YX # ADD BASE MTL /nologo /D "_DEBUG" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 @@ -80,8 +80,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug" /base:@BaseAddr.ref,mod_speling -# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug" /base:@BaseAddr.ref,mod_speling +# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\srclib\apr\Debug" /base:@BaseAddr.ref,mod_speling +# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\srclib\apr\Debug" /base:@BaseAddr.ref,mod_speling # SUBTRACT LINK32 /incremental:no /map !ENDIF @@ -92,7 +92,7 @@ LINK32=link.exe # Name "mod_speling - Win32 Debug" # Begin Source File -SOURCE=..\..\modules\standard\mod_speling.c +SOURCE=.\mod_speling.c # End Source File # End Target # End Project diff --git a/modules/metadata/mod_cern_meta.dsp b/modules/metadata/mod_cern_meta.dsp index 9c2defc7ff..cd89aeb2e1 100644 --- a/modules/metadata/mod_cern_meta.dsp +++ b/modules/metadata/mod_cern_meta.dsp @@ -43,7 +43,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /I ".\\" /I "..\..\lib\apr\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /I "..\..\os\win32" /I "..\..\srclib\apr\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /FD /c # SUBTRACT CPP /YX # ADD BASE MTL /nologo /D "NDEBUG" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 @@ -53,8 +53,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\lib\apr\Release" /base:@BaseAddr.ref,mod_cern_meta -# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\lib\apr\Release" /base:@BaseAddr.ref,mod_cern_meta +# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\srclib\apr\Release" /base:@BaseAddr.ref,mod_cern_meta +# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\srclib\apr\Release" /base:@BaseAddr.ref,mod_cern_meta !ELSEIF "$(CFG)" == "mod_cern_meta - Win32 Debug" @@ -70,7 +70,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\include" /I ".\\" /I "..\..\lib\apr\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /FD /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\include" /I "..\..\os\win32" /I "..\..\srclib\apr\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /FD /c # SUBTRACT CPP /YX # ADD BASE MTL /nologo /D "_DEBUG" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 @@ -80,8 +80,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug" /base:@BaseAddr.ref,mod_cern_meta -# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug" /base:@BaseAddr.ref,mod_cern_meta +# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\srclib\apr\Debug" /base:@BaseAddr.ref,mod_cern_meta +# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\srclib\apr\Debug" /base:@BaseAddr.ref,mod_cern_meta # SUBTRACT LINK32 /incremental:no /map !ENDIF @@ -92,7 +92,7 @@ LINK32=link.exe # Name "mod_cern_meta - Win32 Debug" # Begin Source File -SOURCE=..\..\modules\standard\mod_cern_meta.c +SOURCE=.\mod_cern_meta.c # End Source File # End Target # End Project diff --git a/modules/metadata/mod_expires.dsp b/modules/metadata/mod_expires.dsp index ee49ba63e9..54cb6c8f66 100644 --- a/modules/metadata/mod_expires.dsp +++ b/modules/metadata/mod_expires.dsp @@ -43,7 +43,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /I ".\\" /I "..\..\lib\apr\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /I "..\..\os\win32" /I "..\..\srclib\apr\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /FD /c # SUBTRACT CPP /YX # ADD BASE MTL /nologo /D "NDEBUG" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 @@ -53,8 +53,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\lib\apr\Release" /base:@BaseAddr.ref,mod_expires -# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\lib\apr\Release" /base:@BaseAddr.ref,mod_expires +# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\srclib\apr\Release" /base:@BaseAddr.ref,mod_expires +# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\srclib\apr\Release" /base:@BaseAddr.ref,mod_expires !ELSEIF "$(CFG)" == "mod_expires - Win32 Debug" @@ -70,7 +70,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\include" /I ".\\" /I "..\..\lib\apr\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /FD /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\include" /I "..\..\os\win32" /I "..\..\srclib\apr\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /FD /c # SUBTRACT CPP /YX # ADD BASE MTL /nologo /D "_DEBUG" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 @@ -80,8 +80,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug" /base:@BaseAddr.ref,mod_expires -# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug" /base:@BaseAddr.ref,mod_expires +# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\srclib\apr\Debug" /base:@BaseAddr.ref,mod_expires +# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\srclib\apr\Debug" /base:@BaseAddr.ref,mod_expires # SUBTRACT LINK32 /incremental:no /map !ENDIF @@ -92,7 +92,7 @@ LINK32=link.exe # Name "mod_expires - Win32 Debug" # Begin Source File -SOURCE=..\..\modules\standard\mod_expires.c +SOURCE=.\mod_expires.c # End Source File # End Target # End Project diff --git a/modules/metadata/mod_headers.dsp b/modules/metadata/mod_headers.dsp index a5c1e640ff..1ed91309de 100644 --- a/modules/metadata/mod_headers.dsp +++ b/modules/metadata/mod_headers.dsp @@ -43,7 +43,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /I ".\\" /I "..\..\lib\apr\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /I "..\..\os\win32" /I "..\..\srclib\apr\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /FD /c # SUBTRACT CPP /YX # ADD BASE MTL /nologo /D "NDEBUG" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 @@ -53,8 +53,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\lib\apr\Release" /base:@BaseAddr.ref,mod_headers -# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\lib\apr\Release" /base:@BaseAddr.ref,mod_headers +# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\srclib\apr\Release" /base:@BaseAddr.ref,mod_headers +# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\srclib\apr\Release" /base:@BaseAddr.ref,mod_headers !ELSEIF "$(CFG)" == "mod_headers - Win32 Debug" @@ -70,7 +70,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\include" /I ".\\" /I "..\..\lib\apr\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /FD /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\include" /I "..\..\os\win32" /I "..\..\srclib\apr\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /FD /c # SUBTRACT CPP /YX # ADD BASE MTL /nologo /D "_DEBUG" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 @@ -80,8 +80,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug" /base:@BaseAddr.ref,mod_headers -# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug" /base:@BaseAddr.ref,mod_headers +# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\srclib\apr\Debug" /base:@BaseAddr.ref,mod_headers +# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\srclib\apr\Debug" /base:@BaseAddr.ref,mod_headers # SUBTRACT LINK32 /incremental:no /map !ENDIF @@ -92,7 +92,7 @@ LINK32=link.exe # Name "mod_headers - Win32 Debug" # Begin Source File -SOURCE=..\..\modules\standard\mod_headers.c +SOURCE=.\mod_headers.c # End Source File # End Target # End Project diff --git a/modules/metadata/mod_usertrack.dsp b/modules/metadata/mod_usertrack.dsp index efaf245949..8537a9fd67 100644 --- a/modules/metadata/mod_usertrack.dsp +++ b/modules/metadata/mod_usertrack.dsp @@ -43,7 +43,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /I ".\\" /I "..\..\lib\apr\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /I "..\..\os\win32" /I "..\..\srclib\apr\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /FD /c # SUBTRACT CPP /YX # ADD BASE MTL /nologo /D "NDEBUG" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 @@ -53,8 +53,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\lib\apr\Release" /base:@BaseAddr.ref,mod_usertrack -# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\lib\apr\Release" /base:@BaseAddr.ref,mod_usertrack +# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\srclib\apr\Release" /base:@BaseAddr.ref,mod_usertrack +# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\srclib\apr\Release" /base:@BaseAddr.ref,mod_usertrack !ELSEIF "$(CFG)" == "mod_usertrack - Win32 Debug" @@ -70,7 +70,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\include" /I ".\\" /I "..\..\lib\apr\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /FD /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\include" /I "..\..\os\win32" /I "..\..\srclib\apr\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /FD /c # SUBTRACT CPP /YX # ADD BASE MTL /nologo /D "_DEBUG" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 @@ -80,8 +80,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug" /base:@BaseAddr.ref,mod_usertrack -# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug" /base:@BaseAddr.ref,mod_usertrack +# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\srclib\apr\Debug" /base:@BaseAddr.ref,mod_usertrack +# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\srclib\apr\Debug" /base:@BaseAddr.ref,mod_usertrack # SUBTRACT LINK32 /incremental:no /map !ENDIF @@ -92,7 +92,7 @@ LINK32=link.exe # Name "mod_usertrack - Win32 Debug" # Begin Source File -SOURCE=..\..\modules\standard\mod_usertrack.c +SOURCE=.\mod_usertrack.c # End Source File # End Target # End Project diff --git a/modules/proxy/mod_proxy.dsp b/modules/proxy/mod_proxy.dsp index b7f1f5cd22..ff1194d31e 100644 --- a/modules/proxy/mod_proxy.dsp +++ b/modules/proxy/mod_proxy.dsp @@ -43,7 +43,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\modules\proxy" /I "..\..\lib\apr\include" /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\srclib\apr\include" /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d "NDEBUG" @@ -52,8 +52,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\lib\apr\Release" /base:@BaseAddr.ref,mod_proxy -# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\lib\apr\Release" /base:@BaseAddr.ref,mod_proxy +# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\srclib\apr\Release" /base:@BaseAddr.ref,mod_proxy +# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\srclib\apr\Release" /base:@BaseAddr.ref,mod_proxy !ELSEIF "$(CFG)" == "mod_proxy - Win32 Debug" @@ -69,7 +69,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\modules\proxy" /I "..\..\lib\apr\include" /I "..\..\include" /I "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /YX /FD /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\srclib\apr\include" /I "..\..\include" /I "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /YX /FD /c # ADD BASE MTL /nologo /D "_DEBUG" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d "_DEBUG" @@ -78,8 +78,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /map /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug" /base:@BaseAddr.ref,mod_proxy -# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug" /base:@BaseAddr.ref,mod_proxy +# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /map /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\srclib\apr\Debug" /base:@BaseAddr.ref,mod_proxy +# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\srclib\apr\Debug" /base:@BaseAddr.ref,mod_proxy # SUBTRACT LINK32 /incremental:no /map !ENDIF @@ -93,23 +93,23 @@ LINK32=link.exe # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90" # Begin Source File -SOURCE=..\..\modules\proxy\mod_proxy.c +SOURCE=.\mod_proxy.c # End Source File # Begin Source File -SOURCE=..\..\modules\proxy\proxy_connect.c +SOURCE=.\proxy_connect.c # End Source File # Begin Source File -SOURCE=..\..\modules\proxy\proxy_ftp.c +SOURCE=.\proxy_ftp.c # End Source File # Begin Source File -SOURCE=..\..\modules\proxy\proxy_http.c +SOURCE=.\proxy_http.c # End Source File # Begin Source File -SOURCE=..\..\modules\proxy\proxy_util.c +SOURCE=.\proxy_util.c # End Source File # End Group # Begin Group "Header Files" @@ -117,7 +117,7 @@ SOURCE=..\..\modules\proxy\proxy_util.c # PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd" # Begin Source File -SOURCE=..\..\modules\proxy\mod_proxy.h +SOURCE=.\mod_proxy.h # End Source File # End Group # End Target diff --git a/server/gen_test_char.dsp b/server/gen_test_char.dsp index f0ccfbb1a0..98eddf9c34 100644 --- a/server/gen_test_char.dsp +++ b/server/gen_test_char.dsp @@ -42,7 +42,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\include" /I "..\lib\apr\include" /I "..\os\win32" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\include" /I "..\srclib\apr\include" /I "..\os\win32" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c # ADD BASE RSC /l 0x809 /d "NDEBUG" # ADD RSC /l 0x809 /d "NDEBUG" BSC32=bscmake.exe @@ -66,7 +66,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 "_CONSOLE" /D "_MBCS" /FD /c -# ADD CPP /nologo /MDd /W3 /Gm /ZI /Od /I "..\include" /I "..\lib\apr\include" /I "..\os\win32" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c +# ADD CPP /nologo /MDd /W3 /Gm /ZI /Od /I "..\include" /I "..\srclib\apr\include" /I "..\os\win32" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c # SUBTRACT CPP /Fr # ADD BASE RSC /l 0x809 /d "_DEBUG" # ADD RSC /l 0x809 /d "_DEBUG" diff --git a/srclib/expat-lite/expatlib.dsp b/srclib/expat-lite/expatlib.dsp index 66b3f40dbf..368fd53adc 100644 --- a/srclib/expat-lite/expatlib.dsp +++ b/srclib/expat-lite/expatlib.dsp @@ -93,31 +93,31 @@ LINK32=link.exe # Name "expatlib - Win32 Debug" # Begin Source File -SOURCE="..\..\lib\expat-lite\hashtable.c" +SOURCE=".\hashtable.c" # End Source File # Begin Source File -SOURCE="..\..\lib\expat-lite\xmlparse.c" +SOURCE=".\xmlparse.c" # End Source File # Begin Source File -SOURCE="..\..\lib\expat-lite\xmlparse.h" +SOURCE=".\xmlparse.h" # End Source File # Begin Source File -SOURCE="..\..\lib\expat-lite\dllmain.c" +SOURCE=".\dllmain.c" # End Source File # Begin Source File -SOURCE="..\..\lib\expat-lite\xmlrole.c" +SOURCE=".\xmlrole.c" # End Source File # Begin Source File -SOURCE="..\..\lib\expat-lite\xmltok.c" +SOURCE=".\xmltok.c" # End Source File # Begin Source File -SOURCE="..\..\lib\expat-lite\expatlib.def" +SOURCE=".\expatlib.def" # End Source File # End Target diff --git a/srclib/expat-lite/libexpat.dsp b/srclib/expat-lite/libexpat.dsp index 66b3f40dbf..368fd53adc 100644 --- a/srclib/expat-lite/libexpat.dsp +++ b/srclib/expat-lite/libexpat.dsp @@ -93,31 +93,31 @@ LINK32=link.exe # Name "expatlib - Win32 Debug" # Begin Source File -SOURCE="..\..\lib\expat-lite\hashtable.c" +SOURCE=".\hashtable.c" # End Source File # Begin Source File -SOURCE="..\..\lib\expat-lite\xmlparse.c" +SOURCE=".\xmlparse.c" # End Source File # Begin Source File -SOURCE="..\..\lib\expat-lite\xmlparse.h" +SOURCE=".\xmlparse.h" # End Source File # Begin Source File -SOURCE="..\..\lib\expat-lite\dllmain.c" +SOURCE=".\dllmain.c" # End Source File # Begin Source File -SOURCE="..\..\lib\expat-lite\xmlrole.c" +SOURCE=".\xmlrole.c" # End Source File # Begin Source File -SOURCE="..\..\lib\expat-lite\xmltok.c" +SOURCE=".\xmltok.c" # End Source File # Begin Source File -SOURCE="..\..\lib\expat-lite\expatlib.def" +SOURCE=".\expatlib.def" # End Source File # End Target diff --git a/srclib/expat-lite/xmlparse.dsp b/srclib/expat-lite/xmlparse.dsp index fc59cca815..e00e0bc30b 100644 --- a/srclib/expat-lite/xmlparse.dsp +++ b/srclib/expat-lite/xmlparse.dsp @@ -93,20 +93,20 @@ LINK32=link.exe # Name "xmlparse - Win32 Debug" # Begin Source File -SOURCE="..\..\lib\expat-lite\hashtable.c" +SOURCE=".\hashtable.c" # End Source File # Begin Source File -SOURCE="..\..\lib\expat-lite\xmlparse.c" +SOURCE=".\xmlparse.c" # End Source File # Begin Source File -SOURCE="..\..\lib\expat-lite\xmlparse.def" +SOURCE=".\xmlparse.def" # PROP Exclude_From_Build 1 # End Source File # Begin Source File -SOURCE="..\..\lib\expat-lite\xmlparse.h" +SOURCE=".\xmlparse.h" # End Source File # End Target # End Project diff --git a/srclib/expat-lite/xmltok.dsp b/srclib/expat-lite/xmltok.dsp index 10228f87e8..89531f4223 100644 --- a/srclib/expat-lite/xmltok.dsp +++ b/srclib/expat-lite/xmltok.dsp @@ -93,19 +93,19 @@ LINK32=link.exe # Name "xmltok - Win32 Debug" # Begin Source File -SOURCE="..\..\lib\expat-lite\dllmain.c" +SOURCE=".\dllmain.c" # End Source File # Begin Source File -SOURCE="..\..\lib\expat-lite\xmlrole.c" +SOURCE=".\xmlrole.c" # End Source File # Begin Source File -SOURCE="..\..\lib\expat-lite\xmltok.c" +SOURCE=".\xmltok.c" # End Source File # Begin Source File -SOURCE="..\..\lib\expat-lite\xmltok.def" +SOURCE=".\xmltok.def" # PROP Exclude_From_Build 1 # End Source File # End Target diff --git a/support/ab.dsp b/support/ab.dsp index dcc427228a..9222ca1ceb 100644 --- a/support/ab.dsp +++ b/support/ab.dsp @@ -42,7 +42,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "../lib/apr/include" /I "../include" /I "../os/win32" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "APR_DECLARE_STATIC" /D "AP_DECLARE_STATIC" /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "../srclib/apr/include" /I "../include" /I "../os/win32" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "APR_DECLARE_STATIC" /D "AP_DECLARE_STATIC" /FD /c # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" BSC32=bscmake.exe @@ -67,7 +67,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I "../lib/apr/include" /I "../include" /I "../os/win32" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "APR_DECLARE_STATIC" /D "AP_DECLARE_STATIC" /FD /c +# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I "../srclib/apr/include" /I "../include" /I "../os/win32" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "APR_DECLARE_STATIC" /D "AP_DECLARE_STATIC" /FD /c # SUBTRACT CPP /YX # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" diff --git a/support/htdigest.dsp b/support/htdigest.dsp index baa27b1fec..37760b2b03 100644 --- a/support/htdigest.dsp +++ b/support/htdigest.dsp @@ -42,7 +42,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "../lib/apr/include" /I "../include" /I "../os/win32" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "APR_DECLARE_STATIC" /D "AP_DECLARE_STATIC" /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "../srclib/apr/include" /I "../include" /I "../os/win32" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "APR_DECLARE_STATIC" /D "AP_DECLARE_STATIC" /FD /c # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" BSC32=bscmake.exe @@ -67,7 +67,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I "../lib/apr/include" /I "../include" /I "../os/win32" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "APR_DECLARE_STATIC" /D "AP_DECLARE_STATIC" /FD /c +# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I "../srclib/apr/include" /I "../include" /I "../os/win32" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "APR_DECLARE_STATIC" /D "AP_DECLARE_STATIC" /FD /c # SUBTRACT CPP /YX # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" diff --git a/support/htpasswd.dsp b/support/htpasswd.dsp index cc18b50f8d..227e756b47 100644 --- a/support/htpasswd.dsp +++ b/support/htpasswd.dsp @@ -42,7 +42,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "../lib/apr/include" /I "../include" /I "../os/win32" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "APR_DECLARE_STATIC" /D "AP_DECLARE_STATIC" /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "../srclib/apr/include" /I "../include" /I "../os/win32" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "APR_DECLARE_STATIC" /D "AP_DECLARE_STATIC" /FD /c # SUBTRACT CPP /YX # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" @@ -67,7 +67,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I "../lib/apr/include" /I "../include" /I "../os/win32" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "APR_DECLARE_STATIC" /D "AP_DECLARE_STATIC" /FD /c +# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I "../srclib/apr/include" /I "../include" /I "../os/win32" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "APR_DECLARE_STATIC" /D "AP_DECLARE_STATIC" /FD /c # SUBTRACT CPP /YX # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" diff --git a/support/logresolve.dsp b/support/logresolve.dsp index 0bf4289b8f..2d438769af 100644 --- a/support/logresolve.dsp +++ b/support/logresolve.dsp @@ -42,7 +42,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "../lib/apr/include" /I "../include" /I "../os/win32" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "APR_DECLARE_STATIC" /D "AP_DECLARE_STATIC" /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "../srclib/apr/include" /I "../include" /I "../os/win32" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "APR_DECLARE_STATIC" /D "AP_DECLARE_STATIC" /FD /c # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" BSC32=bscmake.exe @@ -67,7 +67,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c -# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I "../lib/apr/include" /I "../include" /I "../os/win32" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "APR_DECLARE_STATIC" /D "AP_DECLARE_STATIC" /FD /c +# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I "../srclib/apr/include" /I "../include" /I "../os/win32" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "APR_DECLARE_STATIC" /D "AP_DECLARE_STATIC" /FD /c # SUBTRACT CPP /Fr # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" diff --git a/support/rotatelogs.dsp b/support/rotatelogs.dsp index 9266590714..e98d628a6a 100644 --- a/support/rotatelogs.dsp +++ b/support/rotatelogs.dsp @@ -42,7 +42,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "../lib/apr/include" /I "../include" /I "../os/win32" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "APR_DECLARE_STATIC" /D "AP_DECLARE_STATIC" /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "../srclib/apr/include" /I "../include" /I "../os/win32" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "APR_DECLARE_STATIC" /D "AP_DECLARE_STATIC" /FD /c # SUBTRACT CPP /YX # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" @@ -67,7 +67,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I "../lib/apr/include" /I "../include" /I "../os/win32" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "APR_DECLARE_STATIC" /D "AP_DECLARE_STATIC" /FD /c +# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I "../srclib/apr/include" /I "../include" /I "../os/win32" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "APR_DECLARE_STATIC" /D "AP_DECLARE_STATIC" /FD /c # SUBTRACT CPP /YX # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" |