diff options
author | Bill Stoddard <stoddard@apache.org> | 2000-04-20 21:28:08 +0200 |
---|---|---|
committer | Bill Stoddard <stoddard@apache.org> | 2000-04-20 21:28:08 +0200 |
commit | 17c5e3fb7a18915e797422c644c0c9314d22917e (patch) | |
tree | 223d8d92fe85407ec2c1a807f3414bd23901fb34 /modules/metadata/mod_headers.dsp | |
parent | OS/2: EXTRA_LDFLAGS is required when linking the table generation programs. (diff) | |
download | apache2-17c5e3fb7a18915e797422c644c0c9314d22917e.tar.xz apache2-17c5e3fb7a18915e797422c644c0c9314d22917e.zip |
Revamp the Win32 make environment. Makefiles have been removed and
Apache.dsw created to bring together all the pieces. Create new file
os/win32/BaseAddr.ref to define module base addresses (to prevent
dll relocation at start-up).
Submitted by: William Rowe
Reviewed by: Bill Stoddard
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85004 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'modules/metadata/mod_headers.dsp')
-rw-r--r-- | modules/metadata/mod_headers.dsp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/modules/metadata/mod_headers.dsp b/modules/metadata/mod_headers.dsp index 32bc73f5da..0733544816 100644 --- 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 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" +# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /base:@BaseAddr.ref,mod_headers /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\lib\apr\Release" +# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /base:@BaseAddr.ref,mod_headers /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 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" +# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /base:@BaseAddr.ref,mod_headers /subsystem:windows /dll /map /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug" +# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /base:@BaseAddr.ref,mod_headers /subsystem:windows /dll /map /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug" !ENDIF |