linkwin20.diffs Resolves:

1) Explicit /base: addresses by the following table...

  Required sizes are for debug builds.  It is assumed that
  as we increase the size of aprlib, we will be trimming
  the size of ApacheCore, and the 278A0000 base can move down.

  ApacheCore.dll            27800000  80000 required

  aprlib.dll                278A0000  40000 required

  ApacheModuleAuthAnon.dsp  27900000
  ApacheModuleCERNMeta.dsp  27910000
  ApacheModuleDigest.dsp    27920000
  ApacheModuleExpires.dsp   27930000
  ApacheModuleHeaders.dsp   27940000
  ApacheModuleInfo.dll      27950000
  ApacheModuleRewrite.dsp   27960000  20000 required

  ApacheModuleSpeling.dsp   27980000
  ApacheModuleStatus.dsp    27990000
  ApacheModuleUserTrack.dsp 279A0000
  ApacheModuleProxy.dsp     279B0000  20000 anticipated

  3 slots still available   279C0000

2) Make APR consistent with the rest of the API and
   not build septypes for debugging (in other words,
   roll in the debug symbols as every other module does.)

   If we decide we LIKE /pdbtype:septypes... then we
   should be using them throughout.

3) Slide the current path specs into /libpath: options
   so the library list is more ledgible.

4) Drop all the gui crud from the library list.  Everything
   listed is referenced, with the following exceptions:

   *) don't do anything with msvcrtd/oldnames today.
   *) aprlib and ApacheCore have the same list, since functions
      may still be moving between them.
   *) apache.exe looses networking (it doesn't), while it keeps
      advapi, which I don't think it needs, but it could later.
   *) add aprlib to ApacheModuleProxy, since it will need it.
   *) hang mswsock whereever ws2_32 is invoked.  I believe
      the most special case was ApacheModuleProxy, which may
      become entirely APR.  But for today we hang onto both.

5) MAP, MAP, MAP, everything gets a map.  I for one have an
   untold number of installed OS's and boot mappings, and the
   debugger isn't installed to all of them.  We gotta be able
   to track down those renegade GP faults.  (What faults...
   I know, it's clean, but I am overly cautious that way.)

6) Set the DEFAULT linkage to be this linkage.  Because
   "it's a vc thing" the defaults were not all that
   useful as a starting point (take, for example, the
   joke of linking to the OLE libraries).

Submitted by:	William Rowe

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84982 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/Apache.dsp b/Apache.dsp
index ded0f46153ee53dc2940d81198be92dfd3bb8e07..d115a35406689dcbeac7f2a2823e0773f8977a18 100644 (file)
--- a/Apache.dsp
+++ b/Apache.dsp
@@ -49,8 +49,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 lib\apr\Release\aprlib.lib CoreR\ApacheCore.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:console /machine:I386
+# ADD BASE LINK32 aprlib.lib ApacheCore.lib kernel32.lib advapi32.lib /nologo /subsystem:console /map /machine:I386 /libpath:"lib\apr\Release" /libpath:"CoreR"
+# ADD LINK32 aprlib.lib ApacheCore.lib kernel32.lib advapi32.lib /nologo /subsystem:console /map /machine:I386 /libpath:"lib\apr\Release" /libpath:"CoreR"
 
 !ELSEIF  "$(CFG)" == "Apache - Win32 Debug"
 
@@ -74,8 +74,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # 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:console /debug /machine:I386
-# ADD LINK32 lib\apr\debug\aprlib.lib CoreD\ApacheCore.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:console /debug /machine:I386
+# ADD BASE LINK32 aprlib.lib ApacheCore.lib kernel32.lib advapi32.lib /nologo /subsystem:console /map /debug /machine:I386 /libpath:"lib\apr\debug" /libpath:"CoreD"
+# ADD LINK32 aprlib.lib ApacheCore.lib kernel32.lib advapi32.lib /nologo /subsystem:console /map /debug /machine:I386 /libpath:"lib\apr\debug" /libpath:"CoreD"
 
 !ENDIF 
 

