httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From stodd...@hyperreal.org
Subject cvs commit: apache-2.0/src/os/win32 ApacheOS.dsp ApacheOS.mak
Date Thu, 20 Jan 2000 20:58:56 GMT
stoddard    00/01/20 12:58:55

  Modified:    src/os/win32 ApacheOS.dsp ApacheOS.mak
  Log:
  Add lib/apr/include to preprocessor search paths
  
  Revision  Changes    Path
  1.2       +1 -1      apache-2.0/src/os/win32/ApacheOS.dsp
  
  Index: ApacheOS.dsp
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/os/win32/ApacheOS.dsp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ApacheOS.dsp	1999/08/24 06:45:38	1.1
  +++ ApacheOS.dsp	2000/01/20 20:58:43	1.2
  @@ -60,7 +60,7 @@
   # PROP Intermediate_Dir "ApacheOSD"
   # 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 /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
  +# ADD CPP /nologo /MDd /W3 /GX /Z7 /Od /I "../../lib/apr/include" /D "WIN32" /D "_DEBUG"
/D "_WINDOWS" /YX /FD /c
   BSC32=bscmake.exe
   # ADD BASE BSC32 /nologo
   # ADD BSC32 /nologo
  
  
  
  1.2       +70 -19    apache-2.0/src/os/win32/ApacheOS.mak
  
  Index: ApacheOS.mak
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/os/win32/ApacheOS.mak,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ApacheOS.mak	1999/08/24 06:45:38	1.1
  +++ ApacheOS.mak	2000/01/20 20:58:46	1.2
  @@ -26,8 +26,6 @@
   NULL=nul
   !ENDIF 
   
  -CPP=cl.exe
  -
   !IF  "$(CFG)" == "ApacheOS - Win32 Release"
   
   OUTDIR=.\ApacheOSR
  @@ -54,10 +52,42 @@
   "$(OUTDIR)" :
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
  +CPP=cl.exe
   CPP_PROJ=/nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS"\
    /Fp"$(INTDIR)\ApacheOS.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
   CPP_OBJS=.\ApacheOSR/
   CPP_SBRS=.
  +
  +.c{$(CPP_OBJS)}.obj::
  +   $(CPP) @<<
  +   $(CPP_PROJ) $< 
  +<<
  +
  +.cpp{$(CPP_OBJS)}.obj::
  +   $(CPP) @<<
  +   $(CPP_PROJ) $< 
  +<<
  +
  +.cxx{$(CPP_OBJS)}.obj::
  +   $(CPP) @<<
  +   $(CPP_PROJ) $< 
  +<<
  +
  +.c{$(CPP_SBRS)}.sbr::
  +   $(CPP) @<<
  +   $(CPP_PROJ) $< 
  +<<
  +
  +.cpp{$(CPP_SBRS)}.sbr::
  +   $(CPP) @<<
  +   $(CPP_PROJ) $< 
  +<<
  +
  +.cxx{$(CPP_SBRS)}.sbr::
  +   $(CPP) @<<
  +   $(CPP_PROJ) $< 
  +<<
  +
   BSC32=bscmake.exe
   BSC32_FLAGS=/nologo /o"$(OUTDIR)\ApacheOS.bsc" 
   BSC32_SBRS= \
  @@ -98,26 +128,13 @@
   "$(OUTDIR)" :
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
  -CPP_PROJ=/nologo /MDd /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS"\
  - /Fp"$(INTDIR)\ApacheOS.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
  +CPP=cl.exe
  +CPP_PROJ=/nologo /MDd /W3 /GX /Z7 /Od /I "../../lib/apr/include" /D "WIN32" /D\
  + "_DEBUG" /D "_WINDOWS" /Fp"$(INTDIR)\ApacheOS.pch" /YX /Fo"$(INTDIR)\\"\
  + /Fd"$(INTDIR)\\" /FD /c 
   CPP_OBJS=.\ApacheOSD/
   CPP_SBRS=.
  -BSC32=bscmake.exe
  -BSC32_FLAGS=/nologo /o"$(OUTDIR)\ApacheOS.bsc" 
  -BSC32_SBRS= \
  -	
  -LIB32=link.exe -lib
  -LIB32_FLAGS=/nologo /out:"$(OUTDIR)\ApacheOS.lib" 
  -LIB32_OBJS= \
  -	"$(INTDIR)\os.obj"
   
  -"$(OUTDIR)\ApacheOS.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS)
  -    $(LIB32) @<<
  -  $(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS)
  -<<
  -
  -!ENDIF 
  -
   .c{$(CPP_OBJS)}.obj::
      $(CPP) @<<
      $(CPP_PROJ) $< 
  @@ -148,16 +165,50 @@
      $(CPP_PROJ) $< 
   <<
   
  +BSC32=bscmake.exe
  +BSC32_FLAGS=/nologo /o"$(OUTDIR)\ApacheOS.bsc" 
  +BSC32_SBRS= \
  +	
  +LIB32=link.exe -lib
  +LIB32_FLAGS=/nologo /out:"$(OUTDIR)\ApacheOS.lib" 
  +LIB32_OBJS= \
  +	"$(INTDIR)\os.obj"
   
  +"$(OUTDIR)\ApacheOS.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS)
  +    $(LIB32) @<<
  +  $(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS)
  +<<
  +
  +!ENDIF 
  +
  +
   !IF "$(CFG)" == "ApacheOS - Win32 Release" || "$(CFG)" ==\
    "ApacheOS - Win32 Debug"
   SOURCE=.\os.c
  +
  +!IF  "$(CFG)" == "ApacheOS - Win32 Release"
  +
  +DEP_CPP_OS_C0=\
  +	".\os.h"\
  +	
  +NODEP_CPP_OS_C0=\
  +	".\apr_win.h"\
  +	
  +
  +"$(INTDIR)\os.obj" : $(SOURCE) $(DEP_CPP_OS_C0) "$(INTDIR)"
  +
  +
  +!ELSEIF  "$(CFG)" == "ApacheOS - Win32 Debug"
  +
   DEP_CPP_OS_C0=\
  +	"..\..\lib\apr\include\apr_win.h"\
   	".\os.h"\
   	
   
   "$(INTDIR)\os.obj" : $(SOURCE) $(DEP_CPP_OS_C0) "$(INTDIR)"
   
  +
  +!ENDIF 
   
   
   !ENDIF 
  
  
  

Mime
View raw message