diff options
| author | William A. Rowe Jr <wrowe@apache.org> | 2000-06-06 00:39:03 +0200 |
|---|---|---|
| committer | William A. Rowe Jr <wrowe@apache.org> | 2000-06-06 00:39:03 +0200 |
| commit | 20f66c9f65245fc0f912f48ba9ef0dfd4b28749f (patch) | |
| tree | de5ce4a7c88a2440698f24ce51c4250f556b00f4 /httpd.dsp | |
| parent | cleanup to cgid_init(): (diff) | |
| download | apache2-20f66c9f65245fc0f912f48ba9ef0dfd4b28749f.tar.xz apache2-20f66c9f65245fc0f912f48ba9ef0dfd4b28749f.zip | |
PR:
Obtained from:
Submitted by:
Reviewed by:
Unbind the old main_win32.c code and rebind to the new mpm logic
in the modules/mpm/winnt directory. Includes some simple cleanups.
The old sources in os/win32 will disappear at the end of this week.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85430 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'httpd.dsp')
| -rw-r--r-- | httpd.dsp | 24 |
1 files changed, 14 insertions, 10 deletions
@@ -53,8 +53,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 aprlib.lib ap.lib pcreposix.lib pcre.lib kernel32.lib advapi32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /map /machine:I386 /libpath:"lib\apr\Release" /libpath:"regex\release" /libpath:"ap\Release" /base:@"os\win32\BaseAddr.ref",ApacheCore -# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /map /machine:I386 /base:@"os\win32\BaseAddr.ref",ApacheCore +# ADD BASE LINK32 kernel32.lib user32.lib advapi32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /map /machine:I386 /base:@"os\win32\BaseAddr.ref",ApacheCore +# ADD LINK32 kernel32.lib user32.lib advapi32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /map /machine:I386 /base:@"os\win32\BaseAddr.ref",ApacheCore !ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" @@ -80,8 +80,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 aprlib.lib regex.lib ap.lib pcreposix.lib pcre.lib kernel32.lib advapi32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /map /debug /machine:I386 /libpath:"lib\apr\debug" /libpath:"regex\debug" /libpath:"ap\Debug" /base:@"os\win32\BaseAddr.ref",ApacheCore -# ADD LINK32 aprlib.lib ap.lib pcre.lib pcreposix.lib kernel32.lib advapi32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /debug /machine:I386 /libpath:"lib\apr\debug" /libpath:"lib\pcre\LibD" /libpath:"ap\Debug" /base:@"os\win32\BaseAddr.ref",ApacheCore +# ADD BASE LINK32 kernel32.lib user32.lib advapi32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /map /debug /machine:I386 /base:@"os\win32\BaseAddr.ref",ApacheCore +# ADD LINK32 kernel32.lib user32.lib advapi32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /debug /machine:I386 /base:@"os\win32\BaseAddr.ref",ApacheCore # SUBTRACT LINK32 /incremental:no /map !ENDIF @@ -235,10 +235,18 @@ SOURCE=.\os\win32\modules.c # End Source File # Begin Source File +SOURCE=.\modules\mpm\winnt\registry.c +# End Source File +# Begin Source File + SOURCE=.\main\rfc1413.c # End Source File # Begin Source File +SOURCE=.\modules\mpm\winnt\service.c +# End Source File +# Begin Source File + SOURCE=.\main\util.c # End Source File # Begin Source File @@ -267,7 +275,7 @@ SOURCE=.\os\win32\util_win32.c # End Source File # Begin Source File -SOURCE=.\modules\mpm\winnt\winnt.c +SOURCE=.\modules\mpm\winnt\mpm_winnt.c # End Source File # End Group # Begin Group "Header Files" @@ -411,13 +419,9 @@ SOURCE=.\include\util_uri.h # End Source File # Begin Source File -SOURCE=.\modules\mpm\winnt\winnt.h +SOURCE=.\modules\mpm\winnt\mpm_winnt.h # End Source File # End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe" -# End Group # Begin Group "Generated Files" # PROP Default_Filter "" |