diff options
| -rw-r--r-- | ApacheCore.dsp | 43 | ||||
| -rw-r--r-- | Makefile.win | 4 | ||||
| -rw-r--r-- | httpd.dsp | 43 |
3 files changed, 44 insertions, 46 deletions
diff --git a/ApacheCore.dsp b/ApacheCore.dsp index 56dfa35dc3..417addf5f1 100644 --- a/ApacheCore.dsp +++ b/ApacheCore.dsp @@ -26,6 +26,7 @@ CFG=ApacheCore - Win32 Debug # PROP Scc_ProjName "" # PROP Scc_LocalPath "" CPP=cl.exe +RSC=rc.exe !IF "$(CFG)" == "ApacheCore - Win32 Release" @@ -39,11 +40,10 @@ CPP=cl.exe # PROP Output_Dir "LibR" # PROP Intermediate_Dir "LibR" # PROP Target_Dir "" -RSC=rc.exe -# ADD BASE RSC /l 0x409 -# ADD RSC /l 0x409 # ADD BASE CPP /nologo /MD /W3 /GX /O2 /I ".\include" /I ".\srclib\apr\include" /I ".\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT" /FD /c # ADD CPP /nologo /MD /W3 /GX /O2 /I ".\include" /I ".\srclib\apr\include" /I ".\srclib\apr-util\include" /I ".\srclib\sdbm" /I ".\os\win32" /I ".\server\mpm\winnt" /I ".\srclib\expat-lite" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT" /FD /c +# ADD BASE RSC /l 0x409 +# ADD RSC /l 0x409 BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -64,11 +64,10 @@ LIB32=link.exe -lib # PROP Intermediate_Dir "LibD" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -RSC=rc.exe -# ADD BASE RSC /l 0x409 -# ADD RSC /l 0x409 # ADD BASE CPP /nologo /MDd /W3 /GX /ZI /Od /I ".\include" /I ".\srclib\apr\include" /I ".\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT" /FD /c # ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I ".\include" /I ".\srclib\apr\include" /I ".\srclib\apr-util\include" /I ".\srclib\sdbm" /I ".\os\win32" /I ".\server\mpm\winnt" /I ".\srclib\expat-lite" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT" /FD /c +# ADD BASE RSC /l 0x409 +# ADD RSC /l 0x409 BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -206,56 +205,56 @@ SOURCE=.\include\http_connection.h # End Source File # Begin Source File -SOURCE=.\server\http_core.c +SOURCE=.\include\http_log.h # End Source File # Begin Source File -SOURCE=.\include\http_core.h +SOURCE=.\include\http_main.h # End Source File # Begin Source File -SOURCE=.\include\http_log.h +SOURCE=.\include\http_vhost.h # End Source File # Begin Source File -SOURCE=.\include\http_main.h +SOURCE=.\include\httpd.h # End Source File # Begin Source File -SOURCE=.\server\http_protocol.c +SOURCE=.\server\log.c # End Source File # Begin Source File -SOURCE=.\include\http_protocol.h +SOURCE=.\server\vhost.c # End Source File +# End Group +# Begin Group "modules" + +# PROP Default_Filter "" # Begin Source File -SOURCE=.\server\http_request.c +SOURCE=.\modules\http\http_core.c # End Source File # Begin Source File -SOURCE=.\include\http_request.h +SOURCE=.\include\http_core.h # End Source File # Begin Source File -SOURCE=.\include\http_vhost.h +SOURCE=.\modules\http\http_protocol.c # End Source File # Begin Source File -SOURCE=.\include\httpd.h +SOURCE=.\include\http_protocol.h # End Source File # Begin Source File -SOURCE=.\server\log.c +SOURCE=.\modules\http\http_request.c # End Source File # Begin Source File -SOURCE=.\server\vhost.c +SOURCE=.\include\http_request.h # End Source File -# End Group -# Begin Group "modules" - -# PROP Default_Filter "" # Begin Source File SOURCE=.\modules\aaa\mod_access.c diff --git a/Makefile.win b/Makefile.win index d3a90d620c..8e0b82173e 100644 --- a/Makefile.win +++ b/Makefile.win @@ -70,8 +70,8 @@ _build: cd ..\.. cd srclib\apr-util # aprlibdll creates the dynamic aprlib.dll from the static library project aprlib.dsp - $(MAKE) $(MAKEOPT) -f aprlib.mak CFG="aprlib - Win32 $(LONG)" RECURSE=0 $(CTARGET) - $(MAKE) $(MAKEOPT) -f aprlibdll.mak CFG="aprlibdll - Win32 $(LONG)" RECURSE=0 $(CTARGET) + $(MAKE) $(MAKEOPT) -f aprutil.mak CFG="aprutil - Win32 $(LONG)" RECURSE=0 $(CTARGET) + $(MAKE) $(MAKEOPT) -f aprutildll.mak CFG="aprutildll - Win32 $(LONG)" RECURSE=0 $(CTARGET) cd ..\.. cd srclib\expat-lite $(MAKE) $(MAKEOPT) -f expatlib.mak CFG="expatlib - Win32 $(LONG)" RECURSE=0 $(CTARGET) @@ -26,6 +26,7 @@ CFG=ApacheCore - Win32 Debug # PROP Scc_ProjName "" # PROP Scc_LocalPath "" CPP=cl.exe +RSC=rc.exe !IF "$(CFG)" == "ApacheCore - Win32 Release" @@ -39,11 +40,10 @@ CPP=cl.exe # PROP Output_Dir "LibR" # PROP Intermediate_Dir "LibR" # PROP Target_Dir "" -RSC=rc.exe -# ADD BASE RSC /l 0x409 -# ADD RSC /l 0x409 # ADD BASE CPP /nologo /MD /W3 /GX /O2 /I ".\include" /I ".\srclib\apr\include" /I ".\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT" /FD /c # ADD CPP /nologo /MD /W3 /GX /O2 /I ".\include" /I ".\srclib\apr\include" /I ".\srclib\apr-util\include" /I ".\srclib\sdbm" /I ".\os\win32" /I ".\server\mpm\winnt" /I ".\srclib\expat-lite" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT" /FD /c +# ADD BASE RSC /l 0x409 +# ADD RSC /l 0x409 BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -64,11 +64,10 @@ LIB32=link.exe -lib # PROP Intermediate_Dir "LibD" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -RSC=rc.exe -# ADD BASE RSC /l 0x409 -# ADD RSC /l 0x409 # ADD BASE CPP /nologo /MDd /W3 /GX /ZI /Od /I ".\include" /I ".\srclib\apr\include" /I ".\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT" /FD /c # ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I ".\include" /I ".\srclib\apr\include" /I ".\srclib\apr-util\include" /I ".\srclib\sdbm" /I ".\os\win32" /I ".\server\mpm\winnt" /I ".\srclib\expat-lite" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT" /FD /c +# ADD BASE RSC /l 0x409 +# ADD RSC /l 0x409 BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -206,56 +205,56 @@ SOURCE=.\include\http_connection.h # End Source File # Begin Source File -SOURCE=.\server\http_core.c +SOURCE=.\include\http_log.h # End Source File # Begin Source File -SOURCE=.\include\http_core.h +SOURCE=.\include\http_main.h # End Source File # Begin Source File -SOURCE=.\include\http_log.h +SOURCE=.\include\http_vhost.h # End Source File # Begin Source File -SOURCE=.\include\http_main.h +SOURCE=.\include\httpd.h # End Source File # Begin Source File -SOURCE=.\server\http_protocol.c +SOURCE=.\server\log.c # End Source File # Begin Source File -SOURCE=.\include\http_protocol.h +SOURCE=.\server\vhost.c # End Source File +# End Group +# Begin Group "modules" + +# PROP Default_Filter "" # Begin Source File -SOURCE=.\server\http_request.c +SOURCE=.\modules\http\http_core.c # End Source File # Begin Source File -SOURCE=.\include\http_request.h +SOURCE=.\include\http_core.h # End Source File # Begin Source File -SOURCE=.\include\http_vhost.h +SOURCE=.\modules\http\http_protocol.c # End Source File # Begin Source File -SOURCE=.\include\httpd.h +SOURCE=.\include\http_protocol.h # End Source File # Begin Source File -SOURCE=.\server\log.c +SOURCE=.\modules\http\http_request.c # End Source File # Begin Source File -SOURCE=.\server\vhost.c +SOURCE=.\include\http_request.h # End Source File -# End Group -# Begin Group "modules" - -# PROP Default_Filter "" # Begin Source File SOURCE=.\modules\aaa\mod_access.c |