diff --git a/ApacheCore.dsp b/ApacheCore.dsp
index 113bb49cdf093002b619be12e9710eac1fd5db5d..ef2425742d08f15fb9e8be4c6ae64c6b946ac756 100644 (file)
--- a/ApacheCore.dsp
+++ b/ApacheCore.dsp
@@ -54,8 +54,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # 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 lib\apr\Release\aprlib.lib regex\release\regex.lib ap\Release\ap.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /machine:I386
+# ADD BASE LINK32 aprlib.lib regex.lib ap.lib kernel32.lib advapi32.lib ws2_32.lib mswsock.lib /nologo /base:"0x27800000" /subsystem:windows /dll /map /machine:I386 /libpath:"lib\apr\Release" /libpath:"regex\release" /libpath:"ap\Release"
+# ADD LINK32 aprlib.lib regex.lib ap.lib kernel32.lib advapi32.lib ws2_32.lib mswsock.lib /nologo /base:"0x27800000" /subsystem:windows /dll /map /machine:I386 /libpath:"lib\apr\Release" /libpath:"regex\release" /libpath:"ap\Release"
 
 !ELSEIF  "$(CFG)" == "ApacheCore - Win32 Debug"
 
@@ -81,9 +81,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # 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
-# ADD LINK32 lib\apr\debug\aprlib.lib regex\debug\regex.lib ap\Debug\ap.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /debug /machine:I386
-# SUBTRACT LINK32 /map
+# ADD BASE LINK32 aprlib.lib regex.lib ap.lib kernel32.lib advapi32.lib ws2_32.lib mswsock.lib /nologo /base:"0x27800000" /subsystem:windows /dll /map /debug /machine:I386 /libpath:"lib\apr\debug" /libpath:"regex\debug" /libpath:"ap\Debug"
+# ADD LINK32 aprlib.lib regex.lib ap.lib kernel32.lib advapi32.lib ws2_32.lib mswsock.lib /nologo /base:"0x27800000" /subsystem:windows /dll /map /debug /machine:I386 /libpath:"lib\apr\debug" /libpath:"regex\debug" /libpath:"ap\Debug"
 
 !ENDIF 
 

diff --git a/httpd.dsp b/httpd.dsp
index 113bb49cdf093002b619be12e9710eac1fd5db5d..ef2425742d08f15fb9e8be4c6ae64c6b946ac756 100644 (file)
--- a/httpd.dsp
+++ b/httpd.dsp
@@ -54,8 +54,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # 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 lib\apr\Release\aprlib.lib regex\release\regex.lib ap\Release\ap.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /machine:I386
+# ADD BASE LINK32 aprlib.lib regex.lib ap.lib kernel32.lib advapi32.lib ws2_32.lib mswsock.lib /nologo /base:"0x27800000" /subsystem:windows /dll /map /machine:I386 /libpath:"lib\apr\Release" /libpath:"regex\release" /libpath:"ap\Release"
+# ADD LINK32 aprlib.lib regex.lib ap.lib kernel32.lib advapi32.lib ws2_32.lib mswsock.lib /nologo /base:"0x27800000" /subsystem:windows /dll /map /machine:I386 /libpath:"lib\apr\Release" /libpath:"regex\release" /libpath:"ap\Release"
 
 !ELSEIF  "$(CFG)" == "ApacheCore - Win32 Debug"
 
@@ -81,9 +81,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # 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
-# ADD LINK32 lib\apr\debug\aprlib.lib regex\debug\regex.lib ap\Debug\ap.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /debug /machine:I386
-# SUBTRACT LINK32 /map
+# ADD BASE LINK32 aprlib.lib regex.lib ap.lib kernel32.lib advapi32.lib ws2_32.lib mswsock.lib /nologo /base:"0x27800000" /subsystem:windows /dll /map /debug /machine:I386 /libpath:"lib\apr\debug" /libpath:"regex\debug" /libpath:"ap\Debug"
+# ADD LINK32 aprlib.lib regex.lib ap.lib kernel32.lib advapi32.lib ws2_32.lib mswsock.lib /nologo /base:"0x27800000" /subsystem:windows /dll /map /debug /machine:I386 /libpath:"lib\apr\debug" /libpath:"regex\debug" /libpath:"ap\Debug"
 
 !ENDIF 
 

