httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject cvs commit: apache-1.3/src ApacheCore.dsp makefile.win
Date Thu, 22 May 2003 21:19:32 GMT
wrowe       2003/05/22 14:19:31

  Modified:    src      ApacheCore.dsp makefile.win
  Log:
    This has worked -very- well for Win32 Apache 2.0, moving the compilation
    of buildmark.obj into a pre-link step ensures we always recompile with
    the correct datestamp every rebuild, even when building in the IDE without
    using makefile.win.
  
  Revision  Changes    Path
  1.39      +10 -4     apache-1.3/src/ApacheCore.dsp
  
  Index: ApacheCore.dsp
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/ApacheCore.dsp,v
  retrieving revision 1.38
  retrieving revision 1.39
  diff -u -r1.38 -r1.39
  --- ApacheCore.dsp	4 Oct 2001 03:52:59 -0000	1.38
  +++ ApacheCore.dsp	22 May 2003 21:19:31 -0000	1.39
  @@ -54,6 +54,11 @@
   LINK32=link.exe
   # ADD BASE LINK32 kernel32.lib user32.lib advapi32.lib ws2_32.lib /nologo /subsystem:windows
/dll /incremental:no /map /machine:I386 /base:@"os\win32\BaseAddr.ref",ApacheCore
   # ADD LINK32 kernel32.lib user32.lib advapi32.lib ws2_32.lib /nologo /subsystem:windows
/dll /incremental:no /map /machine:I386 /base:@"os\win32\BaseAddr.ref",ApacheCore
  +# Begin Special Build Tool
  +SOURCE="$(InputPath)"
  +PreLink_Desc=Compiling buildmark
  +PreLink_Cmds=cl.exe /nologo /MD /W3 /O2 /I "./include" /I ".\os\win32" /I ".\os\win32\win9xconhook"
/D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /Fd"Release\ApacheCore" /FD
/c .\buildmark.c /Fo"Release\buildmark.obj"
  +# End Special Build Tool
   
   !ELSEIF  "$(CFG)" == "ApacheCore - Win32 Debug"
   
  @@ -80,6 +85,11 @@
   LINK32=link.exe
   # ADD BASE LINK32 kernel32.lib user32.lib advapi32.lib ws2_32.lib /nologo /subsystem:windows
/dll /incremental:no /map /debug /machine:I386 /base:@"os\win32\BaseAddr.ref",ApacheCore
   # ADD LINK32 kernel32.lib user32.lib advapi32.lib ws2_32.lib /nologo /subsystem:windows
/dll /incremental:no /map /debug /machine:I386 /base:@"os\win32\BaseAddr.ref",ApacheCore
  +# Begin Special Build Tool
  +SOURCE="$(InputPath)"
  +PreLink_Desc=Compiling buildmark
  +PreLink_Cmds=cl.exe /nologo /MDd /W3 /GX /Zi /Od /I ".\include" /I ".\os\win32" /I ".\os\win32\win9xconhook"
/D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /Fd"Debug\ApacheCore" /FD /c
.\buildmark.c /Fo"Debug\buildmark.obj"
  +# End Special Build Tool
   
   !ENDIF 
   
  @@ -101,10 +111,6 @@
   # Begin Source File
   
   SOURCE=.\main\buff.c
  -# End Source File
  -# Begin Source File
  -
  -SOURCE=.\buildmark.c
   # End Source File
   # Begin Source File
   
  
  
  
  1.28      +0 -1      apache-1.3/src/makefile.win
  
  Index: makefile.win
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/makefile.win,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- makefile.win	4 Oct 2001 05:46:35 -0000	1.27
  +++ makefile.win	22 May 2003 21:19:31 -0000	1.28
  @@ -87,7 +87,6 @@
   	 $(MAKE) $(MAKEOPT) -f gen_uri_delims.mak CFG="gen_uri_delims - Win32 $(LONG)" RECURSE=0
$(CTARGET)
   	 $(MAKE) $(MAKEOPT) -f gen_test_char.mak CFG="gen_test_char - Win32 $(LONG)" RECURSE=0
$(CTARGET)
   	cd ..
  -	 -del $(LONG)\buildmark.obj
   	 $(MAKE) $(MAKEOPT) -f ApacheCore.mak CFG="ApacheCore - Win32 $(LONG)" RECURSE=0 $(CTARGET)
   	 $(MAKE) $(MAKEOPT) -f Apache.mak CFG="Apache - Win32 $(LONG)" RECURSE=0 $(CTARGET)
   	cd os\win32
  
  
  

Mime
View raw message