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.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@100010 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/src/ApacheCore.dsp b/src/ApacheCore.dsp
index a3b4208a24249f9bfb81c9d642b0915820b7ffac..307e8700d6c0de30369e09f6a1eeafa1482cfa4e 100644 (file)
--- a/src/ApacheCore.dsp
+++ b/src/ApacheCore.dsp
@@ -54,6 +54,11 @@ BSC32=bscmake.exe
 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 @@ BSC32=bscmake.exe
 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 
 
@@ -104,10 +114,6 @@ SOURCE=.\main\buff.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\buildmark.c
-# End Source File
-# Begin Source File
-
 SOURCE=.\os\win32\getopt.c
 # End Source File
 # Begin Source File

diff --git a/src/makefile.win b/src/makefile.win
index a332ab3576085f756d2f06268dc99cfe380b6e2a..fa79224faf685defdf1781c170cc0342b34abd3f 100644 (file)
--- a/src/makefile.win
+++ b/src/makefile.win
@@ -87,7 +87,6 @@ _build:
         $(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