diff --git a/modules/aaa/mod_auth_anon.dsp b/modules/aaa/mod_auth_anon.dsp
index 3f4056b3997f5afa4f2b2ceaa4f3a55e4527fa64..4bb085466320b2bee213fa08820662cb48b14287 100644 (file)
--- a/modules/aaa/mod_auth_anon.dsp
+++ b/modules/aaa/mod_auth_anon.dsp
@@ -55,8 +55,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # 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 ..\..\CoreR\ApacheCore.lib ..\..\lib\apr\Release\aprlib.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:windows /dll /machine:I386
+# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /base:"0x27900000" /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\lib\apr\Release"
+# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /base:"0x27900000" /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\lib\apr\Release"
 
 !ELSEIF  "$(CFG)" == "ApacheModuleAuthAnon - Win32 Debug"
 
@@ -82,8 +82,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # 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
-# ADD LINK32 ..\..\CoreD\ApacheCore.lib ..\..\lib\apr\Debug\aprlib.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:windows /dll /debug /machine:I386
+# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /base:"0x27900000" /subsystem:windows /dll /map /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug"
+# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /base:"0x27900000" /subsystem:windows /dll /map /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug"
 
 !ENDIF 
 

diff --git a/modules/generators/mod_info.dsp b/modules/generators/mod_info.dsp
index 53126a03a5178c9dc53ff4c81d519250d2adc3e9..0e83dad789014f75e63508d8957c19c0d4b3c584 100644 (file)
--- a/modules/generators/mod_info.dsp
+++ b/modules/generators/mod_info.dsp
@@ -54,8 +54,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # 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 ..\..\CoreR\ApacheCore.lib ..\..\lib\apr\Release\aprlib.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:windows /dll /machine:I386
+# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /base:"0x27950000" /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\lib\apr\Release"
+# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /base:"0x27950000" /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\lib\apr\Release"
 
 !ELSEIF  "$(CFG)" == "ApacheModuleInfo - Win32 Debug"
 
@@ -81,8 +81,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # 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
-# ADD LINK32 ..\..\CoreD\ApacheCore.lib ..\..\lib\apr\Debug\aprlib.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:windows /dll /debug /machine:I386
+# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /base:"0x27950000" /subsystem:windows /dll /map /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug"
+# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /base:"0x27950000" /subsystem:windows /dll /map /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug"
 
 !ENDIF 
 

diff --git a/modules/generators/mod_status.dsp b/modules/generators/mod_status.dsp
index 46f4867f4f9c4bf2e82c32d9a083b23b242b1fc1..534f025eb15405d9831e980b1a8b51fe53d2f52a 100644 (file)
--- a/modules/generators/mod_status.dsp
+++ b/modules/generators/mod_status.dsp
@@ -55,8 +55,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # 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 ..\..\CoreR\ApacheCore.lib ..\..\lib\apr\Release\aprlib.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:windows /dll /machine:I386
+# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /base:"0x27990000" /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\lib\apr\Release"
+# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /base:"0x27990000" /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\lib\apr\Release"
 
 !ELSEIF  "$(CFG)" == "ApacheModuleStatus - Win32 Debug"
 
@@ -82,8 +82,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # 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
-# ADD LINK32 ..\..\CoreD\ApacheCore.lib ..\..\lib\apr\Debug\aprlib.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:windows /dll /debug /machine:I386
+# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /base:"0x27990000" /subsystem:windows /dll /map /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug"
+# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /base:"0x27990000" /subsystem:windows /dll /map /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug"
 
 !ENDIF 
 

