stoddard 00/02/11 10:52:34
Modified: src/ap ap.dsp ap.mak src/main gen_test_char.dsp gen_test_char.mak Log: Fix compile breaks on Windows. Projects need to know where to find os.h. Revision Changes Path 1.5 +2 -2 apache-2.0/src/ap/ap.dsp Index: ap.dsp =================================================================== RCS file: /home/cvs/apache-2.0/src/ap/ap.dsp,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- ap.dsp 1999/09/13 18:22:58 1.4 +++ ap.dsp 2000/02/11 18:52:26 1.5 @@ -39,7 +39,7 @@ # PROP Intermediate_Dir "Release" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "../include" /I "../lib/apr/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "../include" /I "../lib/apr/include" /I "../os/win32/" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -60,7 +60,7 @@ # PROP Intermediate_Dir "Debug" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /MDd /W3 /GX /Z7 /Od /I "../include" /I "../lib/apr/include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c +# ADD CPP /nologo /MDd /W3 /GX /Z7 /Od /I "../include" /I "../lib/apr/include" /I "../os/win32/" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo 1.8 +56 -8 apache-2.0/src/ap/ap.mak Index: ap.mak =================================================================== RCS file: /home/cvs/apache-2.0/src/ap/ap.mak,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- ap.mak 1999/11/29 23:28:50 1.7 +++ ap.mak 2000/02/11 18:52:27 1.8 @@ -55,9 +55,9 @@ "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" -CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "../include" /I "../lib/apr/include" /D\ - "WIN32" /D "NDEBUG" /D "_WINDOWS" /Fp"$(INTDIR)\ap.pch" /YX /Fo"$(INTDIR)\\"\ - /Fd"$(INTDIR)\\" /FD /c +CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "../include" /I "../lib/apr/include" /I\ + "../os/win32/" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /Fp"$(INTDIR)\ap.pch" /YX\ + /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c CPP_OBJS=.\Release/ CPP_SBRS=. BSC32=bscmake.exe @@ -105,8 +105,8 @@ if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" CPP_PROJ=/nologo /MDd /W3 /GX /Z7 /Od /I "../include" /I "../lib/apr/include"\ - /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /Fp"$(INTDIR)\ap.pch" /YX /Fo"$(INTDIR)\\"\ - /Fd"$(INTDIR)\\" /FD /c + /I "../os/win32/" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /Fp"$(INTDIR)\ap.pch"\ + /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c CPP_OBJS=.\Debug/ CPP_SBRS=. BSC32=bscmake.exe @@ -160,24 +160,56 @@ !IF "$(CFG)" == "ap - Win32 Release" || "$(CFG)" == "ap - Win32 Debug" SOURCE=.\ap_base64.c + +!IF "$(CFG)" == "ap - Win32 Release" + DEP_CPP_AP_BA=\ "..\include\ap.h"\ + "..\include\ap_ac_config.h"\ "..\include\ap_config.h"\ "..\include\ap_ctype.h"\ "..\include\ap_mmn.h"\ "..\include\hsregex.h"\ + "..\lib\apr\include\apr_errno.h"\ + "..\lib\apr\include\apr_general.h"\ + "..\lib\apr\include\apr_win.h"\ "..\os\win32\os.h"\ + {$(INCLUDE)}"sys\stat.h"\ + {$(INCLUDE)}"sys\types.h"\ NODEP_CPP_AP_BA=\ + "..\include\ap_config_auto.h"\ + "..\include\ap_config_win32.h"\ "..\include\apr.h"\ + "..\lib\apr\include\apr.h"\ + ".\ebcdic.h"\ "$(INTDIR)\ap_base64.obj" : $(SOURCE) $(DEP_CPP_AP_BA) "$(INTDIR)" +!ELSEIF "$(CFG)" == "ap - Win32 Debug" + +DEP_CPP_AP_BA=\ + "..\include\ap.h"\ + "..\include\ap_config.h"\ + "..\include\ap_ctype.h"\ + "..\include\ap_mmn.h"\ + "..\include\hsregex.h"\ + "..\lib\apr\include\apr_errno.h"\ + "..\lib\apr\include\apr_general.h"\ + "..\lib\apr\include\apr_win.h"\ + "..\os\win32\os.h"\ + + +"$(INTDIR)\ap_base64.obj" : $(SOURCE) $(DEP_CPP_AP_BA) "$(INTDIR)" + + +!ENDIF + SOURCE=.\ap_hooks.c DEP_CPP_AP_HO=\ - "..\include\ap.h"\ + "..\include\ap_ac_config.h"\ "..\include\ap_config.h"\ "..\include\ap_ctype.h"\ "..\include\ap_hooks.h"\ @@ -187,16 +219,23 @@ "..\include\hsregex.h"\ "..\include\httpd.h"\ "..\include\util_uri.h"\ - "..\lib\apr\file_io\win32\readdir.h"\ "..\lib\apr\include\apr_errno.h"\ "..\lib\apr\include\apr_file_io.h"\ "..\lib\apr\include\apr_general.h"\ "..\lib\apr\include\apr_lib.h"\ + "..\lib\apr\include\apr_network_io.h"\ + "..\lib\apr\include\apr_thread_proc.h"\ + "..\lib\apr\include\apr_time.h"\ "..\lib\apr\include\apr_win.h"\ "..\os\win32\os.h"\ + {$(INCLUDE)}"sys\stat.h"\ + {$(INCLUDE)}"sys\types.h"\ NODEP_CPP_AP_HO=\ + "..\include\ap_config_auto.h"\ + "..\include\ap_config_win32.h"\ "..\include\apr.h"\ + "..\lib\apr\include\apr.h"\ "$(INTDIR)\ap_hooks.obj" : $(SOURCE) $(DEP_CPP_AP_HO) "$(INTDIR)" @@ -205,6 +244,7 @@ SOURCE=.\ap_sha1.c DEP_CPP_AP_SH=\ "..\include\ap.h"\ + "..\include\ap_ac_config.h"\ "..\include\ap_config.h"\ "..\include\ap_ctype.h"\ "..\include\ap_iol.h"\ @@ -214,16 +254,24 @@ "..\include\hsregex.h"\ "..\include\httpd.h"\ "..\include\util_uri.h"\ - "..\lib\apr\file_io\win32\readdir.h"\ "..\lib\apr\include\apr_errno.h"\ "..\lib\apr\include\apr_file_io.h"\ "..\lib\apr\include\apr_general.h"\ "..\lib\apr\include\apr_lib.h"\ + "..\lib\apr\include\apr_network_io.h"\ + "..\lib\apr\include\apr_thread_proc.h"\ + "..\lib\apr\include\apr_time.h"\ "..\lib\apr\include\apr_win.h"\ "..\os\win32\os.h"\ + {$(INCLUDE)}"sys\stat.h"\ + {$(INCLUDE)}"sys\types.h"\ NODEP_CPP_AP_SH=\ + "..\include\ap_config_auto.h"\ + "..\include\ap_config_win32.h"\ "..\include\apr.h"\ + "..\lib\apr\include\apr.h"\ + ".\ebcdic.h"\ "$(INTDIR)\ap_sha1.obj" : $(SOURCE) $(DEP_CPP_AP_SH) "$(INTDIR)" 1.3 +2 -2 apache-2.0/src/main/gen_test_char.dsp Index: gen_test_char.dsp =================================================================== RCS file: /home/cvs/apache-2.0/src/main/gen_test_char.dsp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- gen_test_char.dsp 1999/09/13 15:20:53 1.2 +++ gen_test_char.dsp 2000/02/11 18:52:30 1.3 @@ -43,7 +43,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /W3 /GX /O2 /I "..\include" /I "..\lib\apr\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c +# ADD CPP /nologo /W3 /GX /O2 /I "..\include" /I "..\lib\apr\include" /I "..\os\win32" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c # ADD BASE RSC /l 0x809 /d "NDEBUG" # ADD RSC /l 0x809 /d "NDEBUG" BSC32=bscmake.exe @@ -72,7 +72,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /I "..\include" /I "..\lib\apr\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c +# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /I "..\include" /I "..\lib\apr\include" /I "..\os\win32" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c # ADD BASE RSC /l 0x809 /d "_DEBUG" # ADD RSC /l 0x809 /d "_DEBUG" BSC32=bscmake.exe 1.5 +24 -10 apache-2.0/src/main/gen_test_char.mak Index: gen_test_char.mak =================================================================== RCS file: /home/cvs/apache-2.0/src/main/gen_test_char.mak,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- gen_test_char.mak 1999/11/29 23:29:32 1.4 +++ gen_test_char.mak 2000/02/11 18:52:31 1.5 @@ -57,9 +57,9 @@ "$(INTDIR)" : if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)" -CPP_PROJ=/nologo /ML /W3 /GX /O2 /I "..\include" /I "..\lib\apr\include" /D\ - "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\gen_test_char.pch"\ - /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c +CPP_PROJ=/nologo /ML /W3 /GX /O2 /I "..\include" /I "..\lib\apr\include" /I\ + "..\os\win32" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS"\ + /Fp"$(INTDIR)\gen_test_char.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c CPP_OBJS=.\gen_test_char_R/ CPP_SBRS=. BSC32=bscmake.exe @@ -123,8 +123,9 @@ if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)" CPP_PROJ=/nologo /MLd /W3 /Gm /GX /Zi /Od /I "..\include" /I\ - "..\lib\apr\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS"\ - /Fp"$(INTDIR)\gen_test_char.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c + "..\lib\apr\include" /I "..\os\win32" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D\ + "_MBCS" /Fp"$(INTDIR)\gen_test_char.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\"\ + /FD /c CPP_OBJS=.\gen_test_char_D/ CPP_SBRS=. BSC32=bscmake.exe @@ -194,8 +195,11 @@ !IF "$(CFG)" == "gen_test_char - Win32 Release" || "$(CFG)" ==\ "gen_test_char - Win32 Debug" SOURCE=.\gen_test_char.c + +!IF "$(CFG)" == "gen_test_char - Win32 Release" + DEP_CPP_GEN_T=\ - "..\include\ap.h"\ + "..\include\ap_ac_config.h"\ "..\include\ap_config.h"\ "..\include\ap_ctype.h"\ "..\include\ap_iol.h"\ @@ -204,11 +208,13 @@ "..\include\hsregex.h"\ "..\include\httpd.h"\ "..\include\util_uri.h"\ - "..\lib\apr\file_io\win32\readdir.h"\ "..\lib\apr\include\apr_errno.h"\ "..\lib\apr\include\apr_file_io.h"\ "..\lib\apr\include\apr_general.h"\ "..\lib\apr\include\apr_lib.h"\ + "..\lib\apr\include\apr_network_io.h"\ + "..\lib\apr\include\apr_thread_proc.h"\ + "..\lib\apr\include\apr_time.h"\ "..\lib\apr\include\apr_win.h"\ "..\os\win32\os.h"\ {$(INCLUDE)}"sys\stat.h"\ @@ -216,13 +222,21 @@ NODEP_CPP_GEN_T=\ "..\include\ap_config_auto.h"\ - "..\include\ebcdic.h"\ - "..\include\os.h"\ - "..\lib\apr\include\apr_config.h"\ + "..\include\ap_config_win32.h"\ + "..\include\apr.h"\ + "..\lib\apr\include\apr.h"\ "$(INTDIR)\gen_test_char.obj" : $(SOURCE) $(DEP_CPP_GEN_T) "$(INTDIR)" + +!ELSEIF "$(CFG)" == "gen_test_char - Win32 Debug" + + +"$(INTDIR)\gen_test_char.obj" : $(SOURCE) "$(INTDIR)" + + +!ENDIF !ENDIF