Author: mladen.turk(a)jboss.com
Date: 2007-12-19 06:54:28 -0500 (Wed, 19 Dec 2007)
New Revision: 1256
Modified:
trunk/httpd/httpd-2.2/support/win32/ApacheMonitor.patch
trunk/httpd/httpd-2.2/support/win32/NMAKEapachemonitor
Log:
Add manifest only for x86 targets
Modified: trunk/httpd/httpd-2.2/support/win32/ApacheMonitor.patch
===================================================================
--- trunk/httpd/httpd-2.2/support/win32/ApacheMonitor.patch 2007-12-19 08:40:59 UTC (rev
1255)
+++ trunk/httpd/httpd-2.2/support/win32/ApacheMonitor.patch 2007-12-19 11:54:28 UTC (rev
1256)
@@ -16,18 +16,13 @@
===================================================================
--- ApacheMonitor.rc
+++ ApacheMonitor.rc
-@@ -23,12 +23,13 @@
+@@ -23,6 +23,9 @@
#include "../../build/win32/httpd.rc"
++#ifdef USE_MANIFEST
+CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "ApacheMonitor.manifest"
++#endif
IDI_APSRVMON ICON DISCARDABLE "ApacheMonitor.ico"
IDI_ICOSTOP ICON DISCARDABLE "apstop.ico"
- IDI_ICORUN ICON DISCARDABLE "aprun.ico"
-
--IDD_DLGSERVICES DIALOGEX 0, 0, 350, 188
-+IDD_DLGSERVICES DIALOGEX 0, 0, 350, 190
- STYLE DS_MODALFRAME | DS_SETFOREGROUND | WS_MINIMIZEBOX | WS_VISIBLE |
- WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU
- EXSTYLE WS_EX_CONTROLPARENT
Modified: trunk/httpd/httpd-2.2/support/win32/NMAKEapachemonitor
===================================================================
--- trunk/httpd/httpd-2.2/support/win32/NMAKEapachemonitor 2007-12-19 08:40:59 UTC (rev
1255)
+++ trunk/httpd/httpd-2.2/support/win32/NMAKEapachemonitor 2007-12-19 11:54:28 UTC (rev
1256)
@@ -46,6 +46,10 @@
RCFLAGS = $(RCFLAGS) /d "APP_FILE"
+!IF "$(CPU)" == "I386"
+RCFLAGS = $(RCFLAGS) /d "USE_MANIFEST"
+!ENDIF
+
OBJECTS = \
$(WORKDIR)\ApacheMonitor.obj \