httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From b..@hyperreal.org
Subject cvs commit: apachen/src/os/win32 ApacheOS.dsp ApacheOS.mak
Date Sat, 24 Jan 1998 16:12:09 GMT
ben         98/01/24 08:12:09

  Modified:    src/os/win32 ApacheOS.dsp ApacheOS.mak
  Log:
  Was using the wrong libraries!
  
  Revision  Changes    Path
  1.5       +1 -1      apachen/src/os/win32/ApacheOS.dsp
  
  Index: ApacheOS.dsp
  ===================================================================
  RCS file: /export/home/cvs/apachen/src/os/win32/ApacheOS.dsp,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ApacheOS.dsp	1997/09/14 15:26:02	1.4
  +++ ApacheOS.dsp	1998/01/24 16:12:08	1.5
  @@ -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 /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
   BSC32=bscmake.exe
   # ADD BASE BSC32 /nologo
   # ADD BSC32 /nologo
  
  
  
  1.5       +19 -51    apachen/src/os/win32/ApacheOS.mak
  
  Index: ApacheOS.mak
  ===================================================================
  RCS file: /export/home/cvs/apachen/src/os/win32/ApacheOS.mak,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ApacheOS.mak	1997/09/14 15:26:02	1.4
  +++ ApacheOS.mak	1998/01/24 16:12:08	1.5
  @@ -26,6 +26,8 @@
   NULL=nul
   !ENDIF 
   
  +CPP=cl.exe
  +
   !IF  "$(CFG)" == "ApacheOS - Win32 Release"
   
   OUTDIR=.\ApacheOSR
  @@ -52,42 +54,10 @@
   "$(OUTDIR)" :
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
  -CPP=cl.exe
  -CPP_PROJ=/nologo /ML /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS"\
  +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= \
  @@ -128,11 +98,25 @@
   "$(OUTDIR)" :
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
  -CPP=cl.exe
  -CPP_PROJ=/nologo /MLd /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS"\
  +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_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) @<<
  @@ -163,22 +147,6 @@
      $(CPP) @<<
      $(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)" ==\
  
  
  

Mime
View raw message