summaryrefslogtreecommitdiff
path: root/support/win32
diff options
context:
space:
mode:
Diffstat (limited to 'support/win32')
-rw-r--r--support/win32/ApacheMonitor.c12
-rw-r--r--support/win32/ApacheMonitor.dsp12
-rw-r--r--support/win32/wintty.dsp12
3 files changed, 28 insertions, 8 deletions
diff --git a/support/win32/ApacheMonitor.c b/support/win32/ApacheMonitor.c
index 1ea839ae..128d9cc2 100644
--- a/support/win32/ApacheMonitor.c
+++ b/support/win32/ApacheMonitor.c
@@ -49,6 +49,7 @@
#define OS_VERSION_WIN9X 1
#define OS_VERSION_WINNT 2
#define OS_VERSION_WIN2K 3
+
/* Should be enough */
#define MAX_APACHE_SERVICES 128
#define MAX_APACHE_COMPUTERS 32
@@ -278,15 +279,10 @@ BOOL GetSystemOSVersion(LPDWORD dwVersion)
switch (osvi.dwPlatformId)
{
case VER_PLATFORM_WIN32_NT:
- if (osvi.dwMajorVersion <= 4) {
- *dwVersion = OS_VERSION_WINNT;
- }
- else if (osvi.dwMajorVersion == 5) {
+ if (osvi.dwMajorVersion >= 5)
*dwVersion = OS_VERSION_WIN2K;
- }
- else {
- return FALSE;
- }
+ else
+ *dwVersion = OS_VERSION_WINNT;
break;
case VER_PLATFORM_WIN32_WINDOWS:
diff --git a/support/win32/ApacheMonitor.dsp b/support/win32/ApacheMonitor.dsp
index e0f2ded3..853ddbc6 100644
--- a/support/win32/ApacheMonitor.dsp
+++ b/support/win32/ApacheMonitor.dsp
@@ -54,6 +54,12 @@ BSC32=bscmake.exe
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib comctl32.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib /nologo /subsystem:windows
# ADD LINK32 kernel32.lib user32.lib gdi32.lib comctl32.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib /nologo /subsystem:windows /debug /opt:ref
+# Begin Special Build Tool
+TargetPath=.\Release\ApacheMonitor.exe
+SOURCE="$(InputPath)"
+PostBuild_Desc=Embed .manifest
+PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);2
+# End Special Build Tool
!ELSEIF "$(CFG)" == "ApacheMonitor - Win32 Debug"
@@ -80,6 +86,12 @@ BSC32=bscmake.exe
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib comctl32.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib /nologo /subsystem:windows /debug
# ADD LINK32 kernel32.lib user32.lib gdi32.lib comctl32.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib /nologo /subsystem:windows /incremental:no /debug
+# Begin Special Build Tool
+TargetPath=.\Debug\ApacheMonitor.exe
+SOURCE="$(InputPath)"
+PostBuild_Desc=Embed .manifest
+PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);2
+# End Special Build Tool
!ENDIF
diff --git a/support/win32/wintty.dsp b/support/win32/wintty.dsp
index 01d1a3ca..95de23a2 100644
--- a/support/win32/wintty.dsp
+++ b/support/win32/wintty.dsp
@@ -51,6 +51,12 @@ BSC32=bscmake.exe
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib advapi32.lib /nologo /subsystem:console
# ADD LINK32 kernel32.lib user32.lib advapi32.lib /nologo /subsystem:console /debug /opt:ref
+# Begin Special Build Tool
+TargetPath=.\Release\wintty.exe
+SOURCE="$(InputPath)"
+PostBuild_Desc=Embed .manifest
+PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);2
+# End Special Build Tool
!ELSEIF "$(CFG)" == "wintty - Win32 Debug"
@@ -75,6 +81,12 @@ BSC32=bscmake.exe
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib advapi32.lib /nologo /subsystem:console /incremental:no /debug
# ADD LINK32 kernel32.lib user32.lib advapi32.lib /nologo /subsystem:console /incremental:no /debug
+# Begin Special Build Tool
+TargetPath=.\Debug\wintty.exe
+SOURCE="$(InputPath)"
+PostBuild_Desc=Embed .manifest
+PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);2
+# End Special Build Tool
!ENDIF