X-Git-Url: https://granicus.if.org/sourcecode?a=blobdiff_plain;f=httpd.dsp;h=96b5f4460ed2cb8d21acaf5e77a1582abffb107d;hb=c20d5efb4c6f4fca3713c98f98d475bb022523f9;hp=1bbd21eb9feda105dacad30ed926a2251353c524;hpb=afeeaeedcbe3bc141d1b5a966492c69f54912b81;p=apache diff --git a/httpd.dsp b/httpd.dsp index 1bbd21eb9f..96b5f4460e 100644 --- a/httpd.dsp +++ b/httpd.dsp @@ -1,405 +1,111 @@ -# Microsoft Developer Studio Project File - Name="ApacheCore" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 5.00 +# Microsoft Developer Studio Project File - Name="httpd" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 # ** DO NOT EDIT ** -# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 +# TARGTYPE "Win32 (x86) Console Application" 0x0103 -CFG=ApacheCore - Win32 Release +CFG=httpd - Win32 Release !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE -!MESSAGE NMAKE /f "ApacheCore.mak". +!MESSAGE NMAKE /f "httpd.mak". !MESSAGE !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE -!MESSAGE NMAKE /f "ApacheCore.mak" CFG="ApacheCore - Win32 Release" +!MESSAGE NMAKE /f "httpd.mak" CFG="httpd - Win32 Release" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE -!MESSAGE "ApacheCore - Win32 Release" (based on\ - "Win32 (x86) Dynamic-Link Library") -!MESSAGE "ApacheCore - Win32 Debug" (based on\ - "Win32 (x86) Dynamic-Link Library") +!MESSAGE "httpd - Win32 Release" (based on "Win32 (x86) Console Application") +!MESSAGE "httpd - Win32 Debug" (based on "Win32 (x86) Console Application") !MESSAGE # Begin Project +# PROP AllowPerConfigDependencies 0 # PROP Scc_ProjName "" # PROP Scc_LocalPath "" CPP=cl.exe -MTL=midl.exe RSC=rc.exe -!IF "$(CFG)" == "ApacheCore - Win32 Release" +!IF "$(CFG)" == "httpd - Win32 Release" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir ".\ApacheCo" -# PROP BASE Intermediate_Dir ".\ApacheCo" +# PROP BASE Output_Dir "Release" +# PROP BASE Intermediate_Dir "Release" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir ".\CoreR" -# PROP Intermediate_Dir ".\CoreR" +# PROP Output_Dir "Release" +# PROP Intermediate_Dir "Release" # 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" /I ".\lib\apr\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /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" -# ADD RSC /l 0x809 /d "NDEBUG" +# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "SHARED_MODULE" /FD /c +# ADD CPP /nologo /MD /W3 /O2 /Oy- /Zi /I "./include" /I "./srclib/apr/include" /I "./srclib/apr-util/include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /Fd"Release\httpd" /FD /c +# ADD BASE RSC /l 0x409 /d "NDEBUG" +# ADD RSC /l 0x409 /i "./include" /i "./srclib/apr/include" /d "NDEBUG" /d "APP_FILE" /d BIN_NAME="httpd.exe" /d LONG_NAME="Apache HTTP Server" /d ICON_FILE="apache.ico" 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 os\win32\ApacheOSR\ApacheOS.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 kernel32.lib user32.lib advapi32.lib ws2_32.lib mswsock.lib /nologo /subsystem:console +# ADD LINK32 kernel32.lib user32.lib advapi32.lib ws2_32.lib mswsock.lib /nologo /stack:0x40000 /subsystem:console /debug /opt:ref +# Begin Special Build Tool +TargetPath=.\Release\httpd.exe +SOURCE="$(InputPath)" +PostBuild_Desc=Embed .manifest +PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);1 +# End Special Build Tool -!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" +!ELSEIF "$(CFG)" == "httpd - Win32 Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir ".\ApacheC0" -# PROP BASE Intermediate_Dir ".\ApacheC0" +# PROP BASE Output_Dir "Debug" +# PROP BASE Intermediate_Dir "Debug" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir ".\CoreD" -# PROP Intermediate_Dir ".\CoreD" +# PROP Output_Dir "Debug" +# PROP Intermediate_Dir "Debug" # 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" /I ".\lib\apr\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /FR /YX /FD /c -# ADD BASE MTL /nologo /D "_DEBUG" /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x809 /d "_DEBUG" -# ADD RSC /l 0x809 /d "_DEBUG" +# ADD BASE CPP /nologo /MDd /W3 /EHsc /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c +# ADD CPP /nologo /MDd /W3 /EHsc /Zi /Od /I "./include" /I "./srclib/apr/include" /I "./srclib/apr-util/include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /Fd"Debug\httpd" /FD /c +# SUBTRACT CPP /YX +# ADD BASE RSC /l 0x409 /d "_DEBUG" +# ADD RSC /l 0x409 /i "./include" /i "./srclib/apr/include" /d "_DEBUG" /d "APP_FILE" /d BIN_NAME="httpd.exe" /d LONG_NAME="Apache HTTP Server" /d ICON_FILE="apache.ico" 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 os\win32\ApacheOSD\ApacheOS.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 kernel32.lib user32.lib advapi32.lib ws2_32.lib mswsock.lib /nologo /subsystem:console /incremental:no /debug +# ADD LINK32 kernel32.lib user32.lib advapi32.lib ws2_32.lib mswsock.lib /nologo /stack:0x40000 /subsystem:console /incremental:no /debug +# Begin Special Build Tool +TargetPath=.\Debug\httpd.exe +SOURCE="$(InputPath)" +PostBuild_Desc=Embed .manifest +PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);1 +# End Special Build Tool !ENDIF # Begin Target -# Name "ApacheCore - Win32 Release" -# Name "ApacheCore - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90" -# Begin Source File - -SOURCE=.\ApacheCore.def -# End Source File -# Begin Source File - -SOURCE=.\main\buff.c -# End Source File -# Begin Source File - -SOURCE=.\buildmark.c -# End Source File -# Begin Source File - -SOURCE=.\main\http_config.c -# End Source File -# Begin Source File - -SOURCE=.\main\http_connection.c -# End Source File -# Begin Source File - -SOURCE=.\main\http_core.c -# End Source File -# Begin Source File - -SOURCE=.\main\http_log.c -# End Source File -# Begin Source File - -SOURCE=.\main\http_main.c -# End Source File -# Begin Source File - -SOURCE=.\main\http_protocol.c -# End Source File -# Begin Source File - -SOURCE=.\main\http_request.c -# End Source File -# Begin Source File - -SOURCE=.\main\http_vhost.c -# End Source File -# Begin Source File - -SOURCE=.\main\iol_file.c -# End Source File -# Begin Source File - -SOURCE=.\os\win32\iol_socket.c -# End Source File -# Begin Source File - -SOURCE=.\main\listen.c -# End Source File -# Begin Source File - -SOURCE=.\modules\standard\mod_access.c -# End Source File -# Begin Source File - -SOURCE=.\modules\standard\mod_actions.c -# End Source File -# Begin Source File - -SOURCE=.\modules\standard\mod_alias.c -# End Source File -# Begin Source File - -SOURCE=.\modules\standard\mod_asis.c -# End Source File -# Begin Source File - -SOURCE=.\modules\standard\mod_auth.c -# End Source File -# Begin Source File - -SOURCE=.\modules\standard\mod_autoindex.c -# End Source File -# Begin Source File - -SOURCE=.\modules\standard\mod_cgi.c -# End Source File -# Begin Source File - -SOURCE=.\modules\standard\mod_dir.c -# End Source File -# Begin Source File - -SOURCE=.\modules\standard\mod_env.c -# End Source File -# Begin Source File - -SOURCE=.\modules\standard\mod_imap.c -# End Source File -# Begin Source File - -SOURCE=.\modules\standard\mod_include.c -# End Source File -# Begin Source File - -SOURCE=.\modules\standard\mod_log_config.c -# End Source File -# Begin Source File - -SOURCE=.\modules\standard\mod_mime.c -# End Source File -# Begin Source File - -SOURCE=.\modules\standard\mod_negotiation.c -# End Source File -# Begin Source File - -SOURCE=.\modules\standard\mod_setenvif.c -# End Source File -# Begin Source File - -SOURCE=.\modules\standard\mod_so.c -# End Source File -# Begin Source File - -SOURCE=.\modules\standard\mod_userdir.c -# End Source File -# Begin Source File - -SOURCE=.\os\win32\modules.c -# End Source File -# Begin Source File - -SOURCE=.\main\rfc1413.c -# End Source File -# Begin Source File - -SOURCE=.\main\util.c -# End Source File -# Begin Source File - -SOURCE=.\main\util_date.c -# End Source File -# Begin Source File - -SOURCE=.\main\util_md5.c -# End Source File +# Name "httpd - Win32 Release" +# Name "httpd - Win32 Debug" # Begin Source File -SOURCE=.\main\util_script.c +SOURCE=.\build\win32\Apache.ico # End Source File # Begin Source File -SOURCE=.\main\util_uri.c -# End Source File -# Begin Source File - -SOURCE=.\os\win32\util_win32.c -# End Source File -# Begin Source File - -SOURCE=.\modules\mpm\winnt\winnt.c -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd" -# Begin Source File - -SOURCE=.\include\ap.h -# End Source File -# Begin Source File - -SOURCE=.\include\ap_hooks.h -# End Source File -# Begin Source File - -SOURCE=.\include\ap_iol.h -# End Source File -# Begin Source File - -SOURCE=.\include\ap_listen.h -# End Source File -# Begin Source File - -SOURCE=.\include\ap_md5.h -# End Source File -# Begin Source File - -SOURCE=.\include\buff.h -# End Source File -# Begin Source File - -SOURCE=.\include\conf.h -# End Source File -# Begin Source File - -SOURCE=.\include\explain.h -# End Source File -# Begin Source File - -SOURCE=.\include\fnmatch.h -# End Source File -# Begin Source File - -SOURCE=.\include\hsregex.h -# End Source File -# Begin Source File - -SOURCE=.\include\http_conf_globals.h -# End Source File -# Begin Source File - -SOURCE=.\include\http_config.h -# End Source File -# Begin Source File - -SOURCE=.\include\http_connection.h -# End Source File -# Begin Source File - -SOURCE=.\include\http_core.h -# End Source File -# Begin Source File - -SOURCE=.\include\http_log.h -# End Source File -# Begin Source File - -SOURCE=.\include\http_main.h -# End Source File -# Begin Source File - -SOURCE=.\include\http_protocol.h -# End Source File -# Begin Source File - -SOURCE=.\include\http_request.h -# End Source File -# Begin Source File - -SOURCE=.\include\http_vhost.h -# End Source File -# Begin Source File - -SOURCE=.\include\httpd.h -# End Source File -# Begin Source File - -SOURCE=.\os\win32\iol_socket.h -# End Source File -# Begin Source File - -SOURCE=.\modules\standard\mod_mime.h -# End Source File -# Begin Source File - -SOURCE=.\modules\mpm\winnt\mpm_default.h -# End Source File -# Begin Source File - -SOURCE=.\os\win32\os.h -# End Source File -# Begin Source File - -SOURCE=.\os\win32\registry.h -# End Source File -# Begin Source File - -SOURCE=.\include\rfc1413.h -# End Source File -# Begin Source File - -SOURCE=.\os\win32\service.h -# End Source File -# Begin Source File - -SOURCE=.\include\util_date.h -# End Source File -# Begin Source File - -SOURCE=.\include\util_md5.h -# End Source File -# Begin Source File - -SOURCE=.\include\util_script.h -# End Source File -# Begin Source File - -SOURCE=.\include\util_uri.h -# End Source File -# Begin Source File - -SOURCE=.\modules\mpm\winnt\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 "" -# Begin Source File - -SOURCE=.\main\test_char.h +SOURCE=.\build\win32\httpd.rc # End Source File # Begin Source File -SOURCE=.\main\uri_delims.h +SOURCE=.\server\main.c # End Source File -# End Group # End Target # End Project