diff --git a/modules/mappers/mod_rewrite.dsp b/modules/mappers/mod_rewrite.dsp
index 93d9e292bec5770382484f3369bac4fa0dc95253..a0d28cbcf026ecc86c7033f9904d7c9757706f35 100644 (file)
--- a/modules/mappers/mod_rewrite.dsp
+++ b/modules/mappers/mod_rewrite.dsp
@@ -55,8 +55,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # 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 ..\..\CoreR\ApacheCore.lib ..\..\lib\apr\Release\aprlib.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ws2_32.lib /nologo /subsystem:windows /dll /machine:I386
+# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /base:"0x27960000" /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\lib\apr\Release"
+# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /base:"0x27960000" /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\lib\apr\Release"
 
 !ELSEIF  "$(CFG)" == "ApacheModuleRewrite - Win32 Debug"
 
@@ -82,8 +82,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # 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
-# ADD LINK32 ..\..\CoreD\ApacheCore.lib ..\..\lib\apr\Debug\aprlib.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ws2_32.lib /nologo /subsystem:windows /dll /debug /machine:I386
+# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /base:"0x27960000" /subsystem:windows /dll /map /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug"
+# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /base:"0x27960000" /subsystem:windows /dll /map /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug"
 
 !ENDIF 
 

diff --git a/modules/mappers/mod_speling.dsp b/modules/mappers/mod_speling.dsp
index 9e1205b11afd9f89c49d36cb155affe7fdf85396..0a15efb6d4b6a496329d017995596bd06a890df2 100644 (file)
--- a/modules/mappers/mod_speling.dsp
+++ b/modules/mappers/mod_speling.dsp
@@ -55,8 +55,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # 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 ..\..\CoreR\ApacheCore.lib ..\..\lib\apr\Release\aprlib.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:windows /dll /machine:I386
+# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /base:"0x27980000" /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\lib\apr\Release"
+# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /base:"0x27980000" /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\lib\apr\Release"
 
 !ELSEIF  "$(CFG)" == "ApacheModuleSpeling - Win32 Debug"
 
@@ -82,8 +82,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # 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
-# ADD LINK32 ..\..\CoreD\ApacheCore.lib ..\..\lib\apr\Debug\aprlib.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:windows /dll /debug /machine:I386
+# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /base:"0x27980000" /subsystem:windows /dll /map /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug"
+# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /base:"0x27980000" /subsystem:windows /dll /map /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug"
 
 !ENDIF 
 

diff --git a/modules/metadata/mod_cern_meta.dsp b/modules/metadata/mod_cern_meta.dsp
index 176991046414542b7600a00ab51a4d70caa03435..a815133769af1a155791fff769c86b9dcd2a512d 100644 (file)
--- a/modules/metadata/mod_cern_meta.dsp
+++ b/modules/metadata/mod_cern_meta.dsp
@@ -55,8 +55,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # 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 ..\..\CoreR\ApacheCore.lib ..\..\lib\apr\Release\aprlib.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:windows /dll /machine:I386
+# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /base:"0x27910000" /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\lib\apr\Release"
+# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /base:"0x27910000" /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\lib\apr\Release"
 
 !ELSEIF  "$(CFG)" == "ApacheModuleCERNMeta - Win32 Debug"
 
@@ -82,8 +82,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # 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
-# ADD LINK32 ..\..\CoreD\ApacheCore.lib ..\..\lib\apr\Debug\aprlib.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:windows /dll /debug /machine:I386
+# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /base:"0x27910000" /subsystem:windows /dll /map /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug"
+# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /base:"0x27910000" /subsystem:windows /dll /map /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug"
 
 !ENDIF 
 

diff --git a/modules/metadata/mod_expires.dsp b/modules/metadata/mod_expires.dsp
index 29bdf37974f9491ab5b49372327fa81cf0d568ee..3884e94d8377f6b606428c9e868a76cd6a5a43c2 100644 (file)
--- a/modules/metadata/mod_expires.dsp
+++ b/modules/metadata/mod_expires.dsp
@@ -55,8 +55,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # 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 ..\..\CoreR\ApacheCore.lib ..\..\lib\apr\Release\aprlib.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:windows /dll /machine:I386
+# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /base:"0x27930000" /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\lib\apr\Release"
+# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /base:"0x27930000" /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\lib\apr\Release"
 
 !ELSEIF  "$(CFG)" == "ApacheModuleExpires - Win32 Debug"
 
