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 /httpd.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 'httpd.dsp')
| -rw-r--r-- | httpd.dsp | 62 |
1 files changed, 56 insertions, 6 deletions
@@ -54,8 +54,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# 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" +# ADD BASE LINK32 aprlib.lib regex.lib ap.lib kernel32.lib advapi32.lib ws2_32.lib mswsock.lib /nologo /base:@"os\win32\BaseAddr.ref",ApacheCore /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:@"os\win32\BaseAddr.ref",ApacheCore /subsystem:windows /dll /map /machine:I386 /libpath:"lib\apr\Release" /libpath:"regex\release" /libpath:"ap\Release" !ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" @@ -81,8 +81,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# 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" +# ADD BASE LINK32 aprlib.lib regex.lib ap.lib kernel32.lib advapi32.lib ws2_32.lib mswsock.lib /nologo /base:@"os\win32\BaseAddr.ref",ApacheCore /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:@"os\win32\BaseAddr.ref",ApacheCore /subsystem:windows /dll /map /debug /machine:I386 /libpath:"lib\apr\debug" /libpath:"regex\debug" /libpath:"ap\Debug" !ENDIF @@ -415,11 +415,61 @@ SOURCE=.\modules\mpm\winnt\winnt.h # PROP Default_Filter "" # Begin Source File -SOURCE=.\main\test_char.h +SOURCE=.\main\gen_test_char.exe + +!IF "$(CFG)" == "ApacheCore - Win32 Release" + +# Begin Custom Build - Generating test_char.h +InputPath=.\main\gen_test_char.exe + +".\main\test_char.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + .\main\gen_test_char.exe >.\main\test_char.h + echo Generated test_char.h from gen_test_char.exe + +# End Custom Build + +!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" + +# Begin Custom Build - Generating test_char.h +InputPath=.\main\gen_test_char.exe + +".\main\test_char.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + .\main\gen_test_char.exe >.\main\test_char.h + echo Generated test_char.h from gen_test_char.exe + +# End Custom Build + +!ENDIF + # End Source File # Begin Source File -SOURCE=.\main\uri_delims.h +SOURCE=.\main\gen_uri_delims.exe + +!IF "$(CFG)" == "ApacheCore - Win32 Release" + +# Begin Custom Build - Generating uri_delims.h +InputPath=.\main\gen_uri_delims.exe + +".\main\uri_delims.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + .\main\gen_uri_delims.exe >.\main\uri_delims.h + echo Generated uri_delims.h from gen_uri_delims.exe + +# End Custom Build + +!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" + +# Begin Custom Build - Generating uri_delims.h +InputPath=.\main\gen_uri_delims.exe + +".\main\uri_delims.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + .\main\gen_uri_delims.exe >.\main\uri_delims.h + echo Generated uri_delims.h from gen_uri_delims.exe + +# End Custom Build + +!ENDIF + # End Source File # End Group # End Target |