Return-Path: <apache-cvs-owner-apache-cvs-archive=hyperreal.org@apache.org>
Delivered-To: apache-cvs-archive@hyperreal.org
Received: (qmail 28089 invoked by uid 6000); 19 Mar 1999 14:01:12 -0000
Received: (qmail 27958 invoked by alias); 19 Mar 1999 14:01:08 -0000
Delivered-To: apache-1.3-cvs@hyperreal.org
Received: (qmail 27915 invoked by uid 151); 19 Mar 1999 14:01:06 -0000
Date: 19 Mar 1999 14:01:06 -0000
Message-ID: <19990319140106.27914.qmail@hyperreal.org>
From: pcs@hyperreal.org
To: apache-1.3-cvs@hyperreal.org
Subject: cvs commit: apache-1.3/src Apache.mak Apache.dsp
Sender: apache-cvs-owner@apache.org
Precedence: bulk
Reply-To: new-httpd@apache.org

pcs         99/03/19 06:01:05

  Modified:    src      Apache.mak Apache.dsp
  Log:
  Add Apache resource file (os/win32/apache.rc) containing an icon for
  the Apache executable.
  
  Revision  Changes    Path
  1.8       +81 -21    apache-1.3/src/Apache.mak
  
  Index: Apache.mak
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/Apache.mak,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- Apache.mak	1997/11/25 04:07:09	1.7
  +++ Apache.mak	1999/03/19 14:00:59	1.8
  @@ -25,9 +25,6 @@
   NULL=nul
   !ENDIF 
   
  -CPP=cl.exe
  -RSC=rc.exe
  -
   !IF  "$(CFG)" == "Apache - Win32 Release"
   
   OUTDIR=.\ApacheR
  @@ -47,6 +44,7 @@
   !ENDIF 
   
   CLEAN :
  +	-@erase "$(INTDIR)\apache.res"
   	-@erase "$(INTDIR)\main_win32.obj"
   	-@erase "$(INTDIR)\vc50.idb"
   	-@erase "$(OUTDIR)\Apache.exe"
  @@ -54,10 +52,44 @@
   "$(OUTDIR)" :
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
  +CPP=cl.exe
   CPP_PROJ=/nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE"\
    /Fp"$(INTDIR)\Apache.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
   CPP_OBJS=.\ApacheR/
   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) $< 
  +<<
  +
  +RSC=rc.exe
  +RSC_PROJ=/l 0x809 /fo"$(INTDIR)\apache.res" /d "NDEBUG" 
   BSC32=bscmake.exe
   BSC32_FLAGS=/nologo /o"$(OUTDIR)\Apache.bsc" 
   BSC32_SBRS= \
  @@ -68,6 +100,7 @@
    /incremental:no /pdb:"$(OUTDIR)\Apache.pdb" /machine:I386\
    /out:"$(OUTDIR)\Apache.exe" 
   LINK32_OBJS= \
  +	"$(INTDIR)\apache.res" \
   	"$(INTDIR)\main_win32.obj"
   
   "$(OUTDIR)\Apache.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
  @@ -94,6 +127,7 @@
   !ENDIF 
   
   CLEAN :
  +	-@erase "$(INTDIR)\apache.res"
   	-@erase "$(INTDIR)\main_win32.obj"
   	-@erase "$(INTDIR)\vc50.idb"
   	-@erase "$(INTDIR)\vc50.pdb"
  @@ -104,29 +138,12 @@
   "$(OUTDIR)" :
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
  +CPP=cl.exe
   CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE"\
    /Fp"$(INTDIR)\Apache.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
   CPP_OBJS=.\ApacheD/
   CPP_SBRS=.
  -BSC32=bscmake.exe
  -BSC32_FLAGS=/nologo /o"$(OUTDIR)\Apache.bsc" 
  -BSC32_SBRS= \
  -	
  -LINK32=link.exe
  -LINK32_FLAGS=CoreD\ApacheCore.lib kernel32.lib user32.lib gdi32.lib\
  - winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:console\
  - /incremental:yes /pdb:"$(OUTDIR)\Apache.pdb" /debug /machine:I386\
  - /out:"$(OUTDIR)\Apache.exe" 
  -LINK32_OBJS= \
  -	"$(INTDIR)\main_win32.obj"
   
  -"$(OUTDIR)\Apache.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
  -    $(LINK32) @<<
  -  $(LINK32_FLAGS) $(LINK32_OBJS)
  -<<
  -
  -!ENDIF 
  -
   .c{$(CPP_OBJS)}.obj::
      $(CPP) @<<
      $(CPP_PROJ) $< 
  @@ -157,6 +174,28 @@
      $(CPP_PROJ) $< 
   <<
   
  +RSC=rc.exe
  +RSC_PROJ=/l 0x809 /fo"$(INTDIR)\apache.res" /d "_DEBUG" 
  +BSC32=bscmake.exe
  +BSC32_FLAGS=/nologo /o"$(OUTDIR)\Apache.bsc" 
  +BSC32_SBRS= \
  +	
  +LINK32=link.exe
  +LINK32_FLAGS=CoreD\ApacheCore.lib kernel32.lib user32.lib gdi32.lib\
  + winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:console\
  + /incremental:yes /pdb:"$(OUTDIR)\Apache.pdb" /debug /machine:I386\
  + /out:"$(OUTDIR)\Apache.exe" 
  +LINK32_OBJS= \
  +	"$(INTDIR)\apache.res" \
  +	"$(INTDIR)\main_win32.obj"
  +
  +"$(OUTDIR)\Apache.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
  +    $(LINK32) @<<
  +  $(LINK32_FLAGS) $(LINK32_OBJS)
  +<<
  +
  +!ENDIF 
  +
   
   !IF "$(CFG)" == "Apache - Win32 Release" || "$(CFG)" == "Apache - Win32 Debug"
   SOURCE=.\os\win32\main_win32.c
  @@ -164,6 +203,27 @@
   "$(INTDIR)\main_win32.obj" : $(SOURCE) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
  +
  +SOURCE=.\os\win32\apache.rc
  +DEP_RSC_APACH=\
  +	".\os\win32\apache.ico"\
  +	
  +
  +!IF  "$(CFG)" == "Apache - Win32 Release"
  +
  +
  +"$(INTDIR)\apache.res" : $(SOURCE) $(DEP_RSC_APACH) "$(INTDIR)"
  +	$(RSC) /l 0x809 /fo"$(INTDIR)\apache.res" /i "os\win32" /d "NDEBUG" $(SOURCE)
  +
  +
  +!ELSEIF  "$(CFG)" == "Apache - Win32 Debug"
  +
  +
  +"$(INTDIR)\apache.res" : $(SOURCE) $(DEP_RSC_APACH) "$(INTDIR)"
  +	$(RSC) /l 0x809 /fo"$(INTDIR)\apache.res" /i "os\win32" /d "_DEBUG" $(SOURCE)
  +
  +
  +!ENDIF 
   
   
   !ENDIF 
  
  
  
  1.8       +8 -0      apache-1.3/src/Apache.dsp
  
  Index: Apache.dsp
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/Apache.dsp,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- Apache.dsp	1997/11/25 04:07:09	1.7
  +++ Apache.dsp	1999/03/19 14:01:00	1.8
  @@ -96,6 +96,14 @@
   # Begin Group "Resource Files"
   
   # PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe"
  +# Begin Source File
  +
  +SOURCE=.\os\win32\apache.ico
  +# End Source File
  +# Begin Source File
  +
  +SOURCE=.\os\win32\apache.rc
  +# End Source File
   # End Group
   # End Target
   # End Project