summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Apache.dsw18
-rw-r--r--InstallBin.dsp6
-rw-r--r--modules/aaa/mod_auth_digest.dsp6
-rw-r--r--modules/proxy/mod_proxy.dsp12
-rw-r--r--os/win32/BaseAddr.ref20
5 files changed, 43 insertions, 19 deletions
diff --git a/Apache.dsw b/Apache.dsw
index a13cb4e97a..4fe105e052 100644
--- a/Apache.dsw
+++ b/Apache.dsw
@@ -66,6 +66,18 @@ Package=<4>
###############################################################################
+Project: "ApacheModuleAuthDigest"=".\os\win32\ApacheModuleAuthDigest.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
Project: "ApacheModuleCERNMeta"=".\os\win32\ApacheModuleCERNMeta.dsp" - Package Owner=<4>
Package=<5>
@@ -275,6 +287,9 @@ Package=<4>
Begin Project Dependency
Project_Dep_Name rotatelogs
End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name ApacheModuleAuthDigest
+ End Project Dependency
}}}
###############################################################################
@@ -287,6 +302,9 @@ Package=<5>
Package=<4>
{{{
+ Begin Project Dependency
+ Project_Dep_Name aprlib
+ End Project Dependency
}}}
###############################################################################
diff --git a/InstallBin.dsp b/InstallBin.dsp
index cb5b7c67b9..412863ee3a 100644
--- a/InstallBin.dsp
+++ b/InstallBin.dsp
@@ -38,7 +38,7 @@ CFG=InstallBin - Win32 Debug
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "Release"
# PROP Intermediate_Dir "Release"
-# PROP Cmd_Line "NMAKE /f makefile.win INSTDIR=.. SHORT=D LONG=Debug _install"
+# PROP Cmd_Line "NMAKE /f makefile.win INSTDIR=.. SHORT=R LONG=Release _install"
# PROP Rebuild_Opt ""
# PROP Target_File "..\Apache.exe"
# PROP Bsc_Name ""
@@ -82,6 +82,10 @@ SOURCE=..\logs\access.log
# End Source File
# Begin Source File
+SOURCE=.\os\win32\BaseAddr.ref
+# End Source File
+# Begin Source File
+
SOURCE=..\logs\error.log
# End Source File
# Begin Source File
diff --git a/modules/aaa/mod_auth_digest.dsp b/modules/aaa/mod_auth_digest.dsp
index 2f700573f5..7e18d755bc 100644
--- a/modules/aaa/mod_auth_digest.dsp
+++ b/modules/aaa/mod_auth_digest.dsp
@@ -55,7 +55,8 @@ 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 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\lib\apr\Release"
+# 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
+# SUBTRACT LINK32 /pdb:none
!ELSEIF "$(CFG)" == "ApacheModuleAuthDigest - Win32 Debug"
@@ -81,7 +82,8 @@ 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 /map /debug /machine:I386 /pdbtype:sept /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug"
+# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map /debug /machine:I386 /pdbtype:sept /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug" /base:@BaseAddr.ref,mod_auth_digest
+# SUBTRACT LINK32 /pdb:none
!ENDIF
diff --git a/modules/proxy/mod_proxy.dsp b/modules/proxy/mod_proxy.dsp
index 2101cf1d6f..b093c48c57 100644
--- a/modules/proxy/mod_proxy.dsp
+++ b/modules/proxy/mod_proxy.dsp
@@ -45,7 +45,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" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /D "WIN32_LEAN_AND_MEAN" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\lib\apr\include" /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /D "WIN32_LEAN_AND_MEAN" /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x809 /d "NDEBUG"
@@ -54,8 +54,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 /base:@BaseAddr.ref,mod_proxy /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\lib\apr\Release"
-# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib ws2_32.lib mswsock.lib /nologo /base:@BaseAddr.ref,mod_proxy /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\lib\apr\Release"
+# 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
!ELSEIF "$(CFG)" == "ApacheModuleProxy - Win32 Debug"
@@ -71,7 +71,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" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /D "WIN32_LEAN_AND_MEAN" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\lib\apr\include" /I "..\..\include" /I "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /D "WIN32_LEAN_AND_MEAN" /YX /FD /c
# ADD BASE MTL /nologo /D "_DEBUG" /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x809 /d "_DEBUG"
@@ -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 ws2_32.lib mswsock.lib /nologo /base:@BaseAddr.ref,mod_proxy /subsystem:windows /dll /map /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug"
-# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib ws2_32.lib mswsock.lib /nologo /base:@BaseAddr.ref,mod_proxy /subsystem:windows /dll /map /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug"
+# 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 /map /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug" /base:@BaseAddr.ref,mod_proxy
!ENDIF
diff --git a/os/win32/BaseAddr.ref b/os/win32/BaseAddr.ref
index 23279efc53..b72f6b2a25 100644
--- a/os/win32/BaseAddr.ref
+++ b/os/win32/BaseAddr.ref
@@ -12,13 +12,13 @@
aprlib 0x6FFA0000 0x00060000
ApacheCore 0x6FF00000 0x000A0000
mod_auth_anon 0x6FEF0000 0x00010000
-mod_cern_meta 0x6FEE0000 0x00010000
-mod_auth_digest 0x6FED0000 0x00010000
-mod_expires 0x6FEC0000 0x00010000
-mod_headers 0x6FEB0000 0x00010000
-mod_info 0x6FEA0000 0x00010000
-mod_rewrite 0x6FE80000 0x00020000
-mod_speling 0x6FE70000 0x00010000
-mod_status 0x6FE60000 0x00010000
-mod_usertrack 0x6FE50000 0x00010000
-mod_proxy 0x6FE30000 0x00020000
+mod_auth_digest 0x6FED0000 0x00020000
+mod_cern_meta 0x6FEC0000 0x00010000
+mod_expires 0x6FEB0000 0x00010000
+mod_headers 0x6FEA0000 0x00010000
+mod_info 0x6FE90000 0x00010000
+mod_rewrite 0x6FE70000 0x00020000
+mod_speling 0x6FE60000 0x00010000
+mod_status 0x6FE50000 0x00010000
+mod_usertrack 0x6FE40000 0x00010000
+mod_proxy 0x6FE20000 0x00020000
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-01 19:54:09 +0100