Commit 62ccef75476497ed3434d06a9a38b3e418af78b2
2000-01-07T14:37:00
added Windows NT detection
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56
diff --git a/config/win32/detect.mk b/config/win32/detect.mk
index 3385ab6..2592dcc 100644
--- a/config/win32/detect.mk
+++ b/config/win32/detect.mk
@@ -6,17 +6,38 @@
#
#
+
+ifeq ($(PLATFORM),ansi)
+
+###################################################################
+#
+# Detecting Windows NT or Windows 9x
+#
+
+# Detecting Windows NT is easy, as the OS variable must be defined
+# and contains "Windows_NT". Untested with Windows 2K, but I guess
+# it should work ...
+#
+ifeq ($(OS),Windows_NT)
+is_windows := 1
+
# We test for the COMSPEC environment variable, then run the 'ver'
# command-line program to see if its output contains the word "Windows"
#
# If this is true, we're running a win32 platform (or an emulation)
#
-
-ifeq ($(PLATFORM),ansi)
+else
ifdef COMSPEC
-
is_windows := $(findstring Windows,$(strip $(shell ver)))
-ifneq ($(is_windows),)
+endif
+endif #test NT
+
+####################################################################
+#
+# Rules for Win32
+#
+
+ifdef is_windows
PLATFORM := win32
DELETE := del
@@ -60,7 +81,6 @@ CONFIG_RULES := $(TOP)\config\win32\$(CONFIG_FILE)
setup: dos_setup
-endif #test Windows
-endif #test COMSPEC
+endif #test is_windows
endif #test PLATFORM