@@ -82,8 +82,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # 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
-# ADD LINK32 ..\..\CoreD\ApacheCore.lib ..\..\lib\apr\Debug\aprlib.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:windows /dll /debug /machine:I386
+# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /base:"0x27930000" /subsystem:windows /dll /map /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug"
+# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /base:"0x27930000" /subsystem:windows /dll /map /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug"
 
 !ENDIF 
 

diff --git a/modules/metadata/mod_headers.dsp b/modules/metadata/mod_headers.dsp
index 6d8ceec1558e20d83a08eef74d122200a6e98ebf..32bc73f5da1728c8a4c062035bb0128579e07eee 100644 (file)
--- a/modules/metadata/mod_headers.dsp
+++ b/modules/metadata/mod_headers.dsp
@@ -55,8 +55,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # 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 ..\..\CoreR\ApacheCore.lib ..\..\lib\apr\Release\aprlib.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:windows /dll /machine:I386
+# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /base:"0x27940000" /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\lib\apr\Release"
+# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /base:"0x27940000" /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\lib\apr\Release"
 
 !ELSEIF  "$(CFG)" == "ApacheModuleHeaders - Win32 Debug"
 
@@ -82,8 +82,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # 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
-# ADD LINK32 ..\..\CoreD\ApacheCore.lib ..\..\lib\apr\Debug\aprlib.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:windows /dll /debug /machine:I386
+# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /base:"0x27940000" /subsystem:windows /dll /map /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug"
+# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /base:"0x27940000" /subsystem:windows /dll /map /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug"
 
 !ENDIF 
 

diff --git a/modules/metadata/mod_usertrack.dsp b/modules/metadata/mod_usertrack.dsp
index 0a5d19325f51544a4c3fa9b878a54157987ed2ab..859217bcac33b7db585ff1e6312d3222bdf23bc1 100644 (file)
--- a/modules/metadata/mod_usertrack.dsp
+++ b/modules/metadata/mod_usertrack.dsp
@@ -55,8 +55,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # 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 ..\..\CoreR\ApacheCore.lib ..\..\lib\apr\Release\aprlib.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:windows /dll /machine:I386
+# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /base:"0x279A0000" /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\lib\apr\Release"
+# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /base:"0x279A0000" /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\lib\apr\Release"
 
 !ELSEIF  "$(CFG)" == "ApacheModuleUserTrack - Win32 Debug"
 
@@ -82,8 +82,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # 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
-# ADD LINK32 ..\..\CoreD\ApacheCore.lib ..\..\lib\apr\Debug\aprlib.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:windows /dll /debug /machine:I386
+# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /base:"0x279A0000" /subsystem:windows /dll /map /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug"
+# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /base:"0x279A0000" /subsystem:windows /dll /map /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug"
 
 !ENDIF 
 

diff --git a/modules/proxy/mod_proxy.dsp b/modules/proxy/mod_proxy.dsp
index 6ee5cf30ddd0c12e59f80338568d6b7d052e6f61..e5379748ad14d5ee8aa966dd20aaf1d35fcd9581 100644 (file)
--- a/modules/proxy/mod_proxy.dsp
+++ b/modules/proxy/mod_proxy.dsp
@@ -54,8 +54,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # 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 ..\..\CoreR\ApacheCore.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ws2_32.lib /nologo /subsystem:windows /dll /machine:I386
+# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib ws2_32.lib /nologo /base:"0x279B0000" /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:"0x279B0000" /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\lib\apr\Release"
 
 !ELSEIF  "$(CFG)" == "ApacheModuleProxy - Win32 Debug"
 
@@ -80,8 +80,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # 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
-# ADD LINK32 ..\..\CoreD\ApacheCore.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ws2_32.lib /nologo /subsystem:windows /dll /debug /machine:I386
+# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib ws2_32.lib mswsock.lib /nologo /base:"0x279B0000" /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:"0x279B0000" /subsystem:windows /dll /map /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug"
 
 !ENDIF