]> granicus.if.org Git - apache/commitdiff
Back to a slightly modified flavor of imajes' (James Cox'es) original
authorWilliam A. Rowe Jr <wrowe@apache.org>
Sat, 13 Jul 2002 05:34:07 +0000 (05:34 +0000)
committerWilliam A. Rowe Jr <wrowe@apache.org>
Sat, 13 Jul 2002 05:34:07 +0000 (05:34 +0000)
  design, only stay with .rc file extensions so the original resources
  can be reviewed in the resource editor, rather than using .in files.

  Also significantly improve the explicit dependencies.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96043 13f79535-47bb-0310-9956-ffa450edef68

support/win32/ApacheMonitor.dsp
support/win32/ApacheMonitor.rc

index a11ceefa15750b0e7f27544e884d3a77f7b44a72..735741251aebce21cc405446a8f21e3a30586287 100644 (file)
@@ -87,45 +87,6 @@ LINK32=link.exe
 
 # Name "ApacheMonitor - Win32 Release"
 # Name "ApacheMonitor - Win32 Debug"
-# Begin Group "Generated Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\ApacheMonitorVer.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\build\win32\win32ver.awk
-
-!IF  "$(CFG)" == "ApacheMonitor - Win32 Release"
-
-# PROP Ignore_Default_Tool 1
-USERDEP__WIN32="..\..\include\ap_release.h"    
-# Begin Custom Build - Creating Version Resource
-InputPath=..\..\build\win32\win32ver.awk
-
-".\ApacheMonitorVer.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       awk -f ../../build/win32/win32ver.awk ApacheMonitor  "Apache HTTP Server Monitor" ../../include/ap_release.h > ApacheMonitorVer.h
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "ApacheMonitor - Win32 Debug"
-
-# PROP Ignore_Default_Tool 1
-USERDEP__WIN32="..\..\include\ap_release.h"    
-# Begin Custom Build - Creating Version Resource
-InputPath=..\..\build\win32\win32ver.awk
-
-".\ApacheMonitorVer.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       awk -f ../../build/win32/win32ver.awk ApacheMonitor  "Apache HTTP Server Monitor" ../../include/ap_release.h > ApacheMonitorVer.h
-
-# End Custom Build
-
-!ENDIF 
-
-# End Source File
-# End Group
 # Begin Group "Resource Files"
 
 # PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
@@ -144,6 +105,15 @@ SOURCE=.\ApacheMonitor.ico
 # Begin Source File
 
 SOURCE=.\ApacheMonitor.rc
+
+!IF  "$(CFG)" == "ApacheMonitor - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "ApacheMonitor - Win32 Debug"
+
+# PROP Exclude_From_Build 1
+
+!ENDIF 
+
 # End Source File
 # Begin Source File
 
@@ -165,6 +135,58 @@ SOURCE=.\sstop.bmp
 # Begin Source File
 
 SOURCE=.\ApacheMonitor.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\ApacheMonitorVer.rc
+
+!IF  "$(CFG)" == "ApacheMonitor - Win32 Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "ApacheMonitor - Win32 Debug"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\build\win32\win32ver.awk
+
+!IF  "$(CFG)" == "ApacheMonitor - Win32 Release"
+
+# PROP Ignore_Default_Tool 1
+USERDEP__WIN32="..\..\include\ap_release.h"    ".\ApacheMonitor.rc"    
+# Begin Custom Build - Creating versioned resources
+InputPath=..\..\build\win32\win32ver.awk
+
+".\ApacheMonitorVer.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       echo /* This file is autogenerated from ApacheMonitor.rc > ApacheMonitorVer.rc 
+       echo  * DO NOT EDIT! >> ApacheMonitorVer.rc 
+       echo  */ >> ApacheMonitorVer.rc 
+       type ApacheMonitor.rc >> ApacheMonitorVer.rc 
+       awk -f ../../build/win32/win32ver.awk ApacheMonitor  "Apache HTTP Server Monitor" ../../include/ap_release.h >> ApacheMonitorVer.rc 
+       
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "ApacheMonitor - Win32 Debug"
+
+# PROP Ignore_Default_Tool 1
+USERDEP__WIN32="..\..\include\ap_release.h"    ".\ApacheMonitor.rc"    
+# Begin Custom Build - Creating versioned resources
+InputPath=..\..\build\win32\win32ver.awk
+
+".\ApacheMonitorVer.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       echo /* This file is autogenerated from ApacheMonitor.rc > ApacheMonitorVer.rc 
+       echo  * DO NOT EDIT! >> ApacheMonitorVer.rc 
+       echo  */ >> ApacheMonitorVer.rc 
+       type ApacheMonitor.rc >> ApacheMonitorVer.rc 
+       awk -f ../../build/win32/win32ver.awk ApacheMonitor  "Apache HTTP Server Monitor" ../../include/ap_release.h >> ApacheMonitorVer.rc 
+       
+# End Custom Build
+
+!ENDIF 
+
 # End Source File
 # End Target
 # End Project
index abbb7ae407d146a6551e48254a214c4959b1756f..e54f006f0d23e7d7184e152db04206e32afdd609 100644 (file)
 
 #include "ApacheMonitor.h"
 
-/* Bring in our version resource generated from win32ver.awk
- */
-#include "ApacheMonitorVer.h"
-
 IDI_APSRVMON            ICON    DISCARDABLE     "ApacheMonitor.ico"
 IDI_ICOSTOP             ICON    DISCARDABLE     "apstop.ico"
 IDI_ICORUN              ICON    DISCARDABLE     "aprun.ico"